From 8f8edf15a31e0657191896a75db40d3a8d74cb72 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Thu, 27 Apr 2023 01:32:04 +0000 Subject: [PATCH 01/22] Added clang formatting configuration files --- .clang-format | 23 +++++++++++++++++++++++ .clang-tidy | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 .clang-format create mode 100644 .clang-tidy diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..1d8cdf80 --- /dev/null +++ b/.clang-format @@ -0,0 +1,23 @@ +# Use the Google style in this project. +BasedOnStyle: Google + +# Some folks prefer to write "int& foo" while others prefer "int &foo". The +# Google Style Guide only asks for consistency within a project, we chose +# "int& foo" for this project: +DerivePointerAlignment: false +PointerAlignment: Left + +# Rules for includes +# IncludeBlocks: IBS_Regroup # Requires clang-format 6.0+ +# Ordering of includes, higher priority lower in list +IncludeCategories: +- Regex: '^\"unit/' + Priority: 5999 +- Regex: '^\"' + Priority: 4000 +- Regex: '^<.*/.*' + Priority: 2000 +- Regex: '^<[^\/.]*>' + Priority: 1000 +- Regex: '^<.*.h>' + Priority: 500 diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 00000000..a5868e94 --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,39 @@ +--- +# Configure clang-tidy for this project. + +# Disabled: +# -clang-analyzer-cplusplus due to errors with the stl +# -google-readability-namespace-comments due to c++17 one line multinamespace +# -bugprone-suspicius-include does not support clang-tidy build styles +# -bugprone-easily-swappable-parameters often disallows simple functions +# -readability-function-cognitive-complexity disallows large functions +# -readability-identifier-length allows short variable names +# To be corrected: +Checks: '-*, bugprone-*, clang-*, google-readability-*, misc-*, modernize-*, readability-*, performance-*, -clang-analyzer-cplusplus*, -google-readability-namespace-comments, -bugprone-easily-swappable-parameters, -bugprone-suspicious-include, -readability-function-cognitive-complexity, -readability-identifier-length, -modernize-use-trailing-return-type' +# Most warnings should be errors +WarningsAsErrors: 'bugprone-*, clang-*, google-*, misc-*, modernize-*, readability-*, performance-*' +# Overall format style, Google Style Guide w/ extra restrictions +FormatStyle: file +CheckOptions: + - { key: readability-identifier-naming.ClassCase, value: CamelCase } + - { key: readability-identifier-naming.StructCase, value: CamelCase } + - { key: readability-identifier-naming.TemplateParameterCase, value: CamelCase } + - { key: readability-identifier-naming.FunctionCase, value: CamelCase } + - { key: readability-identifier-naming.NamespaceCase, value: lower_case } + - { key: readability-identifier-naming.VariableCase, value: lower_case } + - { key: readability-identifier-naming.LocalConstantCase, value: lower_case } + - { key: readability-identifier-naming.LocalConstantCase, value: lower_case } + - { key: readability-identifier-naming.GlobalVariableCase, value: lower_case } + - { key: readability-identifier-naming.GlobalVariableSuffix, value: _ } + - { key: readability-identifier-naming.GlobalConstantCase, value: CamelCase } + - { key: readability-identifier-naming.GlobalConstantPrefix, value: k } + - { key: readability-identifier-naming.PrivateMemberSuffix, value: _ } + - { key: readability-identifier-naming.ProtectedMemberSuffix, value: _ } + - { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase } + - { key: readability-identifier-naming.ConstexprVariablePrefix, value: k } + - { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE } + - { key: readability-identifier-naming.MemberConstantCase, value: CamelCase } + - { key: readability-identifier-naming.MemberConstantPrefix, value: k } + - { key: readability-identifier-naming.StaticConstantCase, value: CamelCase } + - { key: readability-identifier-naming.StaticConstantPrefix, value: k } + - { key: readability-function-cognitive-complexity.Threshold, value: 35 } From 29852c9f4d01336338f1fb46356a31327748b86d Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Thu, 27 Apr 2023 01:33:31 +0000 Subject: [PATCH 02/22] Performed an initial clang format sweep on all files --- src/dis6/AcknowledgePdu.cpp | 108 +- src/dis6/AcknowledgePdu.h | 55 +- src/dis6/AcknowledgeReliablePdu.cpp | 110 +- src/dis6/AcknowledgeReliablePdu.h | 56 +- src/dis6/AcousticBeamData.cpp | 127 +-- src/dis6/AcousticBeamData.h | 60 +- src/dis6/AcousticBeamFundamentalParameter.cpp | 160 ++- src/dis6/AcousticBeamFundamentalParameter.h | 70 +- src/dis6/AcousticEmitter.cpp | 94 +- src/dis6/AcousticEmitter.h | 52 +- src/dis6/AcousticEmitterSystem.cpp | 94 +- src/dis6/AcousticEmitterSystem.h | 63 +- src/dis6/AcousticEmitterSystemData.cpp | 205 ++-- src/dis6/AcousticEmitterSystemData.h | 86 +- src/dis6/ActionRequestPdu.cpp | 230 ++-- src/dis6/ActionRequestPdu.h | 75 +- src/dis6/ActionRequestReliablePdu.cpp | 304 +++-- src/dis6/ActionRequestReliablePdu.h | 97 +- src/dis6/ActionResponsePdu.cpp | 229 ++-- src/dis6/ActionResponsePdu.h | 75 +- src/dis6/ActionResponseReliablePdu.cpp | 238 ++-- src/dis6/ActionResponseReliablePdu.h | 76 +- src/dis6/AggregateID.cpp | 93 +- src/dis6/AggregateID.h | 56 +- src/dis6/AggregateMarking.cpp | 110 +- src/dis6/AggregateMarking.h | 51 +- src/dis6/AggregateStatePdu.cpp | 723 +++++------- src/dis6/AggregateStatePdu.h | 201 ++-- src/dis6/AggregateType.cpp | 178 +-- src/dis6/AggregateType.h | 79 +- src/dis6/AngularVelocityVector.cpp | 93 +- src/dis6/AngularVelocityVector.h | 55 +- src/dis6/AntennaLocation.cpp | 89 +- src/dis6/AntennaLocation.h | 59 +- src/dis6/ApaData.cpp | 74 +- src/dis6/ApaData.h | 46 +- src/dis6/ArealObjectStatePdu.cpp | 345 +++--- src/dis6/ArealObjectStatePdu.h | 126 +- src/dis6/ArticulationParameter.cpp | 137 +-- src/dis6/ArticulationParameter.h | 69 +- src/dis6/BeamAntennaPattern.cpp | 204 ++-- src/dis6/BeamAntennaPattern.h | 99 +- src/dis6/BeamData.cpp | 136 +-- src/dis6/BeamData.h | 74 +- src/dis6/BurstDescriptor.cpp | 137 +-- src/dis6/BurstDescriptor.h | 70 +- src/dis6/ClockTime.cpp | 74 +- src/dis6/ClockTime.h | 49 +- src/dis6/CollisionElasticPdu.cpp | 396 +++---- src/dis6/CollisionElasticPdu.h | 151 ++- src/dis6/CollisionPdu.cpp | 243 ++-- src/dis6/CollisionPdu.h | 96 +- src/dis6/CommentPdu.cpp | 197 ++-- src/dis6/CommentPdu.h | 66 +- src/dis6/CommentReliablePdu.cpp | 204 ++-- src/dis6/CommentReliablePdu.h | 67 +- src/dis6/CreateEntityPdu.cpp | 67 +- src/dis6/CreateEntityPdu.h | 40 +- src/dis6/CreateEntityReliablePdu.cpp | 131 +-- src/dis6/CreateEntityReliablePdu.h | 59 +- src/dis6/DataPdu.cpp | 230 ++-- src/dis6/DataPdu.h | 78 +- src/dis6/DataQueryPdu.cpp | 230 ++-- src/dis6/DataQueryPdu.h | 75 +- src/dis6/DataQueryReliablePdu.cpp | 300 +++-- src/dis6/DataQueryReliablePdu.h | 94 +- src/dis6/DataReliablePdu.cpp | 276 ++--- src/dis6/DataReliablePdu.h | 91 +- src/dis6/DeadReckoningParameter.cpp | 170 ++- src/dis6/DeadReckoningParameter.h | 65 +- src/dis6/DesignatorPdu.cpp | 332 +++--- src/dis6/DesignatorPdu.h | 127 +-- src/dis6/DetonationPdu.cpp | 332 +++--- src/dis6/DetonationPdu.h | 117 +- src/dis6/DistributedEmissionsFamilyPdu.cpp | 47 +- src/dis6/DistributedEmissionsFamilyPdu.h | 37 +- src/dis6/EightByteChunk.cpp | 96 +- src/dis6/EightByteChunk.h | 42 +- src/dis6/ElectromagneticEmissionBeamData.cpp | 282 +++-- src/dis6/ElectromagneticEmissionBeamData.h | 111 +- .../ElectromagneticEmissionSystemData.cpp | 204 ++-- src/dis6/ElectromagneticEmissionSystemData.h | 88 +- src/dis6/ElectromagneticEmissionsPdu.cpp | 215 ++-- src/dis6/ElectromagneticEmissionsPdu.h | 94 +- src/dis6/EmitterSystem.cpp | 94 +- src/dis6/EmitterSystem.h | 55 +- src/dis6/EntityID.cpp | 93 +- src/dis6/EntityID.h | 69 +- src/dis6/EntityInformationFamilyPdu.cpp | 47 +- src/dis6/EntityInformationFamilyPdu.h | 38 +- src/dis6/EntityManagementFamilyPdu.cpp | 47 +- src/dis6/EntityManagementFamilyPdu.h | 37 +- src/dis6/EntityStatePdu.cpp | 410 +++---- src/dis6/EntityStatePdu.h | 153 ++- src/dis6/EntityStateUpdatePdu.cpp | 268 ++--- src/dis6/EntityStateUpdatePdu.h | 107 +- src/dis6/EntityType.cpp | 178 +-- src/dis6/EntityType.h | 79 +- src/dis6/Environment.cpp | 156 +-- src/dis6/Environment.h | 74 +- src/dis6/EnvironmentalProcessPdu.cpp | 235 ++-- src/dis6/EnvironmentalProcessPdu.h | 91 +- src/dis6/EventID.cpp | 93 +- src/dis6/EventID.h | 55 +- src/dis6/EventReportPdu.cpp | 230 ++-- src/dis6/EventReportPdu.h | 78 +- src/dis6/EventReportReliablePdu.cpp | 236 ++-- src/dis6/EventReportReliablePdu.h | 80 +- src/dis6/FastEntityStatePdu.cpp | 1015 +++++++---------- src/dis6/FastEntityStatePdu.h | 291 ++--- src/dis6/FirePdu.cpp | 223 ++-- src/dis6/FirePdu.h | 88 +- src/dis6/FixedDatum.cpp | 74 +- src/dis6/FixedDatum.h | 46 +- src/dis6/FourByteChunk.cpp | 96 +- src/dis6/FourByteChunk.h | 42 +- src/dis6/FundamentalParameterData.cpp | 239 ++-- src/dis6/FundamentalParameterData.h | 109 +- src/dis6/FundamentalParameterDataIff.cpp | 199 ++-- src/dis6/FundamentalParameterDataIff.h | 82 +- src/dis6/GridAxisRecord.cpp | 74 +- src/dis6/GridAxisRecord.h | 48 +- src/dis6/GridAxisRecordRepresentation0.cpp | 22 +- src/dis6/GridAxisRecordRepresentation0.h | 23 +- src/dis6/GridAxisRecordRepresentation1.cpp | 165 ++- src/dis6/GridAxisRecordRepresentation1.h | 64 +- src/dis6/GridAxisRecordRepresentation2.cpp | 121 +- src/dis6/GridAxisRecordRepresentation2.h | 52 +- src/dis6/GriddedDataPdu.cpp | 416 +++---- src/dis6/GriddedDataPdu.h | 140 +-- src/dis6/IffAtcNavAidsLayer1Pdu.cpp | 200 ++-- src/dis6/IffAtcNavAidsLayer1Pdu.h | 90 +- src/dis6/IffAtcNavAidsLayer2Pdu.cpp | 189 ++- src/dis6/IffAtcNavAidsLayer2Pdu.h | 78 +- src/dis6/IffFundamentalData.cpp | 238 ++-- src/dis6/IffFundamentalData.h | 94 +- src/dis6/IntercomCommunicationsParameters.cpp | 21 +- src/dis6/IntercomCommunicationsParameters.h | 55 +- src/dis6/IntercomControlPdu.cpp | 352 +++--- src/dis6/IntercomControlPdu.h | 127 ++- src/dis6/IntercomSignalPdu.cpp | 62 +- src/dis6/IntercomSignalPdu.h | 29 +- src/dis6/IsGroupOfPdu.cpp | 231 ++-- src/dis6/IsGroupOfPdu.h | 92 +- src/dis6/IsPartOfPdu.cpp | 204 ++-- src/dis6/IsPartOfPdu.h | 95 +- src/dis6/LayerHeader.cpp | 95 +- src/dis6/LayerHeader.h | 52 +- src/dis6/LinearObjectStatePdu.cpp | 290 ++--- src/dis6/LinearObjectStatePdu.h | 113 +- src/dis6/LinearSegmentParameter.cpp | 233 ++-- src/dis6/LinearSegmentParameter.h | 96 +- src/dis6/LogisticsFamilyPdu.cpp | 46 +- src/dis6/LogisticsFamilyPdu.h | 34 +- src/dis6/LogisticsPdu.cpp | 43 +- src/dis6/LogisticsPdu.h | 34 +- src/dis6/Marking.cpp | 124 +- src/dis6/Marking.h | 53 +- src/dis6/MinefieldDataPdu.cpp | 432 +++---- src/dis6/MinefieldDataPdu.h | 136 ++- src/dis6/MinefieldFamilyPdu.cpp | 46 +- src/dis6/MinefieldFamilyPdu.h | 34 +- src/dis6/MinefieldPduFamily.cpp | 43 +- src/dis6/MinefieldPduFamily.h | 34 +- src/dis6/MinefieldQueryPdu.cpp | 337 +++--- src/dis6/MinefieldQueryPdu.h | 109 +- src/dis6/MinefieldResponseNackPdu.cpp | 195 ++-- src/dis6/MinefieldResponseNackPdu.h | 77 +- src/dis6/MinefieldStatePdu.cpp | 385 +++---- src/dis6/MinefieldStatePdu.h | 125 +- src/dis6/ModulationType.cpp | 113 +- src/dis6/ModulationType.h | 58 +- src/dis6/NamedLocation.cpp | 74 +- src/dis6/NamedLocation.h | 48 +- src/dis6/ObjectType.cpp | 132 +-- src/dis6/ObjectType.h | 67 +- src/dis6/Orientation.cpp | 93 +- src/dis6/Orientation.h | 55 +- src/dis6/Pdu.cpp | 178 +-- src/dis6/Pdu.h | 79 +- src/dis6/PduContainer.cpp | 107 +- src/dis6/PduContainer.h | 49 +- src/dis6/Point.cpp | 74 +- src/dis6/Point.h | 46 +- src/dis6/PointObjectStatePdu.cpp | 332 +++--- src/dis6/PointObjectStatePdu.h | 129 +-- src/dis6/PropulsionSystemData.cpp | 75 +- src/dis6/PropulsionSystemData.h | 46 +- src/dis6/RadioCommunicationsFamilyPdu.cpp | 90 +- src/dis6/RadioCommunicationsFamilyPdu.h | 48 +- src/dis6/RadioEntityType.cpp | 156 +-- src/dis6/RadioEntityType.h | 70 +- src/dis6/ReceiverPdu.cpp | 155 +-- src/dis6/ReceiverPdu.h | 66 +- src/dis6/RecordQueryReliablePdu.cpp | 243 ++-- src/dis6/RecordQueryReliablePdu.h | 89 +- src/dis6/RecordSet.cpp | 157 +-- src/dis6/RecordSet.h | 70 +- src/dis6/Relationship.cpp | 74 +- src/dis6/Relationship.h | 46 +- src/dis6/RemoveEntityPdu.cpp | 67 +- src/dis6/RemoveEntityPdu.h | 40 +- src/dis6/RemoveEntityReliablePdu.cpp | 131 +-- src/dis6/RemoveEntityReliablePdu.h | 59 +- src/dis6/RepairCompletePdu.cpp | 142 +-- src/dis6/RepairCompletePdu.h | 63 +- src/dis6/RepairResponsePdu.cpp | 160 ++- src/dis6/RepairResponsePdu.h | 69 +- src/dis6/ResupplyCancelPdu.cpp | 98 +- src/dis6/ResupplyCancelPdu.h | 54 +- src/dis6/ResupplyOfferPdu.cpp | 211 ++-- src/dis6/ResupplyOfferPdu.h | 80 +- src/dis6/ResupplyReceivedPdu.cpp | 211 ++-- src/dis6/ResupplyReceivedPdu.h | 80 +- src/dis6/SeesPdu.cpp | 295 +++-- src/dis6/SeesPdu.h | 92 +- src/dis6/ServiceRequestPdu.cpp | 210 ++-- src/dis6/ServiceRequestPdu.h | 80 +- src/dis6/SetDataPdu.cpp | 230 ++-- src/dis6/SetDataPdu.h | 78 +- src/dis6/SetDataReliablePdu.cpp | 278 ++--- src/dis6/SetDataReliablePdu.h | 92 +- src/dis6/SetRecordReliablePdu.cpp | 201 ++-- src/dis6/SetRecordReliablePdu.h | 77 +- src/dis6/ShaftRPMs.cpp | 94 +- src/dis6/ShaftRPMs.h | 52 +- src/dis6/SignalPdu.cpp | 34 +- src/dis6/SignalPdu.h | 23 +- src/dis6/SimulationAddress.cpp | 74 +- src/dis6/SimulationAddress.h | 49 +- src/dis6/SimulationManagementFamilyPdu.cpp | 98 +- src/dis6/SimulationManagementFamilyPdu.h | 54 +- ...tionManagementWithReliabilityFamilyPdu.cpp | 107 +- ...lationManagementWithReliabilityFamilyPdu.h | 53 +- src/dis6/SixByteChunk.cpp | 96 +- src/dis6/SixByteChunk.h | 42 +- src/dis6/SphericalHarmonicAntennaPattern.cpp | 57 +- src/dis6/SphericalHarmonicAntennaPattern.h | 45 +- src/dis6/StartResumePdu.cpp | 120 +- src/dis6/StartResumePdu.h | 57 +- src/dis6/StartResumeReliablePdu.cpp | 183 ++- src/dis6/StartResumeReliablePdu.h | 76 +- src/dis6/StopFreezePdu.cpp | 154 +-- src/dis6/StopFreezePdu.h | 69 +- src/dis6/StopFreezeReliablePdu.cpp | 176 ++- src/dis6/StopFreezeReliablePdu.h | 73 +- src/dis6/SupplyQuantity.cpp | 79 +- src/dis6/SupplyQuantity.h | 51 +- src/dis6/SyntheticEnvironmentFamilyPdu.cpp | 47 +- src/dis6/SyntheticEnvironmentFamilyPdu.h | 34 +- src/dis6/SystemID.cpp | 113 +- src/dis6/SystemID.h | 58 +- src/dis6/TrackJamTarget.cpp | 98 +- src/dis6/TrackJamTarget.h | 54 +- src/dis6/TransferControlRequestPdu.cpp | 259 ++--- src/dis6/TransferControlRequestPdu.h | 100 +- src/dis6/TransmitterPdu.cpp | 549 ++++----- src/dis6/TransmitterPdu.h | 167 ++- src/dis6/TwoByteChunk.cpp | 96 +- src/dis6/TwoByteChunk.h | 42 +- src/dis6/UaPdu.cpp | 417 +++---- src/dis6/UaPdu.h | 143 +-- src/dis6/VariableDatum.cpp | 215 ++-- src/dis6/VariableDatum.h | 49 +- src/dis6/Vector3Double.cpp | 93 +- src/dis6/Vector3Double.h | 52 +- src/dis6/Vector3Float.cpp | 93 +- src/dis6/Vector3Float.h | 52 +- src/dis6/VectoringNozzleSystemData.cpp | 78 +- src/dis6/VectoringNozzleSystemData.h | 46 +- src/dis6/WarfareFamilyPdu.cpp | 96 +- src/dis6/WarfareFamilyPdu.h | 54 +- src/dis6/symbolic_names.h | 128 ++- src/dis6/utils/Conversion.cpp | 33 +- src/dis6/utils/Conversion.h | 67 +- src/dis6/utils/DataStream.cpp | 365 +++--- src/dis6/utils/DataStream.h | 268 +++-- src/dis6/utils/Endian.h | 20 +- src/dis6/utils/IBufferProcessor.h | 18 +- src/dis6/utils/IPacketProcessor.h | 24 +- src/dis6/utils/IPduBank.h | 28 +- src/dis6/utils/IncomingMessage.cpp | 291 +++-- src/dis6/utils/IncomingMessage.h | 114 +- src/dis6/utils/Masks.h | 17 +- src/dis6/utils/PDUBank.cpp | 248 ++-- src/dis6/utils/PDUBank.h | 29 +- src/dis6/utils/PDUType.h | 108 +- src/dis6/utils/PacketFactory.cpp | 31 +- src/dis6/utils/PacketFactory.h | 105 +- src/dis6/utils/PduFactory.cpp | 197 ++-- src/dis6/utils/PduFactory.h | 42 +- src/dis6/utils/StreamUtils.cpp | 45 +- src/dis6/utils/StreamUtils.h | 32 +- src/dis7/AcknowledgePdu.cpp | 159 +-- src/dis7/AcknowledgePdu.h | 72 +- src/dis7/AcknowledgeReliablePdu.cpp | 110 +- src/dis7/AcknowledgeReliablePdu.h | 56 +- src/dis7/AcousticEmitter.cpp | 94 +- src/dis7/AcousticEmitter.h | 52 +- src/dis7/ActionRequestPdu.cpp | 279 ++--- src/dis7/ActionRequestPdu.h | 98 +- src/dis7/ActionRequestReliablePdu.cpp | 304 +++-- src/dis7/ActionRequestReliablePdu.h | 97 +- src/dis7/ActionResponsePdu.cpp | 280 ++--- src/dis7/ActionResponsePdu.h | 92 +- src/dis7/ActionResponseReliablePdu.cpp | 238 ++-- src/dis7/ActionResponseReliablePdu.h | 76 +- src/dis7/AggregateIdentifier.cpp | 81 +- src/dis7/AggregateIdentifier.h | 55 +- src/dis7/AggregateMarking.cpp | 110 +- src/dis7/AggregateMarking.h | 51 +- src/dis7/AggregateType.cpp | 178 +-- src/dis7/AggregateType.h | 82 +- src/dis7/AngleDeception.cpp | 362 +++--- src/dis7/AngleDeception.h | 136 +-- src/dis7/AngularVelocityVector.cpp | 93 +- src/dis7/AngularVelocityVector.h | 57 +- src/dis7/AntennaLocation.cpp | 89 +- src/dis7/AntennaLocation.h | 59 +- src/dis7/ArealObjectStatePdu.cpp | 361 +++--- src/dis7/ArealObjectStatePdu.h | 128 +-- src/dis7/ArticulatedParts.cpp | 144 +-- src/dis7/ArticulatedParts.h | 80 +- src/dis7/Association.cpp | 128 +-- src/dis7/Association.h | 72 +- src/dis7/AttachedParts.cpp | 136 +-- src/dis7/AttachedParts.h | 73 +- src/dis7/Attribute.cpp | 94 +- src/dis7/Attribute.h | 51 +- src/dis7/AttributePdu.cpp | 244 ++-- src/dis7/AttributePdu.h | 121 +- src/dis7/BeamAntennaPattern.cpp | 244 ++-- src/dis7/BeamAntennaPattern.h | 119 +- src/dis7/BeamData.cpp | 136 +-- src/dis7/BeamData.h | 71 +- src/dis7/BeamStatus.cpp | 55 +- src/dis7/BeamStatus.h | 47 +- src/dis7/BlankingSector.cpp | 238 ++-- src/dis7/BlankingSector.h | 98 +- src/dis7/ClockTime.cpp | 74 +- src/dis7/ClockTime.h | 51 +- src/dis7/CollisionElasticPdu.cpp | 403 +++---- src/dis7/CollisionElasticPdu.h | 192 ++-- src/dis7/CollisionPdu.cpp | 243 ++-- src/dis7/CollisionPdu.h | 125 +- src/dis7/CommentPdu.cpp | 197 ++-- src/dis7/CommentPdu.h | 66 +- src/dis7/CommentReliablePdu.cpp | 204 ++-- src/dis7/CommentReliablePdu.h | 67 +- src/dis7/CommunicationsNodeID.cpp | 79 +- src/dis7/CommunicationsNodeID.h | 48 +- src/dis7/CreateEntityPdu.cpp | 119 +- src/dis7/CreateEntityPdu.h | 57 +- src/dis7/CreateEntityReliablePdu.cpp | 131 +-- src/dis7/CreateEntityReliablePdu.h | 59 +- src/dis7/DataPdu.cpp | 230 ++-- src/dis7/DataPdu.h | 78 +- src/dis7/DataQueryDatumSpecification.cpp | 189 ++- src/dis7/DataQueryDatumSpecification.h | 64 +- src/dis7/DataQueryPdu.cpp | 230 ++-- src/dis7/DataQueryPdu.h | 75 +- src/dis7/DataQueryReliablePdu.cpp | 300 +++-- src/dis7/DataQueryReliablePdu.h | 94 +- src/dis7/DataReliablePdu.cpp | 276 ++--- src/dis7/DataReliablePdu.h | 91 +- src/dis7/DatumSpecification.cpp | 185 ++- src/dis7/DatumSpecification.h | 63 +- src/dis7/DeadReckoningParameters.cpp | 168 ++- src/dis7/DeadReckoningParameters.h | 65 +- src/dis7/DesignatorPdu.cpp | 332 +++--- src/dis7/DesignatorPdu.h | 127 +-- src/dis7/DetonationPdu.cpp | 331 +++--- src/dis7/DetonationPdu.h | 127 ++- src/dis7/DirectedEnergyAreaAimpoint.cpp | 262 ++--- src/dis7/DirectedEnergyAreaAimpoint.h | 83 +- src/dis7/DirectedEnergyDamage.cpp | 293 ++--- src/dis7/DirectedEnergyDamage.h | 122 +- src/dis7/DirectedEnergyFirePdu.cpp | 437 +++---- src/dis7/DirectedEnergyFirePdu.h | 182 +-- src/dis7/DirectedEnergyPrecisionAimpoint.cpp | 354 +++--- src/dis7/DirectedEnergyPrecisionAimpoint.h | 126 +- .../DirectedEnergyTargetEnergyDeposition.cpp | 104 +- .../DirectedEnergyTargetEnergyDeposition.h | 54 +- src/dis7/DistributedEmissionsFamilyPdu.cpp | 47 +- src/dis7/DistributedEmissionsFamilyPdu.h | 37 +- src/dis7/EEFundamentalParameterData.cpp | 139 +-- src/dis7/EEFundamentalParameterData.h | 70 +- src/dis7/EightByteChunk.cpp | 96 +- src/dis7/EightByteChunk.h | 42 +- src/dis7/ElectromagneticEmissionBeamData.cpp | 323 +++--- src/dis7/ElectromagneticEmissionBeamData.h | 119 +- .../ElectromagneticEmissionSystemData.cpp | 189 ++- src/dis7/ElectromagneticEmissionSystemData.h | 85 +- src/dis7/ElectromagneticEmissionsPdu.cpp | 214 ++-- src/dis7/ElectromagneticEmissionsPdu.h | 90 +- src/dis7/EmitterSystem.cpp | 94 +- src/dis7/EmitterSystem.h | 55 +- src/dis7/EngineFuel.cpp | 136 +-- src/dis7/EngineFuel.h | 64 +- src/dis7/EngineFuelReload.cpp | 180 ++- src/dis7/EngineFuelReload.h | 80 +- src/dis7/EntityAssociation.cpp | 222 ++-- src/dis7/EntityAssociation.h | 93 +- src/dis7/EntityDamageStatusPdu.cpp | 190 ++- src/dis7/EntityDamageStatusPdu.h | 83 +- src/dis7/EntityID.cpp | 80 +- src/dis7/EntityID.h | 51 +- src/dis7/EntityInformationFamilyPdu.cpp | 47 +- src/dis7/EntityInformationFamilyPdu.h | 38 +- src/dis7/EntityManagementFamilyPdu.cpp | 47 +- src/dis7/EntityManagementFamilyPdu.h | 34 +- src/dis7/EntityMarking.cpp | 124 +- src/dis7/EntityMarking.h | 53 +- src/dis7/EntityStatePdu.cpp | 408 +++---- src/dis7/EntityStatePdu.h | 157 +-- src/dis7/EntityStateUpdatePdu.cpp | 266 ++--- src/dis7/EntityStateUpdatePdu.h | 127 ++- src/dis7/EntityType.cpp | 178 +-- src/dis7/EntityType.h | 82 +- src/dis7/EntityTypeVP.cpp | 141 +-- src/dis7/EntityTypeVP.h | 69 +- src/dis7/Environment.cpp | 113 +- src/dis7/Environment.h | 58 +- src/dis7/EnvironmentGeneral.cpp | 156 +-- src/dis7/EnvironmentGeneral.h | 74 +- src/dis7/EnvironmentType.cpp | 178 +-- src/dis7/EnvironmentType.h | 79 +- src/dis7/EulerAngles.cpp | 93 +- src/dis7/EulerAngles.h | 55 +- src/dis7/EventIdentifier.cpp | 80 +- src/dis7/EventIdentifier.h | 51 +- src/dis7/EventIdentifierLiveEntity.cpp | 95 +- src/dis7/EventIdentifierLiveEntity.h | 55 +- src/dis7/EventReportPdu.cpp | 230 ++-- src/dis7/EventReportPdu.h | 78 +- src/dis7/EventReportReliablePdu.cpp | 236 ++-- src/dis7/EventReportReliablePdu.h | 80 +- src/dis7/Expendable.cpp | 141 +-- src/dis7/Expendable.h | 66 +- src/dis7/ExpendableDescriptor.cpp | 80 +- src/dis7/ExpendableDescriptor.h | 46 +- src/dis7/ExpendableReload.cpp | 163 ++- src/dis7/ExpendableReload.h | 72 +- src/dis7/ExplosionDescriptor.cpp | 122 +- src/dis7/ExplosionDescriptor.h | 60 +- src/dis7/FalseTargetsAttribute.cpp | 318 +++--- src/dis7/FalseTargetsAttribute.h | 125 +- src/dis7/FastEntityStatePdu.cpp | 1014 +++++++--------- src/dis7/FastEntityStatePdu.h | 299 ++--- src/dis7/FirePdu.cpp | 224 ++-- src/dis7/FirePdu.h | 135 ++- src/dis7/FixedDatum.cpp | 74 +- src/dis7/FixedDatum.h | 46 +- src/dis7/FourByteChunk.cpp | 96 +- src/dis7/FourByteChunk.h | 42 +- src/dis7/FundamentalOperationalData.cpp | 237 ++-- src/dis7/FundamentalOperationalData.h | 94 +- src/dis7/GridAxis.cpp | 179 ++- src/dis7/GridAxis.h | 79 +- src/dis7/GroupIdentifier.cpp | 80 +- src/dis7/GroupIdentifier.h | 51 +- src/dis7/IFFFundamentalParameterData.cpp | 216 ++-- src/dis7/IFFFundamentalParameterData.h | 78 +- src/dis7/IFFPdu.cpp | 381 +++---- src/dis7/IFFPdu.h | 141 ++- src/dis7/IOCommunicationsNode.cpp | 163 ++- src/dis7/IOCommunicationsNode.h | 75 +- src/dis7/IOEffect.cpp | 223 ++-- src/dis7/IOEffect.h | 90 +- src/dis7/IffDataSpecification.cpp | 63 +- src/dis7/IffDataSpecification.h | 42 +- src/dis7/IntercomCommunicationsParameters.cpp | 95 +- src/dis7/IntercomCommunicationsParameters.h | 52 +- src/dis7/IntercomIdentifier.cpp | 116 +- src/dis7/IntercomIdentifier.h | 61 +- src/dis7/IntercomSignalPdu.cpp | 69 +- src/dis7/IntercomSignalPdu.h | 27 +- src/dis7/IsPartOfPdu.cpp | 204 ++-- src/dis7/IsPartOfPdu.h | 95 +- src/dis7/JammingTechnique.cpp | 113 +- src/dis7/JammingTechnique.h | 58 +- src/dis7/LaunchedMunitionRecord.cpp | 200 ++-- src/dis7/LaunchedMunitionRecord.h | 86 +- src/dis7/LayerHeader.cpp | 95 +- src/dis7/LayerHeader.h | 61 +- src/dis7/LinearObjectStatePdu.cpp | 290 ++--- src/dis7/LinearObjectStatePdu.h | 113 +- src/dis7/LinearSegmentParameter.cpp | 251 ++-- src/dis7/LinearSegmentParameter.h | 131 ++- src/dis7/LiveEntityIdentifier.cpp | 85 +- src/dis7/LiveEntityIdentifier.h | 51 +- src/dis7/LiveEntityPdu.cpp | 85 +- src/dis7/LiveEntityPdu.h | 49 +- src/dis7/LiveSimulationAddress.cpp | 76 +- src/dis7/LiveSimulationAddress.h | 57 +- src/dis7/LogisticsFamilyPdu.cpp | 46 +- src/dis7/LogisticsFamilyPdu.h | 34 +- src/dis7/MineEntityIdentifier.cpp | 81 +- src/dis7/MineEntityIdentifier.h | 51 +- src/dis7/MinefieldFamilyPdu.cpp | 46 +- src/dis7/MinefieldFamilyPdu.h | 34 +- src/dis7/MinefieldIdentifier.cpp | 81 +- src/dis7/MinefieldIdentifier.h | 50 +- src/dis7/MinefieldResponseNackPdu.cpp | 195 ++-- src/dis7/MinefieldResponseNackPdu.h | 77 +- src/dis7/MinefieldStatePdu.cpp | 388 +++---- src/dis7/MinefieldStatePdu.h | 127 +-- src/dis7/ModulationParameters.cpp | 39 +- src/dis7/ModulationParameters.h | 37 +- src/dis7/ModulationType.cpp | 113 +- src/dis7/ModulationType.h | 70 +- src/dis7/Munition.cpp | 142 +-- src/dis7/Munition.h | 77 +- src/dis7/MunitionDescriptor.cpp | 138 +-- src/dis7/MunitionDescriptor.h | 66 +- src/dis7/MunitionReload.cpp | 162 ++- src/dis7/MunitionReload.h | 87 +- src/dis7/NamedLocationIdentification.cpp | 76 +- src/dis7/NamedLocationIdentification.h | 57 +- src/dis7/ObjectIdentifier.cpp | 80 +- src/dis7/ObjectIdentifier.h | 48 +- src/dis7/ObjectType.cpp | 113 +- src/dis7/ObjectType.h | 58 +- src/dis7/OwnershipStatus.cpp | 99 +- src/dis7/OwnershipStatus.h | 60 +- src/dis7/Pdu.cpp | 84 +- src/dis7/Pdu.h | 49 +- src/dis7/PduContainer.cpp | 107 +- src/dis7/PduContainer.h | 49 +- src/dis7/PduHeader.cpp | 198 ++-- src/dis7/PduHeader.h | 91 +- src/dis7/PduStatus.cpp | 55 +- src/dis7/PduStatus.h | 43 +- src/dis7/PduSuperclass.cpp | 156 +-- src/dis7/PduSuperclass.h | 73 +- src/dis7/PointObjectStatePdu.cpp | 332 +++--- src/dis7/PointObjectStatePdu.h | 131 ++- src/dis7/PropulsionSystemData.cpp | 75 +- src/dis7/PropulsionSystemData.h | 50 +- src/dis7/RadioCommunicationsFamilyPdu.cpp | 90 +- src/dis7/RadioCommunicationsFamilyPdu.h | 48 +- src/dis7/RadioIdentifier.cpp | 116 +- src/dis7/RadioIdentifier.h | 61 +- src/dis7/RadioType.cpp | 178 +-- src/dis7/RadioType.h | 76 +- src/dis7/ReceiverPdu.cpp | 155 +-- src/dis7/ReceiverPdu.h | 66 +- src/dis7/RecordQueryReliablePdu.cpp | 243 ++-- src/dis7/RecordQueryReliablePdu.h | 89 +- src/dis7/RecordQuerySpecification.cpp | 109 +- src/dis7/RecordQuerySpecification.h | 49 +- src/dis7/RecordSpecification.cpp | 109 +- src/dis7/RecordSpecification.h | 52 +- src/dis7/RecordSpecificationElement.cpp | 158 ++- src/dis7/RecordSpecificationElement.h | 85 +- src/dis7/Relationship.cpp | 74 +- src/dis7/Relationship.h | 52 +- src/dis7/RemoveEntityPdu.cpp | 119 +- src/dis7/RemoveEntityPdu.h | 63 +- src/dis7/RemoveEntityReliablePdu.cpp | 131 +-- src/dis7/RemoveEntityReliablePdu.h | 59 +- src/dis7/RepairCompletePdu.cpp | 142 +-- src/dis7/RepairCompletePdu.h | 66 +- src/dis7/RepairResponsePdu.cpp | 160 ++- src/dis7/RepairResponsePdu.h | 69 +- src/dis7/ResupplyOfferPdu.cpp | 211 ++-- src/dis7/ResupplyOfferPdu.h | 93 +- src/dis7/ResupplyReceivedPdu.cpp | 211 ++-- src/dis7/ResupplyReceivedPdu.h | 92 +- src/dis7/SecondaryOperationalData.cpp | 101 +- src/dis7/SecondaryOperationalData.h | 61 +- src/dis7/SeesPdu.cpp | 295 +++-- src/dis7/SeesPdu.h | 92 +- src/dis7/Sensor.cpp | 156 +-- src/dis7/Sensor.h | 76 +- src/dis7/SeparationVP.cpp | 184 ++- src/dis7/SeparationVP.h | 81 +- src/dis7/ServiceRequestPdu.cpp | 210 ++-- src/dis7/ServiceRequestPdu.h | 83 +- src/dis7/SetDataPdu.cpp | 230 ++-- src/dis7/SetDataPdu.h | 78 +- src/dis7/SetDataReliablePdu.cpp | 278 ++--- src/dis7/SetDataReliablePdu.h | 92 +- src/dis7/SimulationAddress.cpp | 74 +- src/dis7/SimulationAddress.h | 57 +- src/dis7/SimulationIdentifier.cpp | 81 +- src/dis7/SimulationIdentifier.h | 58 +- src/dis7/SimulationManagementFamilyPdu.cpp | 98 +- src/dis7/SimulationManagementFamilyPdu.h | 54 +- src/dis7/SimulationManagementPduHeader.cpp | 111 +- src/dis7/SimulationManagementPduHeader.h | 70 +- ...tionManagementWithReliabilityFamilyPdu.cpp | 107 +- ...lationManagementWithReliabilityFamilyPdu.h | 53 +- src/dis7/StandardVariableSpecification.cpp | 114 +- src/dis7/StandardVariableSpecification.h | 58 +- src/dis7/StartResumePdu.cpp | 171 ++- src/dis7/StartResumePdu.h | 92 +- src/dis7/StartResumeReliablePdu.cpp | 183 ++- src/dis7/StartResumeReliablePdu.h | 76 +- src/dis7/StopFreezePdu.cpp | 211 ++-- src/dis7/StopFreezePdu.h | 94 +- src/dis7/StopFreezeReliablePdu.cpp | 176 ++- src/dis7/StopFreezeReliablePdu.h | 73 +- src/dis7/StorageFuel.cpp | 136 +-- src/dis7/StorageFuel.h | 64 +- src/dis7/StorageFuelReload.cpp | 198 ++-- src/dis7/StorageFuelReload.h | 118 +- src/dis7/SupplyQuantity.cpp | 79 +- src/dis7/SupplyQuantity.h | 48 +- src/dis7/SyntheticEnvironmentFamilyPdu.cpp | 47 +- src/dis7/SyntheticEnvironmentFamilyPdu.h | 34 +- src/dis7/SystemIdentifier.cpp | 113 +- src/dis7/SystemIdentifier.h | 56 +- src/dis7/TotalRecordSets.cpp | 74 +- src/dis7/TotalRecordSets.h | 49 +- src/dis7/TrackJamData.cpp | 98 +- src/dis7/TrackJamData.h | 57 +- src/dis7/TwoByteChunk.cpp | 96 +- src/dis7/TwoByteChunk.h | 42 +- src/dis7/UAFundamentalParameter.cpp | 163 ++- src/dis7/UAFundamentalParameter.h | 85 +- src/dis7/UaPdu.cpp | 414 +++---- src/dis7/UaPdu.h | 141 +-- src/dis7/UnattachedIdentifier.cpp | 81 +- src/dis7/UnattachedIdentifier.h | 51 +- src/dis7/UnsignedDISInteger.cpp | 55 +- src/dis7/UnsignedDISInteger.h | 40 +- src/dis7/VariableDatum.cpp | 136 +-- src/dis7/VariableDatum.h | 70 +- src/dis7/VariableParameter.cpp | 140 +-- src/dis7/VariableParameter.h | 70 +- src/dis7/VariableTransmitterParameters.cpp | 76 +- src/dis7/VariableTransmitterParameters.h | 46 +- src/dis7/Vector2Float.cpp | 74 +- src/dis7/Vector2Float.h | 46 +- src/dis7/Vector3Double.cpp | 93 +- src/dis7/Vector3Double.h | 55 +- src/dis7/Vector3Float.cpp | 93 +- src/dis7/Vector3Float.h | 52 +- src/dis7/VectoringNozzleSystem.cpp | 77 +- src/dis7/VectoringNozzleSystem.h | 46 +- src/dis7/WarfareFamilyPdu.cpp | 96 +- src/dis7/WarfareFamilyPdu.h | 54 +- src/dis7/utils/DataStream.cpp | 365 +++--- src/dis7/utils/DataStream.h | 268 +++-- src/dis7/utils/Endian.h | 20 +- 646 files changed, 34695 insertions(+), 44997 deletions(-) diff --git a/src/dis6/AcknowledgePdu.cpp b/src/dis6/AcknowledgePdu.cpp index e3bb87e2..b7d077d8 100644 --- a/src/dis6/AcknowledgePdu.cpp +++ b/src/dis6/AcknowledgePdu.cpp @@ -2,95 +2,75 @@ using namespace DIS; - -AcknowledgePdu::AcknowledgePdu() : SimulationManagementFamilyPdu(), - _acknowledgeFlag(0), - _responseFlag(0), - _requestID(0) -{ - setPduType( 15 ); +AcknowledgePdu::AcknowledgePdu() + : SimulationManagementFamilyPdu(), + _acknowledgeFlag(0), + _responseFlag(0), + _requestID(0) { + setPduType(15); } -AcknowledgePdu::~AcknowledgePdu() -{ -} +AcknowledgePdu::~AcknowledgePdu() {} -unsigned short AcknowledgePdu::getAcknowledgeFlag() const -{ - return _acknowledgeFlag; +unsigned short AcknowledgePdu::getAcknowledgeFlag() const { + return _acknowledgeFlag; } -void AcknowledgePdu::setAcknowledgeFlag(unsigned short pX) -{ - _acknowledgeFlag = pX; +void AcknowledgePdu::setAcknowledgeFlag(unsigned short pX) { + _acknowledgeFlag = pX; } -unsigned short AcknowledgePdu::getResponseFlag() const -{ - return _responseFlag; -} +unsigned short AcknowledgePdu::getResponseFlag() const { return _responseFlag; } -void AcknowledgePdu::setResponseFlag(unsigned short pX) -{ - _responseFlag = pX; -} +void AcknowledgePdu::setResponseFlag(unsigned short pX) { _responseFlag = pX; } -unsigned int AcknowledgePdu::getRequestID() const -{ - return _requestID; -} +unsigned int AcknowledgePdu::getRequestID() const { return _requestID; } -void AcknowledgePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void AcknowledgePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void AcknowledgePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _acknowledgeFlag; - dataStream << _responseFlag; - dataStream << _requestID; +void AcknowledgePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _acknowledgeFlag; + dataStream << _responseFlag; + dataStream << _requestID; } -void AcknowledgePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _acknowledgeFlag; - dataStream >> _responseFlag; - dataStream >> _requestID; +void AcknowledgePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _acknowledgeFlag; + dataStream >> _responseFlag; + dataStream >> _requestID; } +bool AcknowledgePdu::operator==(const AcknowledgePdu& rhs) const { + bool ivarsEqual = true; -bool AcknowledgePdu::operator ==(const AcknowledgePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + if (!(_acknowledgeFlag == rhs._acknowledgeFlag)) ivarsEqual = false; + if (!(_responseFlag == rhs._responseFlag)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_acknowledgeFlag == rhs._acknowledgeFlag) ) ivarsEqual = false; - if( ! (_responseFlag == rhs._responseFlag) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AcknowledgePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int AcknowledgePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _acknowledgeFlag - marshalSize = marshalSize + 2; // _responseFlag - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _acknowledgeFlag + marshalSize = marshalSize + 2; // _responseFlag + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -103,7 +83,7 @@ int AcknowledgePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcknowledgePdu.h b/src/dis6/AcknowledgePdu.h index 449dbbff..3fa0b4eb 100644 --- a/src/dis6/AcknowledgePdu.h +++ b/src/dis6/AcknowledgePdu.h @@ -1,59 +1,56 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.6.5. Acknowledge the receiptof a start/resume, stop/freeze, or +// RemoveEntityPDU. COMPLETE -namespace DIS -{ -// Section 5.3.6.5. Acknowledge the receiptof a start/resume, stop/freeze, or RemoveEntityPDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { + protected: /** type of message being acknowledged */ - unsigned short _acknowledgeFlag; + unsigned short _acknowledgeFlag; /** Whether or not the receiving entity was able to comply with the request */ - unsigned short _responseFlag; + unsigned short _responseFlag; /** Request ID that is unique */ - unsigned int _requestID; - + unsigned int _requestID; public: - AcknowledgePdu(); - virtual ~AcknowledgePdu(); + AcknowledgePdu(); + virtual ~AcknowledgePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + unsigned short getAcknowledgeFlag() const; + void setAcknowledgeFlag(unsigned short pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + unsigned short getResponseFlag() const; + void setResponseFlag(unsigned short pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcknowledgePdu& rhs) const; + bool operator==(const AcknowledgePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -66,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcknowledgeReliablePdu.cpp b/src/dis6/AcknowledgeReliablePdu.cpp index 2eb27c63..baacd39c 100644 --- a/src/dis6/AcknowledgeReliablePdu.cpp +++ b/src/dis6/AcknowledgeReliablePdu.cpp @@ -2,95 +2,81 @@ using namespace DIS; - -AcknowledgeReliablePdu::AcknowledgeReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _acknowledgeFlag(0), - _responseFlag(0), - _requestID(0) -{ - setPduType( 55 ); +AcknowledgeReliablePdu::AcknowledgeReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _acknowledgeFlag(0), + _responseFlag(0), + _requestID(0) { + setPduType(55); } -AcknowledgeReliablePdu::~AcknowledgeReliablePdu() -{ -} +AcknowledgeReliablePdu::~AcknowledgeReliablePdu() {} -unsigned short AcknowledgeReliablePdu::getAcknowledgeFlag() const -{ - return _acknowledgeFlag; +unsigned short AcknowledgeReliablePdu::getAcknowledgeFlag() const { + return _acknowledgeFlag; } -void AcknowledgeReliablePdu::setAcknowledgeFlag(unsigned short pX) -{ - _acknowledgeFlag = pX; +void AcknowledgeReliablePdu::setAcknowledgeFlag(unsigned short pX) { + _acknowledgeFlag = pX; } -unsigned short AcknowledgeReliablePdu::getResponseFlag() const -{ - return _responseFlag; +unsigned short AcknowledgeReliablePdu::getResponseFlag() const { + return _responseFlag; } -void AcknowledgeReliablePdu::setResponseFlag(unsigned short pX) -{ - _responseFlag = pX; +void AcknowledgeReliablePdu::setResponseFlag(unsigned short pX) { + _responseFlag = pX; } -unsigned int AcknowledgeReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int AcknowledgeReliablePdu::getRequestID() const { return _requestID; } -void AcknowledgeReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void AcknowledgeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void AcknowledgeReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _acknowledgeFlag; - dataStream << _responseFlag; - dataStream << _requestID; +void AcknowledgeReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _acknowledgeFlag; + dataStream << _responseFlag; + dataStream << _requestID; } -void AcknowledgeReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _acknowledgeFlag; - dataStream >> _responseFlag; - dataStream >> _requestID; +void AcknowledgeReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _acknowledgeFlag; + dataStream >> _responseFlag; + dataStream >> _requestID; } +bool AcknowledgeReliablePdu::operator==( + const AcknowledgeReliablePdu& rhs) const { + bool ivarsEqual = true; -bool AcknowledgeReliablePdu::operator ==(const AcknowledgeReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - if( ! (_acknowledgeFlag == rhs._acknowledgeFlag) ) ivarsEqual = false; - if( ! (_responseFlag == rhs._responseFlag) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + if (!(_acknowledgeFlag == rhs._acknowledgeFlag)) ivarsEqual = false; + if (!(_responseFlag == rhs._responseFlag)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int AcknowledgeReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int AcknowledgeReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _acknowledgeFlag - marshalSize = marshalSize + 2; // _responseFlag - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _acknowledgeFlag + marshalSize = marshalSize + 2; // _responseFlag + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -103,7 +89,7 @@ int AcknowledgeReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcknowledgeReliablePdu.h b/src/dis6/AcknowledgeReliablePdu.h index 059e4b62..6bf4fccb 100644 --- a/src/dis6/AcknowledgeReliablePdu.h +++ b/src/dis6/AcknowledgeReliablePdu.h @@ -1,59 +1,57 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity +// or remove enitty (reliable) pdus. COMPLETE -namespace DIS -{ -// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity or remove enitty (reliable) pdus. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AcknowledgeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT AcknowledgeReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** ack flags */ - unsigned short _acknowledgeFlag; + unsigned short _acknowledgeFlag; /** response flags */ - unsigned short _responseFlag; + unsigned short _responseFlag; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - AcknowledgeReliablePdu(); - virtual ~AcknowledgeReliablePdu(); + AcknowledgeReliablePdu(); + virtual ~AcknowledgeReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + unsigned short getAcknowledgeFlag() const; + void setAcknowledgeFlag(unsigned short pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + unsigned short getResponseFlag() const; + void setResponseFlag(unsigned short pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcknowledgeReliablePdu& rhs) const; + bool operator==(const AcknowledgeReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -66,7 +64,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticBeamData.cpp b/src/dis6/AcousticBeamData.cpp index 6c13089b..f50a67bc 100644 --- a/src/dis6/AcousticBeamData.cpp +++ b/src/dis6/AcousticBeamData.cpp @@ -2,109 +2,90 @@ using namespace DIS; +AcousticBeamData::AcousticBeamData() + : _beamDataLength(0), + _beamIDNumber(0), + _pad2(0), + _fundamentalDataParameters() {} -AcousticBeamData::AcousticBeamData(): - _beamDataLength(0), - _beamIDNumber(0), - _pad2(0), - _fundamentalDataParameters() -{ -} - -AcousticBeamData::~AcousticBeamData() -{ -} +AcousticBeamData::~AcousticBeamData() {} -unsigned short AcousticBeamData::getBeamDataLength() const -{ - return _beamDataLength; +unsigned short AcousticBeamData::getBeamDataLength() const { + return _beamDataLength; } -void AcousticBeamData::setBeamDataLength(unsigned short pX) -{ - _beamDataLength = pX; +void AcousticBeamData::setBeamDataLength(unsigned short pX) { + _beamDataLength = pX; } -unsigned char AcousticBeamData::getBeamIDNumber() const -{ - return _beamIDNumber; +unsigned char AcousticBeamData::getBeamIDNumber() const { + return _beamIDNumber; } -void AcousticBeamData::setBeamIDNumber(unsigned char pX) -{ - _beamIDNumber = pX; -} +void AcousticBeamData::setBeamIDNumber(unsigned char pX) { _beamIDNumber = pX; } -unsigned short AcousticBeamData::getPad2() const -{ - return _pad2; -} +unsigned short AcousticBeamData::getPad2() const { return _pad2; } -void AcousticBeamData::setPad2(unsigned short pX) -{ - _pad2 = pX; -} +void AcousticBeamData::setPad2(unsigned short pX) { _pad2 = pX; } -AcousticBeamFundamentalParameter& AcousticBeamData::getFundamentalDataParameters() -{ - return _fundamentalDataParameters; +AcousticBeamFundamentalParameter& +AcousticBeamData::getFundamentalDataParameters() { + return _fundamentalDataParameters; } -const AcousticBeamFundamentalParameter& AcousticBeamData::getFundamentalDataParameters() const -{ - return _fundamentalDataParameters; +const AcousticBeamFundamentalParameter& +AcousticBeamData::getFundamentalDataParameters() const { + return _fundamentalDataParameters; } -void AcousticBeamData::setFundamentalDataParameters(const AcousticBeamFundamentalParameter &pX) -{ - _fundamentalDataParameters = pX; +void AcousticBeamData::setFundamentalDataParameters( + const AcousticBeamFundamentalParameter& pX) { + _fundamentalDataParameters = pX; } -void AcousticBeamData::marshal(DataStream& dataStream) const -{ - dataStream << _beamDataLength; - dataStream << _beamIDNumber; - dataStream << _pad2; - _fundamentalDataParameters.marshal(dataStream); +void AcousticBeamData::marshal(DataStream& dataStream) const { + dataStream << _beamDataLength; + dataStream << _beamIDNumber; + dataStream << _pad2; + _fundamentalDataParameters.marshal(dataStream); } -void AcousticBeamData::unmarshal(DataStream& dataStream) -{ - dataStream >> _beamDataLength; - dataStream >> _beamIDNumber; - dataStream >> _pad2; - _fundamentalDataParameters.unmarshal(dataStream); +void AcousticBeamData::unmarshal(DataStream& dataStream) { + dataStream >> _beamDataLength; + dataStream >> _beamIDNumber; + dataStream >> _pad2; + _fundamentalDataParameters.unmarshal(dataStream); } +bool AcousticBeamData::operator==(const AcousticBeamData& rhs) const { + bool ivarsEqual = true; -bool AcousticBeamData::operator ==(const AcousticBeamData& rhs) const - { - bool ivarsEqual = true; + if (!(_beamDataLength == rhs._beamDataLength)) ivarsEqual = false; + if (!(_beamIDNumber == rhs._beamIDNumber)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_fundamentalDataParameters == rhs._fundamentalDataParameters)) + ivarsEqual = false; - if( ! (_beamDataLength == rhs._beamDataLength) ) ivarsEqual = false; - if( ! (_beamIDNumber == rhs._beamIDNumber) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_fundamentalDataParameters == rhs._fundamentalDataParameters) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AcousticBeamData::getMarshalledSize() const -{ - int marshalSize = 0; +int AcousticBeamData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _beamDataLength - marshalSize = marshalSize + 1; // _beamIDNumber - marshalSize = marshalSize + 2; // _pad2 - marshalSize = marshalSize + _fundamentalDataParameters.getMarshalledSize(); // _fundamentalDataParameters - return marshalSize; + marshalSize = marshalSize + 2; // _beamDataLength + marshalSize = marshalSize + 1; // _beamIDNumber + marshalSize = marshalSize + 2; // _pad2 + marshalSize = + marshalSize + _fundamentalDataParameters + .getMarshalledSize(); // _fundamentalDataParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -117,7 +98,7 @@ int AcousticBeamData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticBeamData.h b/src/dis6/AcousticBeamData.h index e5bdf1e4..3dfeb8f7 100644 --- a/src/dis6/AcousticBeamData.h +++ b/src/dis6/AcousticBeamData.h @@ -1,66 +1,62 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Used in UA PDU -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticBeamData -{ -protected: +class OPENDIS6_EXPORT AcousticBeamData { + protected: /** beam data length */ - unsigned short _beamDataLength; + unsigned short _beamDataLength; /** beamIDNumber */ - unsigned char _beamIDNumber; + unsigned char _beamIDNumber; /** padding */ - unsigned short _pad2; + unsigned short _pad2; /** fundamental data parameters */ - AcousticBeamFundamentalParameter _fundamentalDataParameters; - + AcousticBeamFundamentalParameter _fundamentalDataParameters; public: - AcousticBeamData(); - virtual ~AcousticBeamData(); + AcousticBeamData(); + virtual ~AcousticBeamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getBeamDataLength() const; - void setBeamDataLength(unsigned short pX); + unsigned short getBeamDataLength() const; + void setBeamDataLength(unsigned short pX); - unsigned char getBeamIDNumber() const; - void setBeamIDNumber(unsigned char pX); + unsigned char getBeamIDNumber() const; + void setBeamIDNumber(unsigned char pX); - unsigned short getPad2() const; - void setPad2(unsigned short pX); + unsigned short getPad2() const; + void setPad2(unsigned short pX); - AcousticBeamFundamentalParameter& getFundamentalDataParameters(); - const AcousticBeamFundamentalParameter& getFundamentalDataParameters() const; - void setFundamentalDataParameters(const AcousticBeamFundamentalParameter &pX); + AcousticBeamFundamentalParameter& getFundamentalDataParameters(); + const AcousticBeamFundamentalParameter& getFundamentalDataParameters() const; + void setFundamentalDataParameters(const AcousticBeamFundamentalParameter& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcousticBeamData& rhs) const; + bool operator==(const AcousticBeamData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -73,7 +69,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticBeamFundamentalParameter.cpp b/src/dis6/AcousticBeamFundamentalParameter.cpp index 334ed36f..112da484 100644 --- a/src/dis6/AcousticBeamFundamentalParameter.cpp +++ b/src/dis6/AcousticBeamFundamentalParameter.cpp @@ -2,134 +2,116 @@ using namespace DIS; +AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter() + : _activeEmissionParameterIndex(0), + _scanPattern(0), + _beamCenterAzimuth(0.0), + _azimuthalBeamwidth(0.0), + _beamCenterDE(0.0), + _deBeamwidth(0.0) {} -AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter(): - _activeEmissionParameterIndex(0), - _scanPattern(0), - _beamCenterAzimuth(0.0), - _azimuthalBeamwidth(0.0), - _beamCenterDE(0.0), - _deBeamwidth(0.0) -{ -} - -AcousticBeamFundamentalParameter::~AcousticBeamFundamentalParameter() -{ -} +AcousticBeamFundamentalParameter::~AcousticBeamFundamentalParameter() {} -unsigned short AcousticBeamFundamentalParameter::getActiveEmissionParameterIndex() const -{ - return _activeEmissionParameterIndex; +unsigned short +AcousticBeamFundamentalParameter::getActiveEmissionParameterIndex() const { + return _activeEmissionParameterIndex; } -void AcousticBeamFundamentalParameter::setActiveEmissionParameterIndex(unsigned short pX) -{ - _activeEmissionParameterIndex = pX; +void AcousticBeamFundamentalParameter::setActiveEmissionParameterIndex( + unsigned short pX) { + _activeEmissionParameterIndex = pX; } -unsigned short AcousticBeamFundamentalParameter::getScanPattern() const -{ - return _scanPattern; +unsigned short AcousticBeamFundamentalParameter::getScanPattern() const { + return _scanPattern; } -void AcousticBeamFundamentalParameter::setScanPattern(unsigned short pX) -{ - _scanPattern = pX; +void AcousticBeamFundamentalParameter::setScanPattern(unsigned short pX) { + _scanPattern = pX; } -float AcousticBeamFundamentalParameter::getBeamCenterAzimuth() const -{ - return _beamCenterAzimuth; +float AcousticBeamFundamentalParameter::getBeamCenterAzimuth() const { + return _beamCenterAzimuth; } -void AcousticBeamFundamentalParameter::setBeamCenterAzimuth(float pX) -{ - _beamCenterAzimuth = pX; +void AcousticBeamFundamentalParameter::setBeamCenterAzimuth(float pX) { + _beamCenterAzimuth = pX; } -float AcousticBeamFundamentalParameter::getAzimuthalBeamwidth() const -{ - return _azimuthalBeamwidth; +float AcousticBeamFundamentalParameter::getAzimuthalBeamwidth() const { + return _azimuthalBeamwidth; } -void AcousticBeamFundamentalParameter::setAzimuthalBeamwidth(float pX) -{ - _azimuthalBeamwidth = pX; +void AcousticBeamFundamentalParameter::setAzimuthalBeamwidth(float pX) { + _azimuthalBeamwidth = pX; } -float AcousticBeamFundamentalParameter::getBeamCenterDE() const -{ - return _beamCenterDE; +float AcousticBeamFundamentalParameter::getBeamCenterDE() const { + return _beamCenterDE; } -void AcousticBeamFundamentalParameter::setBeamCenterDE(float pX) -{ - _beamCenterDE = pX; +void AcousticBeamFundamentalParameter::setBeamCenterDE(float pX) { + _beamCenterDE = pX; } -float AcousticBeamFundamentalParameter::getDeBeamwidth() const -{ - return _deBeamwidth; +float AcousticBeamFundamentalParameter::getDeBeamwidth() const { + return _deBeamwidth; } -void AcousticBeamFundamentalParameter::setDeBeamwidth(float pX) -{ - _deBeamwidth = pX; +void AcousticBeamFundamentalParameter::setDeBeamwidth(float pX) { + _deBeamwidth = pX; } -void AcousticBeamFundamentalParameter::marshal(DataStream& dataStream) const -{ - dataStream << _activeEmissionParameterIndex; - dataStream << _scanPattern; - dataStream << _beamCenterAzimuth; - dataStream << _azimuthalBeamwidth; - dataStream << _beamCenterDE; - dataStream << _deBeamwidth; +void AcousticBeamFundamentalParameter::marshal(DataStream& dataStream) const { + dataStream << _activeEmissionParameterIndex; + dataStream << _scanPattern; + dataStream << _beamCenterAzimuth; + dataStream << _azimuthalBeamwidth; + dataStream << _beamCenterDE; + dataStream << _deBeamwidth; } -void AcousticBeamFundamentalParameter::unmarshal(DataStream& dataStream) -{ - dataStream >> _activeEmissionParameterIndex; - dataStream >> _scanPattern; - dataStream >> _beamCenterAzimuth; - dataStream >> _azimuthalBeamwidth; - dataStream >> _beamCenterDE; - dataStream >> _deBeamwidth; +void AcousticBeamFundamentalParameter::unmarshal(DataStream& dataStream) { + dataStream >> _activeEmissionParameterIndex; + dataStream >> _scanPattern; + dataStream >> _beamCenterAzimuth; + dataStream >> _azimuthalBeamwidth; + dataStream >> _beamCenterDE; + dataStream >> _deBeamwidth; } +bool AcousticBeamFundamentalParameter::operator==( + const AcousticBeamFundamentalParameter& rhs) const { + bool ivarsEqual = true; -bool AcousticBeamFundamentalParameter::operator ==(const AcousticBeamFundamentalParameter& rhs) const - { - bool ivarsEqual = true; + if (!(_activeEmissionParameterIndex == rhs._activeEmissionParameterIndex)) + ivarsEqual = false; + if (!(_scanPattern == rhs._scanPattern)) ivarsEqual = false; + if (!(_beamCenterAzimuth == rhs._beamCenterAzimuth)) ivarsEqual = false; + if (!(_azimuthalBeamwidth == rhs._azimuthalBeamwidth)) ivarsEqual = false; + if (!(_beamCenterDE == rhs._beamCenterDE)) ivarsEqual = false; + if (!(_deBeamwidth == rhs._deBeamwidth)) ivarsEqual = false; - if( ! (_activeEmissionParameterIndex == rhs._activeEmissionParameterIndex) ) ivarsEqual = false; - if( ! (_scanPattern == rhs._scanPattern) ) ivarsEqual = false; - if( ! (_beamCenterAzimuth == rhs._beamCenterAzimuth) ) ivarsEqual = false; - if( ! (_azimuthalBeamwidth == rhs._azimuthalBeamwidth) ) ivarsEqual = false; - if( ! (_beamCenterDE == rhs._beamCenterDE) ) ivarsEqual = false; - if( ! (_deBeamwidth == rhs._deBeamwidth) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AcousticBeamFundamentalParameter::getMarshalledSize() const -{ - int marshalSize = 0; +int AcousticBeamFundamentalParameter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _activeEmissionParameterIndex - marshalSize = marshalSize + 2; // _scanPattern - marshalSize = marshalSize + 4; // _beamCenterAzimuth - marshalSize = marshalSize + 4; // _azimuthalBeamwidth - marshalSize = marshalSize + 4; // _beamCenterDE - marshalSize = marshalSize + 4; // _deBeamwidth - return marshalSize; + marshalSize = marshalSize + 2; // _activeEmissionParameterIndex + marshalSize = marshalSize + 2; // _scanPattern + marshalSize = marshalSize + 4; // _beamCenterAzimuth + marshalSize = marshalSize + 4; // _azimuthalBeamwidth + marshalSize = marshalSize + 4; // _beamCenterDE + marshalSize = marshalSize + 4; // _deBeamwidth + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +124,7 @@ int AcousticBeamFundamentalParameter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticBeamFundamentalParameter.h b/src/dis6/AcousticBeamFundamentalParameter.h index b1e7f8e6..29e050e2 100644 --- a/src/dis6/AcousticBeamFundamentalParameter.h +++ b/src/dis6/AcousticBeamFundamentalParameter.h @@ -1,76 +1,72 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Used in UaPdu -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticBeamFundamentalParameter -{ -protected: +class OPENDIS6_EXPORT AcousticBeamFundamentalParameter { + protected: /** parameter index */ - unsigned short _activeEmissionParameterIndex; + unsigned short _activeEmissionParameterIndex; /** scan pattern */ - unsigned short _scanPattern; + unsigned short _scanPattern; /** beam center azimuth */ - float _beamCenterAzimuth; + float _beamCenterAzimuth; /** azimuthal beamwidth */ - float _azimuthalBeamwidth; + float _azimuthalBeamwidth; /** beam center */ - float _beamCenterDE; + float _beamCenterDE; /** DE beamwidth (vertical beamwidth) */ - float _deBeamwidth; - + float _deBeamwidth; public: - AcousticBeamFundamentalParameter(); - virtual ~AcousticBeamFundamentalParameter(); + AcousticBeamFundamentalParameter(); + virtual ~AcousticBeamFundamentalParameter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getActiveEmissionParameterIndex() const; - void setActiveEmissionParameterIndex(unsigned short pX); + unsigned short getActiveEmissionParameterIndex() const; + void setActiveEmissionParameterIndex(unsigned short pX); - unsigned short getScanPattern() const; - void setScanPattern(unsigned short pX); + unsigned short getScanPattern() const; + void setScanPattern(unsigned short pX); - float getBeamCenterAzimuth() const; - void setBeamCenterAzimuth(float pX); + float getBeamCenterAzimuth() const; + void setBeamCenterAzimuth(float pX); - float getAzimuthalBeamwidth() const; - void setAzimuthalBeamwidth(float pX); + float getAzimuthalBeamwidth() const; + void setAzimuthalBeamwidth(float pX); - float getBeamCenterDE() const; - void setBeamCenterDE(float pX); + float getBeamCenterDE() const; + void setBeamCenterDE(float pX); - float getDeBeamwidth() const; - void setDeBeamwidth(float pX); + float getDeBeamwidth() const; + void setDeBeamwidth(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcousticBeamFundamentalParameter& rhs) const; + bool operator==(const AcousticBeamFundamentalParameter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +79,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticEmitter.cpp b/src/dis6/AcousticEmitter.cpp index 9a8161c8..3e1785d0 100644 --- a/src/dis6/AcousticEmitter.cpp +++ b/src/dis6/AcousticEmitter.cpp @@ -2,89 +2,65 @@ using namespace DIS; +AcousticEmitter::AcousticEmitter() + : _acousticName(0), _function(0), _acousticIdNumber(0) {} -AcousticEmitter::AcousticEmitter(): - _acousticName(0), - _function(0), - _acousticIdNumber(0) -{ -} - -AcousticEmitter::~AcousticEmitter() -{ -} +AcousticEmitter::~AcousticEmitter() {} -unsigned short AcousticEmitter::getAcousticName() const -{ - return _acousticName; +unsigned short AcousticEmitter::getAcousticName() const { + return _acousticName; } -void AcousticEmitter::setAcousticName(unsigned short pX) -{ - _acousticName = pX; -} +void AcousticEmitter::setAcousticName(unsigned short pX) { _acousticName = pX; } -unsigned char AcousticEmitter::getFunction() const -{ - return _function; -} +unsigned char AcousticEmitter::getFunction() const { return _function; } -void AcousticEmitter::setFunction(unsigned char pX) -{ - _function = pX; -} +void AcousticEmitter::setFunction(unsigned char pX) { _function = pX; } -unsigned char AcousticEmitter::getAcousticIdNumber() const -{ - return _acousticIdNumber; +unsigned char AcousticEmitter::getAcousticIdNumber() const { + return _acousticIdNumber; } -void AcousticEmitter::setAcousticIdNumber(unsigned char pX) -{ - _acousticIdNumber = pX; +void AcousticEmitter::setAcousticIdNumber(unsigned char pX) { + _acousticIdNumber = pX; } -void AcousticEmitter::marshal(DataStream& dataStream) const -{ - dataStream << _acousticName; - dataStream << _function; - dataStream << _acousticIdNumber; +void AcousticEmitter::marshal(DataStream& dataStream) const { + dataStream << _acousticName; + dataStream << _function; + dataStream << _acousticIdNumber; } -void AcousticEmitter::unmarshal(DataStream& dataStream) -{ - dataStream >> _acousticName; - dataStream >> _function; - dataStream >> _acousticIdNumber; +void AcousticEmitter::unmarshal(DataStream& dataStream) { + dataStream >> _acousticName; + dataStream >> _function; + dataStream >> _acousticIdNumber; } +bool AcousticEmitter::operator==(const AcousticEmitter& rhs) const { + bool ivarsEqual = true; -bool AcousticEmitter::operator ==(const AcousticEmitter& rhs) const - { - bool ivarsEqual = true; + if (!(_acousticName == rhs._acousticName)) ivarsEqual = false; + if (!(_function == rhs._function)) ivarsEqual = false; + if (!(_acousticIdNumber == rhs._acousticIdNumber)) ivarsEqual = false; - if( ! (_acousticName == rhs._acousticName) ) ivarsEqual = false; - if( ! (_function == rhs._function) ) ivarsEqual = false; - if( ! (_acousticIdNumber == rhs._acousticIdNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AcousticEmitter::getMarshalledSize() const -{ - int marshalSize = 0; +int AcousticEmitter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _acousticName - marshalSize = marshalSize + 1; // _function - marshalSize = marshalSize + 1; // _acousticIdNumber - return marshalSize; + marshalSize = marshalSize + 2; // _acousticName + marshalSize = marshalSize + 1; // _function + marshalSize = marshalSize + 1; // _acousticIdNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +73,7 @@ int AcousticEmitter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticEmitter.h b/src/dis6/AcousticEmitter.h index ab3cb0d2..69312a80 100644 --- a/src/dis6/AcousticEmitter.h +++ b/src/dis6/AcousticEmitter.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.35. information about a specific UA emmtter -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticEmitter -{ -protected: +class OPENDIS6_EXPORT AcousticEmitter { + protected: /** the system for a particular UA emitter, and an enumeration */ - unsigned short _acousticName; + unsigned short _acousticName; /** The function of the acoustic system */ - unsigned char _function; + unsigned char _function; /** The UA emitter identification number relative to a specific system */ - unsigned char _acousticIdNumber; - + unsigned char _acousticIdNumber; public: - AcousticEmitter(); - virtual ~AcousticEmitter(); + AcousticEmitter(); + virtual ~AcousticEmitter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getAcousticName() const; - void setAcousticName(unsigned short pX); + unsigned short getAcousticName() const; + void setAcousticName(unsigned short pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + unsigned char getFunction() const; + void setFunction(unsigned char pX); - unsigned char getAcousticIdNumber() const; - void setAcousticIdNumber(unsigned char pX); + unsigned char getAcousticIdNumber() const; + void setAcousticIdNumber(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcousticEmitter& rhs) const; + bool operator==(const AcousticEmitter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticEmitterSystem.cpp b/src/dis6/AcousticEmitterSystem.cpp index 4575e6b0..77fa3e72 100644 --- a/src/dis6/AcousticEmitterSystem.cpp +++ b/src/dis6/AcousticEmitterSystem.cpp @@ -2,89 +2,71 @@ using namespace DIS; +AcousticEmitterSystem::AcousticEmitterSystem() + : _acousticName(0), _acousticFunction(0), _acousticID(0) {} -AcousticEmitterSystem::AcousticEmitterSystem(): - _acousticName(0), - _acousticFunction(0), - _acousticID(0) -{ -} - -AcousticEmitterSystem::~AcousticEmitterSystem() -{ -} +AcousticEmitterSystem::~AcousticEmitterSystem() {} -unsigned short AcousticEmitterSystem::getAcousticName() const -{ - return _acousticName; +unsigned short AcousticEmitterSystem::getAcousticName() const { + return _acousticName; } -void AcousticEmitterSystem::setAcousticName(unsigned short pX) -{ - _acousticName = pX; +void AcousticEmitterSystem::setAcousticName(unsigned short pX) { + _acousticName = pX; } -unsigned char AcousticEmitterSystem::getAcousticFunction() const -{ - return _acousticFunction; +unsigned char AcousticEmitterSystem::getAcousticFunction() const { + return _acousticFunction; } -void AcousticEmitterSystem::setAcousticFunction(unsigned char pX) -{ - _acousticFunction = pX; +void AcousticEmitterSystem::setAcousticFunction(unsigned char pX) { + _acousticFunction = pX; } -unsigned char AcousticEmitterSystem::getAcousticID() const -{ - return _acousticID; +unsigned char AcousticEmitterSystem::getAcousticID() const { + return _acousticID; } -void AcousticEmitterSystem::setAcousticID(unsigned char pX) -{ - _acousticID = pX; +void AcousticEmitterSystem::setAcousticID(unsigned char pX) { + _acousticID = pX; } -void AcousticEmitterSystem::marshal(DataStream& dataStream) const -{ - dataStream << _acousticName; - dataStream << _acousticFunction; - dataStream << _acousticID; +void AcousticEmitterSystem::marshal(DataStream& dataStream) const { + dataStream << _acousticName; + dataStream << _acousticFunction; + dataStream << _acousticID; } -void AcousticEmitterSystem::unmarshal(DataStream& dataStream) -{ - dataStream >> _acousticName; - dataStream >> _acousticFunction; - dataStream >> _acousticID; +void AcousticEmitterSystem::unmarshal(DataStream& dataStream) { + dataStream >> _acousticName; + dataStream >> _acousticFunction; + dataStream >> _acousticID; } +bool AcousticEmitterSystem::operator==(const AcousticEmitterSystem& rhs) const { + bool ivarsEqual = true; -bool AcousticEmitterSystem::operator ==(const AcousticEmitterSystem& rhs) const - { - bool ivarsEqual = true; + if (!(_acousticName == rhs._acousticName)) ivarsEqual = false; + if (!(_acousticFunction == rhs._acousticFunction)) ivarsEqual = false; + if (!(_acousticID == rhs._acousticID)) ivarsEqual = false; - if( ! (_acousticName == rhs._acousticName) ) ivarsEqual = false; - if( ! (_acousticFunction == rhs._acousticFunction) ) ivarsEqual = false; - if( ! (_acousticID == rhs._acousticID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AcousticEmitterSystem::getMarshalledSize() const -{ - int marshalSize = 0; +int AcousticEmitterSystem::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _acousticName - marshalSize = marshalSize + 1; // _acousticFunction - marshalSize = marshalSize + 1; // _acousticID - return marshalSize; + marshalSize = marshalSize + 2; // _acousticName + marshalSize = marshalSize + 1; // _acousticFunction + marshalSize = marshalSize + 1; // _acousticID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +79,7 @@ int AcousticEmitterSystem::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticEmitterSystem.h b/src/dis6/AcousticEmitterSystem.h index d8eb618c..06d292b4 100644 --- a/src/dis6/AcousticEmitterSystem.h +++ b/src/dis6/AcousticEmitterSystem.h @@ -1,58 +1,61 @@ #pragma once -#include #include +#include +namespace DIS { +// 5.3.35: Information about a particular UA emitter shall be represented using +// an Acoustic Emitter System record. This record shall consist of three fields: +// Acoustic Name, Function, and Acoustic ID Number -namespace DIS -{ -// 5.3.35: Information about a particular UA emitter shall be represented using an Acoustic Emitter System record. This record shall consist of three fields: Acoustic Name, Function, and Acoustic ID Number - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticEmitterSystem -{ -protected: +class OPENDIS6_EXPORT AcousticEmitterSystem { + protected: /** This field shall specify the system for a particular UA emitter. */ - unsigned short _acousticName; + unsigned short _acousticName; /** This field shall describe the function of the acoustic system. */ - unsigned char _acousticFunction; - - /** This field shall specify the UA emitter identification number relative to a specific system. This field shall be represented by an 8-bit unsigned integer. This field allows the differentiation of multiple systems on an entity, even if in some instances two or more of the systems may be identical UA emitter types. Numbering of systems shall begin with the value 1. */ - unsigned char _acousticID; + unsigned char _acousticFunction; + /** This field shall specify the UA emitter identification number relative to + * a specific system. This field shall be represented by an 8-bit unsigned + * integer. This field allows the differentiation of multiple systems on an + * entity, even if in some instances two or more of the systems may be + * identical UA emitter types. Numbering of systems shall begin with the + * value 1. */ + unsigned char _acousticID; public: - AcousticEmitterSystem(); - virtual ~AcousticEmitterSystem(); + AcousticEmitterSystem(); + virtual ~AcousticEmitterSystem(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getAcousticName() const; - void setAcousticName(unsigned short pX); + unsigned short getAcousticName() const; + void setAcousticName(unsigned short pX); - unsigned char getAcousticFunction() const; - void setAcousticFunction(unsigned char pX); + unsigned char getAcousticFunction() const; + void setAcousticFunction(unsigned char pX); - unsigned char getAcousticID() const; - void setAcousticID(unsigned char pX); + unsigned char getAcousticID() const; + void setAcousticID(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcousticEmitterSystem& rhs) const; + bool operator==(const AcousticEmitterSystem& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +68,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticEmitterSystemData.cpp b/src/dis6/AcousticEmitterSystemData.cpp index 5e6aa798..af9c7d9c 100644 --- a/src/dis6/AcousticEmitterSystemData.cpp +++ b/src/dis6/AcousticEmitterSystemData.cpp @@ -2,167 +2,144 @@ using namespace DIS; +AcousticEmitterSystemData::AcousticEmitterSystemData() + : _emitterSystemDataLength(0), + _numberOfBeams(0), + _pad2(0), + _acousticEmitterSystem(), + _emitterLocation() {} -AcousticEmitterSystemData::AcousticEmitterSystemData(): - _emitterSystemDataLength(0), - _numberOfBeams(0), - _pad2(0), - _acousticEmitterSystem(), - _emitterLocation() -{ +AcousticEmitterSystemData::~AcousticEmitterSystemData() { + _beamRecords.clear(); } -AcousticEmitterSystemData::~AcousticEmitterSystemData() -{ - _beamRecords.clear(); +unsigned char AcousticEmitterSystemData::getEmitterSystemDataLength() const { + return _emitterSystemDataLength; } -unsigned char AcousticEmitterSystemData::getEmitterSystemDataLength() const -{ - return _emitterSystemDataLength; +void AcousticEmitterSystemData::setEmitterSystemDataLength(unsigned char pX) { + _emitterSystemDataLength = pX; } -void AcousticEmitterSystemData::setEmitterSystemDataLength(unsigned char pX) -{ - _emitterSystemDataLength = pX; +unsigned char AcousticEmitterSystemData::getNumberOfBeams() const { + return _beamRecords.size(); } -unsigned char AcousticEmitterSystemData::getNumberOfBeams() const -{ - return _beamRecords.size(); -} - -unsigned short AcousticEmitterSystemData::getPad2() const -{ - return _pad2; -} +unsigned short AcousticEmitterSystemData::getPad2() const { return _pad2; } -void AcousticEmitterSystemData::setPad2(unsigned short pX) -{ - _pad2 = pX; -} +void AcousticEmitterSystemData::setPad2(unsigned short pX) { _pad2 = pX; } -AcousticEmitterSystem& AcousticEmitterSystemData::getAcousticEmitterSystem() -{ - return _acousticEmitterSystem; +AcousticEmitterSystem& AcousticEmitterSystemData::getAcousticEmitterSystem() { + return _acousticEmitterSystem; } -const AcousticEmitterSystem& AcousticEmitterSystemData::getAcousticEmitterSystem() const -{ - return _acousticEmitterSystem; +const AcousticEmitterSystem& +AcousticEmitterSystemData::getAcousticEmitterSystem() const { + return _acousticEmitterSystem; } -void AcousticEmitterSystemData::setAcousticEmitterSystem(const AcousticEmitterSystem &pX) -{ - _acousticEmitterSystem = pX; +void AcousticEmitterSystemData::setAcousticEmitterSystem( + const AcousticEmitterSystem& pX) { + _acousticEmitterSystem = pX; } -Vector3Float& AcousticEmitterSystemData::getEmitterLocation() -{ - return _emitterLocation; +Vector3Float& AcousticEmitterSystemData::getEmitterLocation() { + return _emitterLocation; } -const Vector3Float& AcousticEmitterSystemData::getEmitterLocation() const -{ - return _emitterLocation; +const Vector3Float& AcousticEmitterSystemData::getEmitterLocation() const { + return _emitterLocation; } -void AcousticEmitterSystemData::setEmitterLocation(const Vector3Float &pX) -{ - _emitterLocation = pX; +void AcousticEmitterSystemData::setEmitterLocation(const Vector3Float& pX) { + _emitterLocation = pX; } -std::vector& AcousticEmitterSystemData::getBeamRecords() -{ - return _beamRecords; +std::vector& AcousticEmitterSystemData::getBeamRecords() { + return _beamRecords; } -const std::vector& AcousticEmitterSystemData::getBeamRecords() const -{ - return _beamRecords; +const std::vector& AcousticEmitterSystemData::getBeamRecords() + const { + return _beamRecords; } -void AcousticEmitterSystemData::setBeamRecords(const std::vector& pX) -{ - _beamRecords = pX; +void AcousticEmitterSystemData::setBeamRecords( + const std::vector& pX) { + _beamRecords = pX; } -void AcousticEmitterSystemData::marshal(DataStream& dataStream) const -{ - dataStream << _emitterSystemDataLength; - dataStream << ( unsigned char )_beamRecords.size(); - dataStream << _pad2; - _acousticEmitterSystem.marshal(dataStream); - _emitterLocation.marshal(dataStream); - - for(size_t idx = 0; idx < _beamRecords.size(); idx++) - { - AcousticBeamData x = _beamRecords[idx]; - x.marshal(dataStream); - } +void AcousticEmitterSystemData::marshal(DataStream& dataStream) const { + dataStream << _emitterSystemDataLength; + dataStream << (unsigned char)_beamRecords.size(); + dataStream << _pad2; + _acousticEmitterSystem.marshal(dataStream); + _emitterLocation.marshal(dataStream); + for (size_t idx = 0; idx < _beamRecords.size(); idx++) { + AcousticBeamData x = _beamRecords[idx]; + x.marshal(dataStream); + } } -void AcousticEmitterSystemData::unmarshal(DataStream& dataStream) -{ - dataStream >> _emitterSystemDataLength; - dataStream >> _numberOfBeams; - dataStream >> _pad2; - _acousticEmitterSystem.unmarshal(dataStream); - _emitterLocation.unmarshal(dataStream); +void AcousticEmitterSystemData::unmarshal(DataStream& dataStream) { + dataStream >> _emitterSystemDataLength; + dataStream >> _numberOfBeams; + dataStream >> _pad2; + _acousticEmitterSystem.unmarshal(dataStream); + _emitterLocation.unmarshal(dataStream); - _beamRecords.clear(); - for(size_t idx = 0; idx < _numberOfBeams; idx++) - { - AcousticBeamData x; - x.unmarshal(dataStream); - _beamRecords.push_back(x); - } + _beamRecords.clear(); + for (size_t idx = 0; idx < _numberOfBeams; idx++) { + AcousticBeamData x; + x.unmarshal(dataStream); + _beamRecords.push_back(x); + } } +bool AcousticEmitterSystemData::operator==( + const AcousticEmitterSystemData& rhs) const { + bool ivarsEqual = true; -bool AcousticEmitterSystemData::operator ==(const AcousticEmitterSystemData& rhs) const - { - bool ivarsEqual = true; - - if( ! (_emitterSystemDataLength == rhs._emitterSystemDataLength) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_acousticEmitterSystem == rhs._acousticEmitterSystem) ) ivarsEqual = false; - if( ! (_emitterLocation == rhs._emitterLocation) ) ivarsEqual = false; + if (!(_emitterSystemDataLength == rhs._emitterSystemDataLength)) + ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_acousticEmitterSystem == rhs._acousticEmitterSystem)) + ivarsEqual = false; + if (!(_emitterLocation == rhs._emitterLocation)) ivarsEqual = false; - for(size_t idx = 0; idx < _beamRecords.size(); idx++) - { - if( ! ( _beamRecords[idx] == rhs._beamRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _beamRecords.size(); idx++) { + if (!(_beamRecords[idx] == rhs._beamRecords[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int AcousticEmitterSystemData::getMarshalledSize() const -{ - int marshalSize = 0; +int AcousticEmitterSystemData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _emitterSystemDataLength - marshalSize = marshalSize + 1; // _numberOfBeams - marshalSize = marshalSize + 2; // _pad2 - marshalSize = marshalSize + _acousticEmitterSystem.getMarshalledSize(); // _acousticEmitterSystem - marshalSize = marshalSize + _emitterLocation.getMarshalledSize(); // _emitterLocation + marshalSize = marshalSize + 1; // _emitterSystemDataLength + marshalSize = marshalSize + 1; // _numberOfBeams + marshalSize = marshalSize + 2; // _pad2 + marshalSize = + marshalSize + + _acousticEmitterSystem.getMarshalledSize(); // _acousticEmitterSystem + marshalSize = + marshalSize + _emitterLocation.getMarshalledSize(); // _emitterLocation - for(unsigned long long idx=0; idx < _beamRecords.size(); idx++) - { - AcousticBeamData listElement = _beamRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _beamRecords.size(); idx++) { + AcousticBeamData listElement = _beamRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -175,7 +152,7 @@ int AcousticEmitterSystemData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AcousticEmitterSystemData.h b/src/dis6/AcousticEmitterSystemData.h index 9f97d64e..f51e748f 100644 --- a/src/dis6/AcousticEmitterSystemData.h +++ b/src/dis6/AcousticEmitterSystemData.h @@ -1,82 +1,82 @@ #pragma once +#include + +#include #include #include -#include -#include -#include #include +#include +namespace DIS { +// Used in the UA pdu; ties together an emmitter and a location. This requires +// manual cleanup; the beam data should not be attached to each emitter system. -namespace DIS -{ -// Used in the UA pdu; ties together an emmitter and a location. This requires manual cleanup; the beam data should not be attached to each emitter system. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticEmitterSystemData -{ -protected: +class OPENDIS6_EXPORT AcousticEmitterSystemData { + protected: /** Length of emitter system data */ - unsigned char _emitterSystemDataLength; + unsigned char _emitterSystemDataLength; /** Number of beams */ - unsigned char _numberOfBeams; + unsigned char _numberOfBeams; /** padding */ - unsigned short _pad2; + unsigned short _pad2; /** This field shall specify the system for a particular UA emitter. */ - AcousticEmitterSystem _acousticEmitterSystem; + AcousticEmitterSystem _acousticEmitterSystem; /** Represents the location wrt the entity */ - Vector3Float _emitterLocation; - - /** For each beam in numberOfBeams, an emitter system. This is not right--the beam records need to be at the end of the PDU, rather than attached to each system. */ - std::vector _beamRecords; + Vector3Float _emitterLocation; + /** For each beam in numberOfBeams, an emitter system. This is not right--the + * beam records need to be at the end of the PDU, rather than attached to each + * system. */ + std::vector _beamRecords; public: - AcousticEmitterSystemData(); - virtual ~AcousticEmitterSystemData(); + AcousticEmitterSystemData(); + virtual ~AcousticEmitterSystemData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getEmitterSystemDataLength() const; - void setEmitterSystemDataLength(unsigned char pX); + unsigned char getEmitterSystemDataLength() const; + void setEmitterSystemDataLength(unsigned char pX); - unsigned char getNumberOfBeams() const; + unsigned char getNumberOfBeams() const; - unsigned short getPad2() const; - void setPad2(unsigned short pX); + unsigned short getPad2() const; + void setPad2(unsigned short pX); - AcousticEmitterSystem& getAcousticEmitterSystem(); - const AcousticEmitterSystem& getAcousticEmitterSystem() const; - void setAcousticEmitterSystem(const AcousticEmitterSystem &pX); + AcousticEmitterSystem& getAcousticEmitterSystem(); + const AcousticEmitterSystem& getAcousticEmitterSystem() const; + void setAcousticEmitterSystem(const AcousticEmitterSystem& pX); - Vector3Float& getEmitterLocation(); - const Vector3Float& getEmitterLocation() const; - void setEmitterLocation(const Vector3Float &pX); + Vector3Float& getEmitterLocation(); + const Vector3Float& getEmitterLocation() const; + void setEmitterLocation(const Vector3Float& pX); - std::vector& getBeamRecords(); - const std::vector& getBeamRecords() const; - void setBeamRecords(const std::vector& pX); + std::vector& getBeamRecords(); + const std::vector& getBeamRecords() const; + void setBeamRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcousticEmitterSystemData& rhs) const; + bool operator==(const AcousticEmitterSystemData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +89,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionRequestPdu.cpp b/src/dis6/ActionRequestPdu.cpp index 6098d35a..764df346 100644 --- a/src/dis6/ActionRequestPdu.cpp +++ b/src/dis6/ActionRequestPdu.cpp @@ -2,186 +2,148 @@ using namespace DIS; - -ActionRequestPdu::ActionRequestPdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _actionID(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 16 ); +ActionRequestPdu::ActionRequestPdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _actionID(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(16); } -ActionRequestPdu::~ActionRequestPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +ActionRequestPdu::~ActionRequestPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int ActionRequestPdu::getRequestID() const -{ - return _requestID; -} +unsigned int ActionRequestPdu::getRequestID() const { return _requestID; } -void ActionRequestPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void ActionRequestPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int ActionRequestPdu::getActionID() const -{ - return _actionID; -} +unsigned int ActionRequestPdu::getActionID() const { return _actionID; } -void ActionRequestPdu::setActionID(unsigned int pX) -{ - _actionID = pX; -} +void ActionRequestPdu::setActionID(unsigned int pX) { _actionID = pX; } -unsigned int ActionRequestPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int ActionRequestPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int ActionRequestPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int ActionRequestPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& ActionRequestPdu::getFixedDatums() -{ - return _fixedDatums; +std::vector& ActionRequestPdu::getFixedDatums() { + return _fixedDatums; } -const std::vector& ActionRequestPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& ActionRequestPdu::getFixedDatums() const { + return _fixedDatums; } -void ActionRequestPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void ActionRequestPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& ActionRequestPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& ActionRequestPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& ActionRequestPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& ActionRequestPdu::getVariableDatums() const { + return _variableDatums; } -void ActionRequestPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void ActionRequestPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void ActionRequestPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _actionID; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void ActionRequestPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _actionID; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void ActionRequestPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _actionID; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void ActionRequestPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _actionID; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool ActionRequestPdu::operator ==(const ActionRequestPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_actionID == rhs._actionID) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool ActionRequestPdu::operator==(const ActionRequestPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_actionID == rhs._actionID)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int ActionRequestPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _actionID - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int ActionRequestPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _actionID + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +156,7 @@ int ActionRequestPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionRequestPdu.h b/src/dis6/ActionRequestPdu.h index 37d055b3..eff8ccf0 100644 --- a/src/dis6/ActionRequestPdu.h +++ b/src/dis6/ActionRequestPdu.h @@ -1,80 +1,77 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.6.6. Request from simulation manager to an entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu { + protected: /** Request ID that is unique */ - unsigned int _requestID; + unsigned int _requestID; /** identifies the action being requested */ - unsigned int _actionID; + unsigned int _actionID; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - ActionRequestPdu(); - virtual ~ActionRequestPdu(); + ActionRequestPdu(); + virtual ~ActionRequestPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + unsigned int getActionID() const; + void setActionID(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionRequestPdu& rhs) const; + bool operator==(const ActionRequestPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionRequestReliablePdu.cpp b/src/dis6/ActionRequestReliablePdu.cpp index f4fd801d..786d013a 100644 --- a/src/dis6/ActionRequestReliablePdu.cpp +++ b/src/dis6/ActionRequestReliablePdu.cpp @@ -2,231 +2,193 @@ using namespace DIS; - -ActionRequestReliablePdu::ActionRequestReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0), - _actionID(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 56 ); +ActionRequestReliablePdu::ActionRequestReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0), + _actionID(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(56); } -ActionRequestReliablePdu::~ActionRequestReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +ActionRequestReliablePdu::~ActionRequestReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned char ActionRequestReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char ActionRequestReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void ActionRequestReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void ActionRequestReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short ActionRequestReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short ActionRequestReliablePdu::getPad1() const { return _pad1; } -void ActionRequestReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void ActionRequestReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char ActionRequestReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char ActionRequestReliablePdu::getPad2() const { return _pad2; } -void ActionRequestReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void ActionRequestReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int ActionRequestReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int ActionRequestReliablePdu::getRequestID() const { + return _requestID; } -void ActionRequestReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; +void ActionRequestReliablePdu::setRequestID(unsigned int pX) { + _requestID = pX; } -unsigned int ActionRequestReliablePdu::getActionID() const -{ - return _actionID; -} +unsigned int ActionRequestReliablePdu::getActionID() const { return _actionID; } -void ActionRequestReliablePdu::setActionID(unsigned int pX) -{ - _actionID = pX; -} +void ActionRequestReliablePdu::setActionID(unsigned int pX) { _actionID = pX; } -unsigned int ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& ActionRequestReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& ActionRequestReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& ActionRequestReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& ActionRequestReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void ActionRequestReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void ActionRequestReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& ActionRequestReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& +ActionRequestReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& ActionRequestReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +ActionRequestReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void ActionRequestReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void ActionRequestReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void ActionRequestReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; - dataStream << _actionID; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void ActionRequestReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; + dataStream << _actionID; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void ActionRequestReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; - dataStream >> _actionID; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void ActionRequestReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; + dataStream >> _actionID; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool ActionRequestReliablePdu::operator==( + const ActionRequestReliablePdu& rhs) const { + bool ivarsEqual = true; -bool ActionRequestReliablePdu::operator ==(const ActionRequestReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_actionID == rhs._actionID) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_actionID == rhs._actionID)) ivarsEqual = false; - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } - -int ActionRequestReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _actionID - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int ActionRequestReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _actionID + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -239,7 +201,7 @@ int ActionRequestReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionRequestReliablePdu.h b/src/dis6/ActionRequestReliablePdu.h index f0942582..bce54f46 100644 --- a/src/dis6/ActionRequestReliablePdu.h +++ b/src/dis6/ActionRequestReliablePdu.h @@ -1,98 +1,97 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.6: request from a simulation manager to a managed entity to +// perform a specified action. COMPLETE -namespace DIS -{ -// Section 5.3.12.6: request from a simulation manager to a managed entity to perform a specified action. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionRequestReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ActionRequestReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** request ID */ - unsigned int _actionID; + unsigned int _actionID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - ActionRequestReliablePdu(); - virtual ~ActionRequestReliablePdu(); + ActionRequestReliablePdu(); + virtual ~ActionRequestReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + unsigned int getActionID() const; + void setActionID(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionRequestReliablePdu& rhs) const; + bool operator==(const ActionRequestReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +104,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionResponsePdu.cpp b/src/dis6/ActionResponsePdu.cpp index 27b74827..53318ba4 100644 --- a/src/dis6/ActionResponsePdu.cpp +++ b/src/dis6/ActionResponsePdu.cpp @@ -2,186 +2,153 @@ using namespace DIS; - -ActionResponsePdu::ActionResponsePdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _requestStatus(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 17 ); +ActionResponsePdu::ActionResponsePdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _requestStatus(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(17); } -ActionResponsePdu::~ActionResponsePdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +ActionResponsePdu::~ActionResponsePdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int ActionResponsePdu::getRequestID() const -{ - return _requestID; -} +unsigned int ActionResponsePdu::getRequestID() const { return _requestID; } -void ActionResponsePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void ActionResponsePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int ActionResponsePdu::getRequestStatus() const -{ - return _requestStatus; +unsigned int ActionResponsePdu::getRequestStatus() const { + return _requestStatus; } -void ActionResponsePdu::setRequestStatus(unsigned int pX) -{ - _requestStatus = pX; +void ActionResponsePdu::setRequestStatus(unsigned int pX) { + _requestStatus = pX; } -unsigned int ActionResponsePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int ActionResponsePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int ActionResponsePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int ActionResponsePdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& ActionResponsePdu::getFixedDatums() -{ - return _fixedDatums; +std::vector& ActionResponsePdu::getFixedDatums() { + return _fixedDatums; } -const std::vector& ActionResponsePdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& ActionResponsePdu::getFixedDatums() const { + return _fixedDatums; } -void ActionResponsePdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void ActionResponsePdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& ActionResponsePdu::getVariableDatums() -{ - return _variableDatums; +std::vector& ActionResponsePdu::getVariableDatums() { + return _variableDatums; } -const std::vector& ActionResponsePdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& ActionResponsePdu::getVariableDatums() const { + return _variableDatums; } -void ActionResponsePdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void ActionResponsePdu::setVariableDatums( + const std::vector& pX) { + _variableDatums = pX; } -void ActionResponsePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _requestStatus; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } - +void ActionResponsePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _requestStatus; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } -void ActionResponsePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _requestStatus; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void ActionResponsePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _requestStatus; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } } +bool ActionResponsePdu::operator==(const ActionResponsePdu& rhs) const { + bool ivarsEqual = true; -bool ActionResponsePdu::operator ==(const ActionResponsePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requestStatus == rhs._requestStatus)) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requestStatus == rhs._requestStatus) ) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int ActionResponsePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _requestStatus - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int ActionResponsePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _requestStatus + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +161,7 @@ int ActionResponsePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionResponsePdu.h b/src/dis6/ActionResponsePdu.h index 3c3da49f..c920d9ba 100644 --- a/src/dis6/ActionResponsePdu.h +++ b/src/dis6/ActionResponsePdu.h @@ -1,80 +1,77 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.6.7. response to an action request PDU. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu { + protected: /** Request ID that is unique */ - unsigned int _requestID; + unsigned int _requestID; /** Status of response */ - unsigned int _requestStatus; + unsigned int _requestStatus; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - ActionResponsePdu(); - virtual ~ActionResponsePdu(); + ActionResponsePdu(); + virtual ~ActionResponsePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getRequestStatus() const; - void setRequestStatus(unsigned int pX); + unsigned int getRequestStatus() const; + void setRequestStatus(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionResponsePdu& rhs) const; + bool operator==(const ActionResponsePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionResponseReliablePdu.cpp b/src/dis6/ActionResponseReliablePdu.cpp index 4a41c4c4..d17ae093 100644 --- a/src/dis6/ActionResponseReliablePdu.cpp +++ b/src/dis6/ActionResponseReliablePdu.cpp @@ -2,186 +2,166 @@ using namespace DIS; - -ActionResponseReliablePdu::ActionResponseReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requestID(0), - _responseStatus(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 57 ); +ActionResponseReliablePdu::ActionResponseReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requestID(0), + _responseStatus(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(57); } -ActionResponseReliablePdu::~ActionResponseReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +ActionResponseReliablePdu::~ActionResponseReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned int ActionResponseReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int ActionResponseReliablePdu::getRequestID() const { + return _requestID; } -void ActionResponseReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; +void ActionResponseReliablePdu::setRequestID(unsigned int pX) { + _requestID = pX; } -unsigned int ActionResponseReliablePdu::getResponseStatus() const -{ - return _responseStatus; +unsigned int ActionResponseReliablePdu::getResponseStatus() const { + return _responseStatus; } -void ActionResponseReliablePdu::setResponseStatus(unsigned int pX) -{ - _responseStatus = pX; +void ActionResponseReliablePdu::setResponseStatus(unsigned int pX) { + _responseStatus = pX; } -unsigned int ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int ActionResponseReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int ActionResponseReliablePdu::getNumberOfVariableDatumRecords() + const { + return _variableDatumRecords.size(); } -std::vector& ActionResponseReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& ActionResponseReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& ActionResponseReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& ActionResponseReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void ActionResponseReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void ActionResponseReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& ActionResponseReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& +ActionResponseReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& ActionResponseReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +ActionResponseReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void ActionResponseReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void ActionResponseReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void ActionResponseReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _responseStatus; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void ActionResponseReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _responseStatus; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void ActionResponseReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _responseStatus; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void ActionResponseReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _responseStatus; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool ActionResponseReliablePdu::operator==( + const ActionResponseReliablePdu& rhs) const { + bool ivarsEqual = true; -bool ActionResponseReliablePdu::operator ==(const ActionResponseReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_responseStatus == rhs._responseStatus) ) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_responseStatus == rhs._responseStatus)) ivarsEqual = false; - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int ActionResponseReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _responseStatus - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int ActionResponseReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _responseStatus + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +174,7 @@ int ActionResponseReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ActionResponseReliablePdu.h b/src/dis6/ActionResponseReliablePdu.h index 2f2e5419..cb188d31 100644 --- a/src/dis6/ActionResponseReliablePdu.h +++ b/src/dis6/ActionResponseReliablePdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionResponseReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ActionResponseReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** status of response */ - unsigned int _responseStatus; + unsigned int _responseStatus; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - ActionResponseReliablePdu(); - virtual ~ActionResponseReliablePdu(); + ActionResponseReliablePdu(); + virtual ~ActionResponseReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getResponseStatus() const; - void setResponseStatus(unsigned int pX); + unsigned int getResponseStatus() const; + void setResponseStatus(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionResponseReliablePdu& rhs) const; + bool operator==(const ActionResponseReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateID.cpp b/src/dis6/AggregateID.cpp index d357635d..0514fe06 100644 --- a/src/dis6/AggregateID.cpp +++ b/src/dis6/AggregateID.cpp @@ -2,89 +2,58 @@ using namespace DIS; +AggregateID::AggregateID() : _site(0), _application(0), _aggregateID(0) {} -AggregateID::AggregateID(): - _site(0), - _application(0), - _aggregateID(0) -{ -} +AggregateID::~AggregateID() {} -AggregateID::~AggregateID() -{ -} +unsigned short AggregateID::getSite() const { return _site; } -unsigned short AggregateID::getSite() const -{ - return _site; -} +void AggregateID::setSite(unsigned short pX) { _site = pX; } -void AggregateID::setSite(unsigned short pX) -{ - _site = pX; -} +unsigned short AggregateID::getApplication() const { return _application; } -unsigned short AggregateID::getApplication() const -{ - return _application; -} +void AggregateID::setApplication(unsigned short pX) { _application = pX; } -void AggregateID::setApplication(unsigned short pX) -{ - _application = pX; -} +unsigned short AggregateID::getAggregateID() const { return _aggregateID; } -unsigned short AggregateID::getAggregateID() const -{ - return _aggregateID; -} - -void AggregateID::setAggregateID(unsigned short pX) -{ - _aggregateID = pX; -} +void AggregateID::setAggregateID(unsigned short pX) { _aggregateID = pX; } -void AggregateID::marshal(DataStream& dataStream) const -{ - dataStream << _site; - dataStream << _application; - dataStream << _aggregateID; +void AggregateID::marshal(DataStream& dataStream) const { + dataStream << _site; + dataStream << _application; + dataStream << _aggregateID; } -void AggregateID::unmarshal(DataStream& dataStream) -{ - dataStream >> _site; - dataStream >> _application; - dataStream >> _aggregateID; +void AggregateID::unmarshal(DataStream& dataStream) { + dataStream >> _site; + dataStream >> _application; + dataStream >> _aggregateID; } +bool AggregateID::operator==(const AggregateID& rhs) const { + bool ivarsEqual = true; -bool AggregateID::operator ==(const AggregateID& rhs) const - { - bool ivarsEqual = true; + if (!(_site == rhs._site)) ivarsEqual = false; + if (!(_application == rhs._application)) ivarsEqual = false; + if (!(_aggregateID == rhs._aggregateID)) ivarsEqual = false; - if( ! (_site == rhs._site) ) ivarsEqual = false; - if( ! (_application == rhs._application) ) ivarsEqual = false; - if( ! (_aggregateID == rhs._aggregateID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AggregateID::getMarshalledSize() const -{ - int marshalSize = 0; +int AggregateID::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _aggregateID - return marshalSize; + marshalSize = marshalSize + 2; // _site + marshalSize = marshalSize + 2; // _application + marshalSize = marshalSize + 2; // _aggregateID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int AggregateID::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateID.h b/src/dis6/AggregateID.h index a88f80c3..5bcf6777 100644 --- a/src/dis6/AggregateID.h +++ b/src/dis6/AggregateID.h @@ -1,58 +1,56 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.36. Each agregate in a given simulation app is given an aggregate +// identifier number unique for all other aggregates in that app and in that +// exercise. The id is valid for the duration of the the exercise. -namespace DIS -{ -// Section 5.2.36. Each agregate in a given simulation app is given an aggregate identifier number unique for all other aggregates in that app and in that exercise. The id is valid for the duration of the the exercise. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateID -{ -protected: +class OPENDIS6_EXPORT AggregateID { + protected: /** The site ID */ - unsigned short _site; + unsigned short _site; /** The application ID */ - unsigned short _application; + unsigned short _application; /** the aggregate ID */ - unsigned short _aggregateID; - + unsigned short _aggregateID; public: - AggregateID(); - virtual ~AggregateID(); + AggregateID(); + virtual ~AggregateID(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + unsigned short getSite() const; + void setSite(unsigned short pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + unsigned short getApplication() const; + void setApplication(unsigned short pX); - unsigned short getAggregateID() const; - void setAggregateID(unsigned short pX); + unsigned short getAggregateID() const; + void setAggregateID(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AggregateID& rhs) const; + bool operator==(const AggregateID& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateMarking.cpp b/src/dis6/AggregateMarking.cpp index 8e002a32..a2087f40 100644 --- a/src/dis6/AggregateMarking.cpp +++ b/src/dis6/AggregateMarking.cpp @@ -2,102 +2,72 @@ using namespace DIS; - -AggregateMarking::AggregateMarking(): - _characterSet(0) -{ - // Initialize fixed length array - for(int lengthcharacters= 0; lengthcharacters < 31; lengthcharacters++) - { - _characters[lengthcharacters] = 0; - } - +AggregateMarking::AggregateMarking() : _characterSet(0) { + // Initialize fixed length array + for (int lengthcharacters = 0; lengthcharacters < 31; lengthcharacters++) { + _characters[lengthcharacters] = 0; + } } -AggregateMarking::~AggregateMarking() -{ -} +AggregateMarking::~AggregateMarking() {} -unsigned char AggregateMarking::getCharacterSet() const -{ - return _characterSet; +unsigned char AggregateMarking::getCharacterSet() const { + return _characterSet; } -void AggregateMarking::setCharacterSet(unsigned char pX) -{ - _characterSet = pX; -} +void AggregateMarking::setCharacterSet(unsigned char pX) { _characterSet = pX; } -char* AggregateMarking::getCharacters() -{ - return _characters; -} +char* AggregateMarking::getCharacters() { return _characters; } -const char* AggregateMarking::getCharacters() const -{ - return _characters; -} +const char* AggregateMarking::getCharacters() const { return _characters; } -void AggregateMarking::setCharacters(const char* x) -{ - for(int i = 0; i < 31; i++) - { - _characters[i] = x[i]; - } +void AggregateMarking::setCharacters(const char* x) { + for (int i = 0; i < 31; i++) { + _characters[i] = x[i]; + } } -void AggregateMarking::marshal(DataStream& dataStream) const -{ - dataStream << _characterSet; - - for(size_t idx = 0; idx < 31; idx++) - { - dataStream << _characters[idx]; - } +void AggregateMarking::marshal(DataStream& dataStream) const { + dataStream << _characterSet; + for (size_t idx = 0; idx < 31; idx++) { + dataStream << _characters[idx]; + } } -void AggregateMarking::unmarshal(DataStream& dataStream) -{ - dataStream >> _characterSet; - - for(size_t idx = 0; idx < 31; idx++) - { - dataStream >> _characters[idx]; - } +void AggregateMarking::unmarshal(DataStream& dataStream) { + dataStream >> _characterSet; + for (size_t idx = 0; idx < 31; idx++) { + dataStream >> _characters[idx]; + } } +bool AggregateMarking::operator==(const AggregateMarking& rhs) const { + bool ivarsEqual = true; -bool AggregateMarking::operator ==(const AggregateMarking& rhs) const - { - bool ivarsEqual = true; - - if( ! (_characterSet == rhs._characterSet) ) ivarsEqual = false; + if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for(unsigned char idx = 0; idx < 31; idx++) - { - if(!(_characters[idx] == rhs._characters[idx]) ) ivarsEqual = false; - } + for (unsigned char idx = 0; idx < 31; idx++) { + if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int AggregateMarking::getMarshalledSize() const -{ - int marshalSize = 0; +int AggregateMarking::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _characterSet - marshalSize = marshalSize + 31 * 1; // _characters - return marshalSize; + marshalSize = marshalSize + 1; // _characterSet + marshalSize = marshalSize + 31 * 1; // _characters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -110,7 +80,7 @@ int AggregateMarking::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateMarking.h b/src/dis6/AggregateMarking.h index 5aae95ee..766955d4 100644 --- a/src/dis6/AggregateMarking.h +++ b/src/dis6/AggregateMarking.h @@ -1,53 +1,50 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.37. Specifies the character set used inthe first byte, followed +// by up to 31 characters of text data. -namespace DIS -{ -// Section 5.2.37. Specifies the character set used inthe first byte, followed by up to 31 characters of text data. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateMarking -{ -protected: +class OPENDIS6_EXPORT AggregateMarking { + protected: /** The character set */ - unsigned char _characterSet; + unsigned char _characterSet; /** The characters */ - char _characters[31]; - + char _characters[31]; public: - AggregateMarking(); - virtual ~AggregateMarking(); + AggregateMarking(); + virtual ~AggregateMarking(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + unsigned char getCharacterSet() const; + void setCharacterSet(unsigned char pX); - char* getCharacters(); - const char* getCharacters() const; - void setCharacters( const char* pX); + char* getCharacters(); + const char* getCharacters() const; + void setCharacters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AggregateMarking& rhs) const; + bool operator==(const AggregateMarking& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -60,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateStatePdu.cpp b/src/dis6/AggregateStatePdu.cpp index 505b3d8f..6a5051cd 100644 --- a/src/dis6/AggregateStatePdu.cpp +++ b/src/dis6/AggregateStatePdu.cpp @@ -2,515 +2,420 @@ using namespace DIS; - -AggregateStatePdu::AggregateStatePdu() : EntityManagementFamilyPdu(), - _aggregateID(), - _forceID(0), - _aggregateState(0), - _aggregateType(), - _formation(0), - _aggregateMarking(), - _dimensions(), - _orientation(), - _centerOfMass(), - _velocity(), - _numberOfDisAggregates(0), - _numberOfDisEntities(0), - _numberOfSilentAggregateTypes(0), - _numberOfSilentEntityTypes(0), - _pad2(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 33 ); +AggregateStatePdu::AggregateStatePdu() + : EntityManagementFamilyPdu(), + _aggregateID(), + _forceID(0), + _aggregateState(0), + _aggregateType(), + _formation(0), + _aggregateMarking(), + _dimensions(), + _orientation(), + _centerOfMass(), + _velocity(), + _numberOfDisAggregates(0), + _numberOfDisEntities(0), + _numberOfSilentAggregateTypes(0), + _numberOfSilentEntityTypes(0), + _pad2(0), + _numberOfVariableDatumRecords(0) { + setPduType(33); } -AggregateStatePdu::~AggregateStatePdu() -{ - _aggregateIDList.clear(); - _entityIDList.clear(); - _silentAggregateSystemList.clear(); - _silentEntitySystemList.clear(); - _variableDatumList.clear(); +AggregateStatePdu::~AggregateStatePdu() { + _aggregateIDList.clear(); + _entityIDList.clear(); + _silentAggregateSystemList.clear(); + _silentEntitySystemList.clear(); + _variableDatumList.clear(); } -EntityID& AggregateStatePdu::getAggregateID() -{ - return _aggregateID; -} +EntityID& AggregateStatePdu::getAggregateID() { return _aggregateID; } -const EntityID& AggregateStatePdu::getAggregateID() const -{ - return _aggregateID; +const EntityID& AggregateStatePdu::getAggregateID() const { + return _aggregateID; } -void AggregateStatePdu::setAggregateID(const EntityID &pX) -{ - _aggregateID = pX; +void AggregateStatePdu::setAggregateID(const EntityID& pX) { + _aggregateID = pX; } -unsigned char AggregateStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char AggregateStatePdu::getForceID() const { return _forceID; } -void AggregateStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void AggregateStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char AggregateStatePdu::getAggregateState() const -{ - return _aggregateState; +unsigned char AggregateStatePdu::getAggregateState() const { + return _aggregateState; } -void AggregateStatePdu::setAggregateState(unsigned char pX) -{ - _aggregateState = pX; +void AggregateStatePdu::setAggregateState(unsigned char pX) { + _aggregateState = pX; } -EntityType& AggregateStatePdu::getAggregateType() -{ - return _aggregateType; -} +EntityType& AggregateStatePdu::getAggregateType() { return _aggregateType; } -const EntityType& AggregateStatePdu::getAggregateType() const -{ - return _aggregateType; +const EntityType& AggregateStatePdu::getAggregateType() const { + return _aggregateType; } -void AggregateStatePdu::setAggregateType(const EntityType &pX) -{ - _aggregateType = pX; +void AggregateStatePdu::setAggregateType(const EntityType& pX) { + _aggregateType = pX; } -unsigned int AggregateStatePdu::getFormation() const -{ - return _formation; -} +unsigned int AggregateStatePdu::getFormation() const { return _formation; } -void AggregateStatePdu::setFormation(unsigned int pX) -{ - _formation = pX; -} +void AggregateStatePdu::setFormation(unsigned int pX) { _formation = pX; } -AggregateMarking& AggregateStatePdu::getAggregateMarking() -{ - return _aggregateMarking; +AggregateMarking& AggregateStatePdu::getAggregateMarking() { + return _aggregateMarking; } -const AggregateMarking& AggregateStatePdu::getAggregateMarking() const -{ - return _aggregateMarking; +const AggregateMarking& AggregateStatePdu::getAggregateMarking() const { + return _aggregateMarking; } -void AggregateStatePdu::setAggregateMarking(const AggregateMarking &pX) -{ - _aggregateMarking = pX; +void AggregateStatePdu::setAggregateMarking(const AggregateMarking& pX) { + _aggregateMarking = pX; } -Vector3Float& AggregateStatePdu::getDimensions() -{ - return _dimensions; -} +Vector3Float& AggregateStatePdu::getDimensions() { return _dimensions; } -const Vector3Float& AggregateStatePdu::getDimensions() const -{ - return _dimensions; +const Vector3Float& AggregateStatePdu::getDimensions() const { + return _dimensions; } -void AggregateStatePdu::setDimensions(const Vector3Float &pX) -{ - _dimensions = pX; +void AggregateStatePdu::setDimensions(const Vector3Float& pX) { + _dimensions = pX; } -Orientation& AggregateStatePdu::getOrientation() -{ - return _orientation; -} +Orientation& AggregateStatePdu::getOrientation() { return _orientation; } -const Orientation& AggregateStatePdu::getOrientation() const -{ - return _orientation; +const Orientation& AggregateStatePdu::getOrientation() const { + return _orientation; } -void AggregateStatePdu::setOrientation(const Orientation &pX) -{ - _orientation = pX; +void AggregateStatePdu::setOrientation(const Orientation& pX) { + _orientation = pX; } -Vector3Double& AggregateStatePdu::getCenterOfMass() -{ - return _centerOfMass; -} +Vector3Double& AggregateStatePdu::getCenterOfMass() { return _centerOfMass; } -const Vector3Double& AggregateStatePdu::getCenterOfMass() const -{ - return _centerOfMass; +const Vector3Double& AggregateStatePdu::getCenterOfMass() const { + return _centerOfMass; } -void AggregateStatePdu::setCenterOfMass(const Vector3Double &pX) -{ - _centerOfMass = pX; +void AggregateStatePdu::setCenterOfMass(const Vector3Double& pX) { + _centerOfMass = pX; } -Vector3Float& AggregateStatePdu::getVelocity() -{ - return _velocity; -} +Vector3Float& AggregateStatePdu::getVelocity() { return _velocity; } -const Vector3Float& AggregateStatePdu::getVelocity() const -{ - return _velocity; -} +const Vector3Float& AggregateStatePdu::getVelocity() const { return _velocity; } -void AggregateStatePdu::setVelocity(const Vector3Float &pX) -{ - _velocity = pX; -} +void AggregateStatePdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -unsigned short AggregateStatePdu::getNumberOfDisAggregates() const -{ - return _aggregateIDList.size(); +unsigned short AggregateStatePdu::getNumberOfDisAggregates() const { + return _aggregateIDList.size(); } -unsigned short AggregateStatePdu::getNumberOfDisEntities() const -{ - return _entityIDList.size(); +unsigned short AggregateStatePdu::getNumberOfDisEntities() const { + return _entityIDList.size(); } -unsigned short AggregateStatePdu::getNumberOfSilentAggregateTypes() const -{ - return _silentAggregateSystemList.size(); +unsigned short AggregateStatePdu::getNumberOfSilentAggregateTypes() const { + return _silentAggregateSystemList.size(); } -unsigned short AggregateStatePdu::getNumberOfSilentEntityTypes() const -{ - return _silentEntitySystemList.size(); +unsigned short AggregateStatePdu::getNumberOfSilentEntityTypes() const { + return _silentEntitySystemList.size(); } -std::vector& AggregateStatePdu::getAggregateIDList() -{ - return _aggregateIDList; +std::vector& AggregateStatePdu::getAggregateIDList() { + return _aggregateIDList; } -const std::vector& AggregateStatePdu::getAggregateIDList() const -{ - return _aggregateIDList; +const std::vector& AggregateStatePdu::getAggregateIDList() const { + return _aggregateIDList; } -void AggregateStatePdu::setAggregateIDList(const std::vector& pX) -{ - _aggregateIDList = pX; +void AggregateStatePdu::setAggregateIDList(const std::vector& pX) { + _aggregateIDList = pX; } -std::vector& AggregateStatePdu::getEntityIDList() -{ - return _entityIDList; +std::vector& AggregateStatePdu::getEntityIDList() { + return _entityIDList; } -const std::vector& AggregateStatePdu::getEntityIDList() const -{ - return _entityIDList; +const std::vector& AggregateStatePdu::getEntityIDList() const { + return _entityIDList; } -void AggregateStatePdu::setEntityIDList(const std::vector& pX) -{ - _entityIDList = pX; +void AggregateStatePdu::setEntityIDList(const std::vector& pX) { + _entityIDList = pX; } -unsigned char AggregateStatePdu::getPad2() const -{ - return _pad2; -} +unsigned char AggregateStatePdu::getPad2() const { return _pad2; } -void AggregateStatePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void AggregateStatePdu::setPad2(unsigned char pX) { _pad2 = pX; } -std::vector& AggregateStatePdu::getSilentAggregateSystemList() -{ - return _silentAggregateSystemList; +std::vector& AggregateStatePdu::getSilentAggregateSystemList() { + return _silentAggregateSystemList; } -const std::vector& AggregateStatePdu::getSilentAggregateSystemList() const -{ - return _silentAggregateSystemList; +const std::vector& AggregateStatePdu::getSilentAggregateSystemList() + const { + return _silentAggregateSystemList; } -void AggregateStatePdu::setSilentAggregateSystemList(const std::vector& pX) -{ - _silentAggregateSystemList = pX; +void AggregateStatePdu::setSilentAggregateSystemList( + const std::vector& pX) { + _silentAggregateSystemList = pX; } -std::vector& AggregateStatePdu::getSilentEntitySystemList() -{ - return _silentEntitySystemList; +std::vector& AggregateStatePdu::getSilentEntitySystemList() { + return _silentEntitySystemList; } -const std::vector& AggregateStatePdu::getSilentEntitySystemList() const -{ - return _silentEntitySystemList; +const std::vector& AggregateStatePdu::getSilentEntitySystemList() + const { + return _silentEntitySystemList; } -void AggregateStatePdu::setSilentEntitySystemList(const std::vector& pX) -{ - _silentEntitySystemList = pX; +void AggregateStatePdu::setSilentEntitySystemList( + const std::vector& pX) { + _silentEntitySystemList = pX; } -unsigned int AggregateStatePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumList.size(); +unsigned int AggregateStatePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumList.size(); } -std::vector& AggregateStatePdu::getVariableDatumList() -{ - return _variableDatumList; +std::vector& AggregateStatePdu::getVariableDatumList() { + return _variableDatumList; } -const std::vector& AggregateStatePdu::getVariableDatumList() const -{ - return _variableDatumList; +const std::vector& AggregateStatePdu::getVariableDatumList() + const { + return _variableDatumList; } -void AggregateStatePdu::setVariableDatumList(const std::vector& pX) -{ - _variableDatumList = pX; +void AggregateStatePdu::setVariableDatumList( + const std::vector& pX) { + _variableDatumList = pX; } -void AggregateStatePdu::marshal(DataStream& dataStream) const -{ - EntityManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _aggregateID.marshal(dataStream); - dataStream << _forceID; - dataStream << _aggregateState; - _aggregateType.marshal(dataStream); - dataStream << _formation; - _aggregateMarking.marshal(dataStream); - _dimensions.marshal(dataStream); - _orientation.marshal(dataStream); - _centerOfMass.marshal(dataStream); - _velocity.marshal(dataStream); - dataStream << ( unsigned short )_aggregateIDList.size(); - dataStream << ( unsigned short )_entityIDList.size(); - dataStream << ( unsigned short )_silentAggregateSystemList.size(); - dataStream << ( unsigned short )_silentEntitySystemList.size(); - - for(size_t idx = 0; idx < _aggregateIDList.size(); idx++) - { - AggregateID x = _aggregateIDList[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _entityIDList.size(); idx++) - { - EntityID x = _entityIDList[idx]; - x.marshal(dataStream); - } - - dataStream << _pad2; +void AggregateStatePdu::marshal(DataStream& dataStream) const { + EntityManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _aggregateID.marshal(dataStream); + dataStream << _forceID; + dataStream << _aggregateState; + _aggregateType.marshal(dataStream); + dataStream << _formation; + _aggregateMarking.marshal(dataStream); + _dimensions.marshal(dataStream); + _orientation.marshal(dataStream); + _centerOfMass.marshal(dataStream); + _velocity.marshal(dataStream); + dataStream << (unsigned short)_aggregateIDList.size(); + dataStream << (unsigned short)_entityIDList.size(); + dataStream << (unsigned short)_silentAggregateSystemList.size(); + dataStream << (unsigned short)_silentEntitySystemList.size(); - for(size_t idx = 0; idx < _silentAggregateSystemList.size(); idx++) - { - EntityType x = _silentAggregateSystemList[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _silentEntitySystemList.size(); idx++) - { - EntityType x = _silentEntitySystemList[idx]; - x.marshal(dataStream); - } - - dataStream << ( unsigned int )_variableDatumList.size(); - - for(size_t idx = 0; idx < _variableDatumList.size(); idx++) - { - VariableDatum x = _variableDatumList[idx]; - x.marshal(dataStream); - } - -} - -void AggregateStatePdu::unmarshal(DataStream& dataStream) -{ - EntityManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _aggregateID.unmarshal(dataStream); - dataStream >> _forceID; - dataStream >> _aggregateState; - _aggregateType.unmarshal(dataStream); - dataStream >> _formation; - _aggregateMarking.unmarshal(dataStream); - _dimensions.unmarshal(dataStream); - _orientation.unmarshal(dataStream); - _centerOfMass.unmarshal(dataStream); - _velocity.unmarshal(dataStream); - dataStream >> _numberOfDisAggregates; - dataStream >> _numberOfDisEntities; - dataStream >> _numberOfSilentAggregateTypes; - dataStream >> _numberOfSilentEntityTypes; - - _aggregateIDList.clear(); - for(size_t idx = 0; idx < _numberOfDisAggregates; idx++) - { - AggregateID x; - x.unmarshal(dataStream); - _aggregateIDList.push_back(x); - } - - _entityIDList.clear(); - for(size_t idx = 0; idx < _numberOfDisEntities; idx++) - { - EntityID x; - x.unmarshal(dataStream); - _entityIDList.push_back(x); - } - dataStream >> _pad2; - - _silentAggregateSystemList.clear(); - for(size_t idx = 0; idx < _numberOfSilentAggregateTypes; idx++) - { - EntityType x; - x.unmarshal(dataStream); - _silentAggregateSystemList.push_back(x); - } - - _silentEntitySystemList.clear(); - for(size_t idx = 0; idx < _numberOfSilentEntityTypes; idx++) - { - EntityType x; - x.unmarshal(dataStream); - _silentEntitySystemList.push_back(x); - } - dataStream >> _numberOfVariableDatumRecords; - - _variableDatumList.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumList.push_back(x); - } -} - - -bool AggregateStatePdu::operator ==(const AggregateStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); - - if( ! (_aggregateID == rhs._aggregateID) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_aggregateState == rhs._aggregateState) ) ivarsEqual = false; - if( ! (_aggregateType == rhs._aggregateType) ) ivarsEqual = false; - if( ! (_formation == rhs._formation) ) ivarsEqual = false; - if( ! (_aggregateMarking == rhs._aggregateMarking) ) ivarsEqual = false; - if( ! (_dimensions == rhs._dimensions) ) ivarsEqual = false; - if( ! (_orientation == rhs._orientation) ) ivarsEqual = false; - if( ! (_centerOfMass == rhs._centerOfMass) ) ivarsEqual = false; - if( ! (_velocity == rhs._velocity) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _aggregateIDList.size(); idx++) - { - if( ! ( _aggregateIDList[idx] == rhs._aggregateIDList[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _entityIDList.size(); idx++) - { - if( ! ( _entityIDList[idx] == rhs._entityIDList[idx]) ) ivarsEqual = false; - } - - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _silentAggregateSystemList.size(); idx++) - { - if( ! ( _silentAggregateSystemList[idx] == rhs._silentAggregateSystemList[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _silentEntitySystemList.size(); idx++) - { - if( ! ( _silentEntitySystemList[idx] == rhs._silentEntitySystemList[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _variableDatumList.size(); idx++) - { - if( ! ( _variableDatumList[idx] == rhs._variableDatumList[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int AggregateStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _aggregateID.getMarshalledSize(); // _aggregateID - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _aggregateState - marshalSize = marshalSize + _aggregateType.getMarshalledSize(); // _aggregateType - marshalSize = marshalSize + 4; // _formation - marshalSize = marshalSize + _aggregateMarking.getMarshalledSize(); // _aggregateMarking - marshalSize = marshalSize + _dimensions.getMarshalledSize(); // _dimensions - marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation - marshalSize = marshalSize + _centerOfMass.getMarshalledSize(); // _centerOfMass - marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity - marshalSize = marshalSize + 2; // _numberOfDisAggregates - marshalSize = marshalSize + 2; // _numberOfDisEntities - marshalSize = marshalSize + 2; // _numberOfSilentAggregateTypes - marshalSize = marshalSize + 2; // _numberOfSilentEntityTypes - - for(unsigned long long idx=0; idx < _aggregateIDList.size(); idx++) - { - AggregateID listElement = _aggregateIDList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - - for(unsigned long long idx=0; idx < _entityIDList.size(); idx++) - { - EntityID listElement = _entityIDList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (size_t idx = 0; idx < _aggregateIDList.size(); idx++) { + AggregateID x = _aggregateIDList[idx]; + x.marshal(dataStream); + } - marshalSize = marshalSize + 1; // _pad2 + for (size_t idx = 0; idx < _entityIDList.size(); idx++) { + EntityID x = _entityIDList[idx]; + x.marshal(dataStream); + } - for(unsigned long long idx=0; idx < _silentAggregateSystemList.size(); idx++) - { - EntityType listElement = _silentAggregateSystemList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + dataStream << _pad2; + for (size_t idx = 0; idx < _silentAggregateSystemList.size(); idx++) { + EntityType x = _silentAggregateSystemList[idx]; + x.marshal(dataStream); + } - for(unsigned long long idx=0; idx < _silentEntitySystemList.size(); idx++) - { - EntityType listElement = _silentEntitySystemList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (size_t idx = 0; idx < _silentEntitySystemList.size(); idx++) { + EntityType x = _silentEntitySystemList[idx]; + x.marshal(dataStream); + } - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + dataStream << (unsigned int)_variableDatumList.size(); - for(unsigned long long idx=0; idx < _variableDatumList.size(); idx++) - { - VariableDatum listElement = _variableDatumList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + for (size_t idx = 0; idx < _variableDatumList.size(); idx++) { + VariableDatum x = _variableDatumList[idx]; + x.marshal(dataStream); + } +} + +void AggregateStatePdu::unmarshal(DataStream& dataStream) { + EntityManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _aggregateID.unmarshal(dataStream); + dataStream >> _forceID; + dataStream >> _aggregateState; + _aggregateType.unmarshal(dataStream); + dataStream >> _formation; + _aggregateMarking.unmarshal(dataStream); + _dimensions.unmarshal(dataStream); + _orientation.unmarshal(dataStream); + _centerOfMass.unmarshal(dataStream); + _velocity.unmarshal(dataStream); + dataStream >> _numberOfDisAggregates; + dataStream >> _numberOfDisEntities; + dataStream >> _numberOfSilentAggregateTypes; + dataStream >> _numberOfSilentEntityTypes; + + _aggregateIDList.clear(); + for (size_t idx = 0; idx < _numberOfDisAggregates; idx++) { + AggregateID x; + x.unmarshal(dataStream); + _aggregateIDList.push_back(x); + } + + _entityIDList.clear(); + for (size_t idx = 0; idx < _numberOfDisEntities; idx++) { + EntityID x; + x.unmarshal(dataStream); + _entityIDList.push_back(x); + } + dataStream >> _pad2; + + _silentAggregateSystemList.clear(); + for (size_t idx = 0; idx < _numberOfSilentAggregateTypes; idx++) { + EntityType x; + x.unmarshal(dataStream); + _silentAggregateSystemList.push_back(x); + } + + _silentEntitySystemList.clear(); + for (size_t idx = 0; idx < _numberOfSilentEntityTypes; idx++) { + EntityType x; + x.unmarshal(dataStream); + _silentEntitySystemList.push_back(x); + } + dataStream >> _numberOfVariableDatumRecords; + + _variableDatumList.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumList.push_back(x); + } +} + +bool AggregateStatePdu::operator==(const AggregateStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); + + if (!(_aggregateID == rhs._aggregateID)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_aggregateState == rhs._aggregateState)) ivarsEqual = false; + if (!(_aggregateType == rhs._aggregateType)) ivarsEqual = false; + if (!(_formation == rhs._formation)) ivarsEqual = false; + if (!(_aggregateMarking == rhs._aggregateMarking)) ivarsEqual = false; + if (!(_dimensions == rhs._dimensions)) ivarsEqual = false; + if (!(_orientation == rhs._orientation)) ivarsEqual = false; + if (!(_centerOfMass == rhs._centerOfMass)) ivarsEqual = false; + if (!(_velocity == rhs._velocity)) ivarsEqual = false; + + for (size_t idx = 0; idx < _aggregateIDList.size(); idx++) { + if (!(_aggregateIDList[idx] == rhs._aggregateIDList[idx])) + ivarsEqual = false; + } + + for (size_t idx = 0; idx < _entityIDList.size(); idx++) { + if (!(_entityIDList[idx] == rhs._entityIDList[idx])) ivarsEqual = false; + } + + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + + for (size_t idx = 0; idx < _silentAggregateSystemList.size(); idx++) { + if (!(_silentAggregateSystemList[idx] == + rhs._silentAggregateSystemList[idx])) + ivarsEqual = false; + } + + for (size_t idx = 0; idx < _silentEntitySystemList.size(); idx++) { + if (!(_silentEntitySystemList[idx] == rhs._silentEntitySystemList[idx])) + ivarsEqual = false; + } + + for (size_t idx = 0; idx < _variableDatumList.size(); idx++) { + if (!(_variableDatumList[idx] == rhs._variableDatumList[idx])) + ivarsEqual = false; + } + + return ivarsEqual; +} + +int AggregateStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _aggregateID.getMarshalledSize(); // _aggregateID + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _aggregateState + marshalSize = + marshalSize + _aggregateType.getMarshalledSize(); // _aggregateType + marshalSize = marshalSize + 4; // _formation + marshalSize = + marshalSize + _aggregateMarking.getMarshalledSize(); // _aggregateMarking + marshalSize = marshalSize + _dimensions.getMarshalledSize(); // _dimensions + marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation + marshalSize = + marshalSize + _centerOfMass.getMarshalledSize(); // _centerOfMass + marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity + marshalSize = marshalSize + 2; // _numberOfDisAggregates + marshalSize = marshalSize + 2; // _numberOfDisEntities + marshalSize = marshalSize + 2; // _numberOfSilentAggregateTypes + marshalSize = marshalSize + 2; // _numberOfSilentEntityTypes + + for (unsigned long long idx = 0; idx < _aggregateIDList.size(); idx++) { + AggregateID listElement = _aggregateIDList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _entityIDList.size(); idx++) { + EntityID listElement = _entityIDList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + marshalSize = marshalSize + 1; // _pad2 + + for (unsigned long long idx = 0; idx < _silentAggregateSystemList.size(); + idx++) { + EntityType listElement = _silentAggregateSystemList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _silentEntitySystemList.size(); + idx++) { + EntityType listElement = _silentEntitySystemList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + + for (unsigned long long idx = 0; idx < _variableDatumList.size(); idx++) { + VariableDatum listElement = _variableDatumList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -523,7 +428,7 @@ int AggregateStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateStatePdu.h b/src/dis6/AggregateStatePdu.h index 34f15878..df123e80 100644 --- a/src/dis6/AggregateStatePdu.h +++ b/src/dis6/AggregateStatePdu.h @@ -1,187 +1,186 @@ #pragma once +#include + +#include +#include #include +#include #include -#include -#include #include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.9.1 informationa bout aggregating entities anc communicating +// information about the aggregated entities. requires manual +// intervention to fix the padding between entityID lists and silent aggregate +// sysem lists--this padding is dependent on how many entityIDs there +// are, and needs to be on a 32 bit word boundary. UNFINISHED -namespace DIS -{ -// Section 5.3.9.1 informationa bout aggregating entities anc communicating information about the aggregated entities. requires manual intervention to fix the padding between entityID lists and silent aggregate sysem lists--this padding is dependent on how many entityIDs there are, and needs to be on a 32 bit word boundary. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { + protected: /** ID of aggregated entities */ - EntityID _aggregateID; + EntityID _aggregateID; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** state of aggregate */ - unsigned char _aggregateState; + unsigned char _aggregateState; /** entity type of the aggregated entities */ - EntityType _aggregateType; + EntityType _aggregateType; /** formation of aggregated entities */ - unsigned int _formation; + unsigned int _formation; /** marking for aggregate; first char is charset type, rest is char data */ - AggregateMarking _aggregateMarking; + AggregateMarking _aggregateMarking; - /** dimensions of bounding box for the aggregated entities, origin at the center of mass */ - Vector3Float _dimensions; + /** dimensions of bounding box for the aggregated entities, origin at the + * center of mass */ + Vector3Float _dimensions; /** orientation of the bounding box */ - Orientation _orientation; + Orientation _orientation; /** center of mass of the aggregation */ - Vector3Double _centerOfMass; + Vector3Double _centerOfMass; /** velocity of aggregation */ - Vector3Float _velocity; + Vector3Float _velocity; /** number of aggregates */ - unsigned short _numberOfDisAggregates; + unsigned short _numberOfDisAggregates; /** number of entities */ - unsigned short _numberOfDisEntities; + unsigned short _numberOfDisEntities; /** number of silent aggregate types */ - unsigned short _numberOfSilentAggregateTypes; + unsigned short _numberOfSilentAggregateTypes; /** number of silent entity types */ - unsigned short _numberOfSilentEntityTypes; + unsigned short _numberOfSilentEntityTypes; /** aggregates list */ - std::vector _aggregateIDList; + std::vector _aggregateIDList; /** entity ID list */ - std::vector _entityIDList; + std::vector _entityIDList; - /** ^^^padding to put the start of the next list on a 32 bit boundary. This needs to be fixed */ - unsigned char _pad2; + /** ^^^padding to put the start of the next list on a 32 bit boundary. This + * needs to be fixed */ + unsigned char _pad2; /** silent entity types */ - std::vector _silentAggregateSystemList; + std::vector _silentAggregateSystemList; /** silent entity types */ - std::vector _silentEntitySystemList; + std::vector _silentEntitySystemList; /** number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variableDatums */ - std::vector _variableDatumList; - + std::vector _variableDatumList; public: - AggregateStatePdu(); - virtual ~AggregateStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + AggregateStatePdu(); + virtual ~AggregateStatePdu(); - EntityID& getAggregateID(); - const EntityID& getAggregateID() const; - void setAggregateID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + EntityID& getAggregateID(); + const EntityID& getAggregateID() const; + void setAggregateID(const EntityID& pX); - unsigned char getAggregateState() const; - void setAggregateState(unsigned char pX); + unsigned char getForceID() const; + void setForceID(unsigned char pX); - EntityType& getAggregateType(); - const EntityType& getAggregateType() const; - void setAggregateType(const EntityType &pX); + unsigned char getAggregateState() const; + void setAggregateState(unsigned char pX); - unsigned int getFormation() const; - void setFormation(unsigned int pX); + EntityType& getAggregateType(); + const EntityType& getAggregateType() const; + void setAggregateType(const EntityType& pX); - AggregateMarking& getAggregateMarking(); - const AggregateMarking& getAggregateMarking() const; - void setAggregateMarking(const AggregateMarking &pX); + unsigned int getFormation() const; + void setFormation(unsigned int pX); - Vector3Float& getDimensions(); - const Vector3Float& getDimensions() const; - void setDimensions(const Vector3Float &pX); + AggregateMarking& getAggregateMarking(); + const AggregateMarking& getAggregateMarking() const; + void setAggregateMarking(const AggregateMarking& pX); - Orientation& getOrientation(); - const Orientation& getOrientation() const; - void setOrientation(const Orientation &pX); + Vector3Float& getDimensions(); + const Vector3Float& getDimensions() const; + void setDimensions(const Vector3Float& pX); - Vector3Double& getCenterOfMass(); - const Vector3Double& getCenterOfMass() const; - void setCenterOfMass(const Vector3Double &pX); + Orientation& getOrientation(); + const Orientation& getOrientation() const; + void setOrientation(const Orientation& pX); - Vector3Float& getVelocity(); - const Vector3Float& getVelocity() const; - void setVelocity(const Vector3Float &pX); + Vector3Double& getCenterOfMass(); + const Vector3Double& getCenterOfMass() const; + void setCenterOfMass(const Vector3Double& pX); - unsigned short getNumberOfDisAggregates() const; + Vector3Float& getVelocity(); + const Vector3Float& getVelocity() const; + void setVelocity(const Vector3Float& pX); - unsigned short getNumberOfDisEntities() const; + unsigned short getNumberOfDisAggregates() const; - unsigned short getNumberOfSilentAggregateTypes() const; + unsigned short getNumberOfDisEntities() const; - unsigned short getNumberOfSilentEntityTypes() const; + unsigned short getNumberOfSilentAggregateTypes() const; - std::vector& getAggregateIDList(); - const std::vector& getAggregateIDList() const; - void setAggregateIDList(const std::vector& pX); + unsigned short getNumberOfSilentEntityTypes() const; - std::vector& getEntityIDList(); - const std::vector& getEntityIDList() const; - void setEntityIDList(const std::vector& pX); + std::vector& getAggregateIDList(); + const std::vector& getAggregateIDList() const; + void setAggregateIDList(const std::vector& pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + std::vector& getEntityIDList(); + const std::vector& getEntityIDList() const; + void setEntityIDList(const std::vector& pX); - std::vector& getSilentAggregateSystemList(); - const std::vector& getSilentAggregateSystemList() const; - void setSilentAggregateSystemList(const std::vector& pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - std::vector& getSilentEntitySystemList(); - const std::vector& getSilentEntitySystemList() const; - void setSilentEntitySystemList(const std::vector& pX); + std::vector& getSilentAggregateSystemList(); + const std::vector& getSilentAggregateSystemList() const; + void setSilentAggregateSystemList(const std::vector& pX); - unsigned int getNumberOfVariableDatumRecords() const; + std::vector& getSilentEntitySystemList(); + const std::vector& getSilentEntitySystemList() const; + void setSilentEntitySystemList(const std::vector& pX); - std::vector& getVariableDatumList(); - const std::vector& getVariableDatumList() const; - void setVariableDatumList(const std::vector& pX); + unsigned int getNumberOfVariableDatumRecords() const; + std::vector& getVariableDatumList(); + const std::vector& getVariableDatumList() const; + void setVariableDatumList(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const AggregateStatePdu& rhs) const; + bool operator==(const AggregateStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +193,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateType.cpp b/src/dis6/AggregateType.cpp index 17729131..75021909 100644 --- a/src/dis6/AggregateType.cpp +++ b/src/dis6/AggregateType.cpp @@ -2,149 +2,97 @@ using namespace DIS; +AggregateType::AggregateType() + : _aggregateKind(0), + _domain(0), + _country(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0) {} -AggregateType::AggregateType(): - _aggregateKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0) -{ -} +AggregateType::~AggregateType() {} -AggregateType::~AggregateType() -{ -} +unsigned char AggregateType::getAggregateKind() const { return _aggregateKind; } -unsigned char AggregateType::getAggregateKind() const -{ - return _aggregateKind; -} +void AggregateType::setAggregateKind(unsigned char pX) { _aggregateKind = pX; } -void AggregateType::setAggregateKind(unsigned char pX) -{ - _aggregateKind = pX; -} +unsigned char AggregateType::getDomain() const { return _domain; } -unsigned char AggregateType::getDomain() const -{ - return _domain; -} +void AggregateType::setDomain(unsigned char pX) { _domain = pX; } -void AggregateType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned short AggregateType::getCountry() const { return _country; } -unsigned short AggregateType::getCountry() const -{ - return _country; -} +void AggregateType::setCountry(unsigned short pX) { _country = pX; } -void AggregateType::setCountry(unsigned short pX) -{ - _country = pX; -} +unsigned char AggregateType::getCategory() const { return _category; } -unsigned char AggregateType::getCategory() const -{ - return _category; -} +void AggregateType::setCategory(unsigned char pX) { _category = pX; } -void AggregateType::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char AggregateType::getSubcategory() const { return _subcategory; } -unsigned char AggregateType::getSubcategory() const -{ - return _subcategory; -} +void AggregateType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void AggregateType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +unsigned char AggregateType::getSpecific() const { return _specific; } -unsigned char AggregateType::getSpecific() const -{ - return _specific; -} +void AggregateType::setSpecific(unsigned char pX) { _specific = pX; } -void AggregateType::setSpecific(unsigned char pX) -{ - _specific = pX; -} +unsigned char AggregateType::getExtra() const { return _extra; } -unsigned char AggregateType::getExtra() const -{ - return _extra; -} +void AggregateType::setExtra(unsigned char pX) { _extra = pX; } -void AggregateType::setExtra(unsigned char pX) -{ - _extra = pX; +void AggregateType::marshal(DataStream& dataStream) const { + dataStream << _aggregateKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; } -void AggregateType::marshal(DataStream& dataStream) const -{ - dataStream << _aggregateKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; +void AggregateType::unmarshal(DataStream& dataStream) { + dataStream >> _aggregateKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; } -void AggregateType::unmarshal(DataStream& dataStream) -{ - dataStream >> _aggregateKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; +bool AggregateType::operator==(const AggregateType& rhs) const { + bool ivarsEqual = true; + + if (!(_aggregateKind == rhs._aggregateKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + + return ivarsEqual; } +int AggregateType::getMarshalledSize() const { + int marshalSize = 0; -bool AggregateType::operator ==(const AggregateType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_aggregateKind == rhs._aggregateKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - - return ivarsEqual; - } - -int AggregateType::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _aggregateKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - return marshalSize; + marshalSize = marshalSize + 1; // _aggregateKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +105,7 @@ int AggregateType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AggregateType.h b/src/dis6/AggregateType.h index 4563f78a..7f112c5c 100644 --- a/src/dis6/AggregateType.h +++ b/src/dis6/AggregateType.h @@ -1,81 +1,78 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.38. Identifies the type of aggregate including kind of entity, +// domain (surface, subsurface, air, etc) country, category, etc. -namespace DIS -{ -// Section 5.2.38. Identifies the type of aggregate including kind of entity, domain (surface, subsurface, air, etc) country, category, etc. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateType -{ -protected: +class OPENDIS6_EXPORT AggregateType { + protected: /** Kind of entity */ - unsigned char _aggregateKind; + unsigned char _aggregateKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; + unsigned char _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; - - unsigned char _extra; + unsigned char _specific; + unsigned char _extra; public: - AggregateType(); - virtual ~AggregateType(); + AggregateType(); + virtual ~AggregateType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getAggregateKind() const; - void setAggregateKind(unsigned char pX); + unsigned char getAggregateKind() const; + void setAggregateKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AggregateType& rhs) const; + bool operator==(const AggregateType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -88,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AngularVelocityVector.cpp b/src/dis6/AngularVelocityVector.cpp index 47d33e75..41e0835a 100644 --- a/src/dis6/AngularVelocityVector.cpp +++ b/src/dis6/AngularVelocityVector.cpp @@ -2,89 +2,58 @@ using namespace DIS; +AngularVelocityVector::AngularVelocityVector() : _x(0), _y(0), _z(0) {} -AngularVelocityVector::AngularVelocityVector(): - _x(0), - _y(0), - _z(0) -{ -} +AngularVelocityVector::~AngularVelocityVector() {} -AngularVelocityVector::~AngularVelocityVector() -{ -} +float AngularVelocityVector::getX() const { return _x; } -float AngularVelocityVector::getX() const -{ - return _x; -} +void AngularVelocityVector::setX(float pX) { _x = pX; } -void AngularVelocityVector::setX(float pX) -{ - _x = pX; -} +float AngularVelocityVector::getY() const { return _y; } -float AngularVelocityVector::getY() const -{ - return _y; -} +void AngularVelocityVector::setY(float pX) { _y = pX; } -void AngularVelocityVector::setY(float pX) -{ - _y = pX; -} +float AngularVelocityVector::getZ() const { return _z; } -float AngularVelocityVector::getZ() const -{ - return _z; -} - -void AngularVelocityVector::setZ(float pX) -{ - _z = pX; -} +void AngularVelocityVector::setZ(float pX) { _z = pX; } -void AngularVelocityVector::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; - dataStream << _z; +void AngularVelocityVector::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; + dataStream << _z; } -void AngularVelocityVector::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; +void AngularVelocityVector::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; + dataStream >> _z; } +bool AngularVelocityVector::operator==(const AngularVelocityVector& rhs) const { + bool ivarsEqual = true; -bool AngularVelocityVector::operator ==(const AngularVelocityVector& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; + if (!(_z == rhs._z)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - if( ! (_z == rhs._z) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AngularVelocityVector::getMarshalledSize() const -{ - int marshalSize = 0; +int AngularVelocityVector::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - marshalSize = marshalSize + 4; // _z - return marshalSize; + marshalSize = marshalSize + 4; // _x + marshalSize = marshalSize + 4; // _y + marshalSize = marshalSize + 4; // _z + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int AngularVelocityVector::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AngularVelocityVector.h b/src/dis6/AngularVelocityVector.h index f9e36c04..e91222e3 100644 --- a/src/dis6/AngularVelocityVector.h +++ b/src/dis6/AngularVelocityVector.h @@ -1,58 +1,55 @@ #pragma once -#include #include +#include +namespace DIS { +// 5.2.2: angular velocity measured in radians per second out each of the +// entity's own coordinate axes. -namespace DIS -{ -// 5.2.2: angular velocity measured in radians per second out each of the entity's own coordinate axes. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AngularVelocityVector -{ -protected: +class OPENDIS6_EXPORT AngularVelocityVector { + protected: /** velocity about the x axis */ - float _x; + float _x; /** velocity about the y axis */ - float _y; + float _y; /** velocity about the zaxis */ - float _z; - + float _z; public: - AngularVelocityVector(); - virtual ~AngularVelocityVector(); + AngularVelocityVector(); + virtual ~AngularVelocityVector(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getX() const; - void setX(float pX); + float getX() const; + void setX(float pX); - float getY() const; - void setY(float pX); + float getY() const; + void setY(float pX); - float getZ() const; - void setZ(float pX); + float getZ() const; + void setZ(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AngularVelocityVector& rhs) const; + bool operator==(const AngularVelocityVector& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AntennaLocation.cpp b/src/dis6/AntennaLocation.cpp index 8d5425b2..663665cf 100644 --- a/src/dis6/AntennaLocation.cpp +++ b/src/dis6/AntennaLocation.cpp @@ -2,84 +2,71 @@ using namespace DIS; +AntennaLocation::AntennaLocation() + : _antennaLocation(), _relativeAntennaLocation() {} -AntennaLocation::AntennaLocation(): - _antennaLocation(), - _relativeAntennaLocation() -{ -} - -AntennaLocation::~AntennaLocation() -{ -} +AntennaLocation::~AntennaLocation() {} -Vector3Double& AntennaLocation::getAntennaLocation() -{ - return _antennaLocation; +Vector3Double& AntennaLocation::getAntennaLocation() { + return _antennaLocation; } -const Vector3Double& AntennaLocation::getAntennaLocation() const -{ - return _antennaLocation; +const Vector3Double& AntennaLocation::getAntennaLocation() const { + return _antennaLocation; } -void AntennaLocation::setAntennaLocation(const Vector3Double &pX) -{ - _antennaLocation = pX; +void AntennaLocation::setAntennaLocation(const Vector3Double& pX) { + _antennaLocation = pX; } -Vector3Float& AntennaLocation::getRelativeAntennaLocation() -{ - return _relativeAntennaLocation; +Vector3Float& AntennaLocation::getRelativeAntennaLocation() { + return _relativeAntennaLocation; } -const Vector3Float& AntennaLocation::getRelativeAntennaLocation() const -{ - return _relativeAntennaLocation; +const Vector3Float& AntennaLocation::getRelativeAntennaLocation() const { + return _relativeAntennaLocation; } -void AntennaLocation::setRelativeAntennaLocation(const Vector3Float &pX) -{ - _relativeAntennaLocation = pX; +void AntennaLocation::setRelativeAntennaLocation(const Vector3Float& pX) { + _relativeAntennaLocation = pX; } -void AntennaLocation::marshal(DataStream& dataStream) const -{ - _antennaLocation.marshal(dataStream); - _relativeAntennaLocation.marshal(dataStream); +void AntennaLocation::marshal(DataStream& dataStream) const { + _antennaLocation.marshal(dataStream); + _relativeAntennaLocation.marshal(dataStream); } -void AntennaLocation::unmarshal(DataStream& dataStream) -{ - _antennaLocation.unmarshal(dataStream); - _relativeAntennaLocation.unmarshal(dataStream); +void AntennaLocation::unmarshal(DataStream& dataStream) { + _antennaLocation.unmarshal(dataStream); + _relativeAntennaLocation.unmarshal(dataStream); } +bool AntennaLocation::operator==(const AntennaLocation& rhs) const { + bool ivarsEqual = true; -bool AntennaLocation::operator ==(const AntennaLocation& rhs) const - { - bool ivarsEqual = true; + if (!(_antennaLocation == rhs._antennaLocation)) ivarsEqual = false; + if (!(_relativeAntennaLocation == rhs._relativeAntennaLocation)) + ivarsEqual = false; - if( ! (_antennaLocation == rhs._antennaLocation) ) ivarsEqual = false; - if( ! (_relativeAntennaLocation == rhs._relativeAntennaLocation) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AntennaLocation::getMarshalledSize() const -{ - int marshalSize = 0; +int AntennaLocation::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _antennaLocation.getMarshalledSize(); // _antennaLocation - marshalSize = marshalSize + _relativeAntennaLocation.getMarshalledSize(); // _relativeAntennaLocation - return marshalSize; + marshalSize = + marshalSize + _antennaLocation.getMarshalledSize(); // _antennaLocation + marshalSize = + marshalSize + + _relativeAntennaLocation.getMarshalledSize(); // _relativeAntennaLocation + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -92,7 +79,7 @@ int AntennaLocation::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/AntennaLocation.h b/src/dis6/AntennaLocation.h index 72685033..dde4a9c2 100644 --- a/src/dis6/AntennaLocation.h +++ b/src/dis6/AntennaLocation.h @@ -2,55 +2,54 @@ #include #include -#include #include +#include +namespace DIS { +// 5.2.3: location of the radiating portion of the antenna, specified in world +// coordinates and entity coordinates. -namespace DIS -{ -// 5.2.3: location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT AntennaLocation -{ -protected: - /** Location of the radiating portion of the antenna in world coordinates */ - Vector3Double _antennaLocation; - - /** Location of the radiating portion of the antenna in entity coordinates */ - Vector3Float _relativeAntennaLocation; +class OPENDIS6_EXPORT AntennaLocation { + protected: + /** Location of the radiating portion of the antenna in world coordinates + */ + Vector3Double _antennaLocation; + /** Location of the radiating portion of the antenna in entity coordinates + */ + Vector3Float _relativeAntennaLocation; public: - AntennaLocation(); - virtual ~AntennaLocation(); + AntennaLocation(); + virtual ~AntennaLocation(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - Vector3Double& getAntennaLocation(); - const Vector3Double& getAntennaLocation() const; - void setAntennaLocation(const Vector3Double &pX); + Vector3Double& getAntennaLocation(); + const Vector3Double& getAntennaLocation() const; + void setAntennaLocation(const Vector3Double& pX); - Vector3Float& getRelativeAntennaLocation(); - const Vector3Float& getRelativeAntennaLocation() const; - void setRelativeAntennaLocation(const Vector3Float &pX); + Vector3Float& getRelativeAntennaLocation(); + const Vector3Float& getRelativeAntennaLocation() const; + void setRelativeAntennaLocation(const Vector3Float& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AntennaLocation& rhs) const; + bool operator==(const AntennaLocation& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -63,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ApaData.cpp b/src/dis6/ApaData.cpp index 64a83f33..a88e4a04 100644 --- a/src/dis6/ApaData.cpp +++ b/src/dis6/ApaData.cpp @@ -2,74 +2,50 @@ using namespace DIS; +ApaData::ApaData() : _parameterIndex(0), _parameterValue(0) {} -ApaData::ApaData(): - _parameterIndex(0), - _parameterValue(0) -{ -} +ApaData::~ApaData() {} -ApaData::~ApaData() -{ -} +unsigned short ApaData::getParameterIndex() const { return _parameterIndex; } -unsigned short ApaData::getParameterIndex() const -{ - return _parameterIndex; -} +void ApaData::setParameterIndex(unsigned short pX) { _parameterIndex = pX; } -void ApaData::setParameterIndex(unsigned short pX) -{ - _parameterIndex = pX; -} +short ApaData::getParameterValue() const { return _parameterValue; } -short ApaData::getParameterValue() const -{ - return _parameterValue; -} +void ApaData::setParameterValue(short pX) { _parameterValue = pX; } -void ApaData::setParameterValue(short pX) -{ - _parameterValue = pX; +void ApaData::marshal(DataStream& dataStream) const { + dataStream << _parameterIndex; + dataStream << _parameterValue; } -void ApaData::marshal(DataStream& dataStream) const -{ - dataStream << _parameterIndex; - dataStream << _parameterValue; -} - -void ApaData::unmarshal(DataStream& dataStream) -{ - dataStream >> _parameterIndex; - dataStream >> _parameterValue; +void ApaData::unmarshal(DataStream& dataStream) { + dataStream >> _parameterIndex; + dataStream >> _parameterValue; } +bool ApaData::operator==(const ApaData& rhs) const { + bool ivarsEqual = true; -bool ApaData::operator ==(const ApaData& rhs) const - { - bool ivarsEqual = true; + if (!(_parameterIndex == rhs._parameterIndex)) ivarsEqual = false; + if (!(_parameterValue == rhs._parameterValue)) ivarsEqual = false; - if( ! (_parameterIndex == rhs._parameterIndex) ) ivarsEqual = false; - if( ! (_parameterValue == rhs._parameterValue) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ApaData::getMarshalledSize() const -{ - int marshalSize = 0; +int ApaData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _parameterIndex - marshalSize = marshalSize + 2; // _parameterValue - return marshalSize; + marshalSize = marshalSize + 2; // _parameterIndex + marshalSize = marshalSize + 2; // _parameterValue + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int ApaData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ApaData.h b/src/dis6/ApaData.h index 2972b953..f4418cbe 100644 --- a/src/dis6/ApaData.h +++ b/src/dis6/ApaData.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Used in UA PDU -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ApaData -{ -protected: +class OPENDIS6_EXPORT ApaData { + protected: /** Index of APA parameter */ - unsigned short _parameterIndex; + unsigned short _parameterIndex; /** Index of APA parameter */ - short _parameterValue; - + short _parameterValue; public: - ApaData(); - virtual ~ApaData(); + ApaData(); + virtual ~ApaData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getParameterIndex() const; - void setParameterIndex(unsigned short pX); + unsigned short getParameterIndex() const; + void setParameterIndex(unsigned short pX); - short getParameterValue() const; - void setParameterValue(short pX); + short getParameterValue() const; + void setParameterValue(short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ApaData& rhs) const; + bool operator==(const ApaData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ArealObjectStatePdu.cpp b/src/dis6/ArealObjectStatePdu.cpp index 6efab892..1a863290 100644 --- a/src/dis6/ArealObjectStatePdu.cpp +++ b/src/dis6/ArealObjectStatePdu.cpp @@ -2,268 +2,219 @@ using namespace DIS; - -ArealObjectStatePdu::ArealObjectStatePdu() : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), - _forceID(0), - _modifications(0), - _objectType(), - _objectAppearance(), - _numberOfPoints(0), - _requesterID(), - _receivingID() -{ - setPduType( 45 ); +ArealObjectStatePdu::ArealObjectStatePdu() + : SyntheticEnvironmentFamilyPdu(), + _objectID(), + _referencedObjectID(), + _updateNumber(0), + _forceID(0), + _modifications(0), + _objectType(), + _objectAppearance(), + _numberOfPoints(0), + _requesterID(), + _receivingID() { + setPduType(45); } -ArealObjectStatePdu::~ArealObjectStatePdu() -{ - _objectLocation.clear(); -} +ArealObjectStatePdu::~ArealObjectStatePdu() { _objectLocation.clear(); } -EntityID& ArealObjectStatePdu::getObjectID() -{ - return _objectID; -} +EntityID& ArealObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& ArealObjectStatePdu::getObjectID() const -{ - return _objectID; -} +const EntityID& ArealObjectStatePdu::getObjectID() const { return _objectID; } -void ArealObjectStatePdu::setObjectID(const EntityID &pX) -{ - _objectID = pX; -} +void ArealObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } -EntityID& ArealObjectStatePdu::getReferencedObjectID() -{ - return _referencedObjectID; +EntityID& ArealObjectStatePdu::getReferencedObjectID() { + return _referencedObjectID; } -const EntityID& ArealObjectStatePdu::getReferencedObjectID() const -{ - return _referencedObjectID; +const EntityID& ArealObjectStatePdu::getReferencedObjectID() const { + return _referencedObjectID; } -void ArealObjectStatePdu::setReferencedObjectID(const EntityID &pX) -{ - _referencedObjectID = pX; +void ArealObjectStatePdu::setReferencedObjectID(const EntityID& pX) { + _referencedObjectID = pX; } -unsigned short ArealObjectStatePdu::getUpdateNumber() const -{ - return _updateNumber; +unsigned short ArealObjectStatePdu::getUpdateNumber() const { + return _updateNumber; } -void ArealObjectStatePdu::setUpdateNumber(unsigned short pX) -{ - _updateNumber = pX; +void ArealObjectStatePdu::setUpdateNumber(unsigned short pX) { + _updateNumber = pX; } -unsigned char ArealObjectStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char ArealObjectStatePdu::getForceID() const { return _forceID; } -void ArealObjectStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void ArealObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char ArealObjectStatePdu::getModifications() const -{ - return _modifications; +unsigned char ArealObjectStatePdu::getModifications() const { + return _modifications; } -void ArealObjectStatePdu::setModifications(unsigned char pX) -{ - _modifications = pX; +void ArealObjectStatePdu::setModifications(unsigned char pX) { + _modifications = pX; } -EntityType& ArealObjectStatePdu::getObjectType() -{ - return _objectType; +EntityType& ArealObjectStatePdu::getObjectType() { return _objectType; } + +const EntityType& ArealObjectStatePdu::getObjectType() const { + return _objectType; } -const EntityType& ArealObjectStatePdu::getObjectType() const -{ - return _objectType; +void ArealObjectStatePdu::setObjectType(const EntityType& pX) { + _objectType = pX; } -void ArealObjectStatePdu::setObjectType(const EntityType &pX) -{ - _objectType = pX; +SixByteChunk& ArealObjectStatePdu::getObjectAppearance() { + return _objectAppearance; } -SixByteChunk& ArealObjectStatePdu::getObjectAppearance() -{ - return _objectAppearance; +const SixByteChunk& ArealObjectStatePdu::getObjectAppearance() const { + return _objectAppearance; } -const SixByteChunk& ArealObjectStatePdu::getObjectAppearance() const -{ - return _objectAppearance; +void ArealObjectStatePdu::setObjectAppearance(const SixByteChunk& pX) { + _objectAppearance = pX; } -void ArealObjectStatePdu::setObjectAppearance(const SixByteChunk &pX) -{ - _objectAppearance = pX; +unsigned short ArealObjectStatePdu::getNumberOfPoints() const { + return _objectLocation.size(); } -unsigned short ArealObjectStatePdu::getNumberOfPoints() const -{ - return _objectLocation.size(); +SimulationAddress& ArealObjectStatePdu::getRequesterID() { + return _requesterID; } -SimulationAddress& ArealObjectStatePdu::getRequesterID() -{ - return _requesterID; +const SimulationAddress& ArealObjectStatePdu::getRequesterID() const { + return _requesterID; } -const SimulationAddress& ArealObjectStatePdu::getRequesterID() const -{ - return _requesterID; +void ArealObjectStatePdu::setRequesterID(const SimulationAddress& pX) { + _requesterID = pX; } -void ArealObjectStatePdu::setRequesterID(const SimulationAddress &pX) -{ - _requesterID = pX; +SimulationAddress& ArealObjectStatePdu::getReceivingID() { + return _receivingID; } -SimulationAddress& ArealObjectStatePdu::getReceivingID() -{ - return _receivingID; +const SimulationAddress& ArealObjectStatePdu::getReceivingID() const { + return _receivingID; } -const SimulationAddress& ArealObjectStatePdu::getReceivingID() const -{ - return _receivingID; +void ArealObjectStatePdu::setReceivingID(const SimulationAddress& pX) { + _receivingID = pX; } -void ArealObjectStatePdu::setReceivingID(const SimulationAddress &pX) -{ - _receivingID = pX; +std::vector& ArealObjectStatePdu::getObjectLocation() { + return _objectLocation; } -std::vector& ArealObjectStatePdu::getObjectLocation() -{ - return _objectLocation; +const std::vector& ArealObjectStatePdu::getObjectLocation() + const { + return _objectLocation; } -const std::vector& ArealObjectStatePdu::getObjectLocation() const -{ - return _objectLocation; +void ArealObjectStatePdu::setObjectLocation( + const std::vector& pX) { + _objectLocation = pX; } -void ArealObjectStatePdu::setObjectLocation(const std::vector& pX) -{ - _objectLocation = pX; +void ArealObjectStatePdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _objectID.marshal(dataStream); + _referencedObjectID.marshal(dataStream); + dataStream << _updateNumber; + dataStream << _forceID; + dataStream << _modifications; + _objectType.marshal(dataStream); + _objectAppearance.marshal(dataStream); + dataStream << (unsigned short)_objectLocation.size(); + _requesterID.marshal(dataStream); + _receivingID.marshal(dataStream); + + for (size_t idx = 0; idx < _objectLocation.size(); idx++) { + Vector3Double x = _objectLocation[idx]; + x.marshal(dataStream); + } } -void ArealObjectStatePdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _objectID.marshal(dataStream); - _referencedObjectID.marshal(dataStream); - dataStream << _updateNumber; - dataStream << _forceID; - dataStream << _modifications; - _objectType.marshal(dataStream); - _objectAppearance.marshal(dataStream); - dataStream << ( unsigned short )_objectLocation.size(); - _requesterID.marshal(dataStream); - _receivingID.marshal(dataStream); - - for(size_t idx = 0; idx < _objectLocation.size(); idx++) - { - Vector3Double x = _objectLocation[idx]; - x.marshal(dataStream); - } +void ArealObjectStatePdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _objectID.unmarshal(dataStream); + _referencedObjectID.unmarshal(dataStream); + dataStream >> _updateNumber; + dataStream >> _forceID; + dataStream >> _modifications; + _objectType.unmarshal(dataStream); + _objectAppearance.unmarshal(dataStream); + dataStream >> _numberOfPoints; + _requesterID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + _objectLocation.clear(); + for (size_t idx = 0; idx < _numberOfPoints; idx++) { + Vector3Double x; + x.unmarshal(dataStream); + _objectLocation.push_back(x); + } } -void ArealObjectStatePdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _objectID.unmarshal(dataStream); - _referencedObjectID.unmarshal(dataStream); - dataStream >> _updateNumber; - dataStream >> _forceID; - dataStream >> _modifications; - _objectType.unmarshal(dataStream); - _objectAppearance.unmarshal(dataStream); - dataStream >> _numberOfPoints; - _requesterID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - - _objectLocation.clear(); - for(size_t idx = 0; idx < _numberOfPoints; idx++) - { - Vector3Double x; - x.unmarshal(dataStream); - _objectLocation.push_back(x); - } +bool ArealObjectStatePdu::operator==(const ArealObjectStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + + if (!(_objectID == rhs._objectID)) ivarsEqual = false; + if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; + if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_modifications == rhs._modifications)) ivarsEqual = false; + if (!(_objectType == rhs._objectType)) ivarsEqual = false; + if (!(_objectAppearance == rhs._objectAppearance)) ivarsEqual = false; + if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + + for (size_t idx = 0; idx < _objectLocation.size(); idx++) { + if (!(_objectLocation[idx] == rhs._objectLocation[idx])) ivarsEqual = false; + } + + return ivarsEqual; } +int ArealObjectStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID + marshalSize = marshalSize + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshalSize = marshalSize + 2; // _updateNumber + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _modifications + marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType + marshalSize = + marshalSize + _objectAppearance.getMarshalledSize(); // _objectAppearance + marshalSize = marshalSize + 2; // _numberOfPoints + marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID -bool ArealObjectStatePdu::operator ==(const ArealObjectStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - - if( ! (_objectID == rhs._objectID) ) ivarsEqual = false; - if( ! (_referencedObjectID == rhs._referencedObjectID) ) ivarsEqual = false; - if( ! (_updateNumber == rhs._updateNumber) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_modifications == rhs._modifications) ) ivarsEqual = false; - if( ! (_objectType == rhs._objectType) ) ivarsEqual = false; - if( ! (_objectAppearance == rhs._objectAppearance) ) ivarsEqual = false; - if( ! (_requesterID == rhs._requesterID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _objectLocation.size(); idx++) - { - if( ! ( _objectLocation[idx] == rhs._objectLocation[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int ArealObjectStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _modifications - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - marshalSize = marshalSize + _objectAppearance.getMarshalledSize(); // _objectAppearance - marshalSize = marshalSize + 2; // _numberOfPoints - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - - for(unsigned long long idx=0; idx < _objectLocation.size(); idx++) - { - Vector3Double listElement = _objectLocation[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + for (unsigned long long idx = 0; idx < _objectLocation.size(); idx++) { + Vector3Double listElement = _objectLocation[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -276,7 +227,7 @@ int ArealObjectStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ArealObjectStatePdu.h b/src/dis6/ArealObjectStatePdu.h index 2c8c5952..834592c1 100644 --- a/src/dis6/ArealObjectStatePdu.h +++ b/src/dis6/ArealObjectStatePdu.h @@ -1,121 +1,119 @@ #pragma once -#include +#include + #include #include -#include #include -#include -#include -#include +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.11.5: Information about the addition/modification of an oobject +// that is geometrically achored to the terrain with a set of three or more +// points that come to a closure. COMPLETE -namespace DIS -{ -// Section 5.3.11.5: Information about the addition/modification of an oobject that is geometrically achored to the terrain with a set of three or more points that come to a closure. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ArealObjectStatePdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ArealObjectStatePdu + : public SyntheticEnvironmentFamilyPdu { + protected: /** Object in synthetic environment */ - EntityID _objectID; + EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + unsigned short _updateNumber; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** modifications enumeration */ - unsigned char _modifications; + unsigned char _modifications; /** Object type */ - EntityType _objectType; + EntityType _objectType; /** Object appearance */ - SixByteChunk _objectAppearance; + SixByteChunk _objectAppearance; /** Number of points */ - unsigned short _numberOfPoints; + unsigned short _numberOfPoints; /** requesterID */ - SimulationAddress _requesterID; + SimulationAddress _requesterID; /** receiver ID */ - SimulationAddress _receivingID; + SimulationAddress _receivingID; /** location of object */ - std::vector _objectLocation; - + std::vector _objectLocation; public: - ArealObjectStatePdu(); - virtual ~ArealObjectStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + ArealObjectStatePdu(); + virtual ~ArealObjectStatePdu(); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID &pX); + EntityID& getObjectID(); + const EntityID& getObjectID() const; + void setObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + EntityID& getReferencedObjectID(); + const EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const EntityID& pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned short getUpdateNumber() const; + void setUpdateNumber(unsigned short pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + unsigned char getForceID() const; + void setForceID(unsigned char pX); - EntityType& getObjectType(); - const EntityType& getObjectType() const; - void setObjectType(const EntityType &pX); + unsigned char getModifications() const; + void setModifications(unsigned char pX); - SixByteChunk& getObjectAppearance(); - const SixByteChunk& getObjectAppearance() const; - void setObjectAppearance(const SixByteChunk &pX); + EntityType& getObjectType(); + const EntityType& getObjectType() const; + void setObjectType(const EntityType& pX); - unsigned short getNumberOfPoints() const; + SixByteChunk& getObjectAppearance(); + const SixByteChunk& getObjectAppearance() const; + void setObjectAppearance(const SixByteChunk& pX); - SimulationAddress& getRequesterID(); - const SimulationAddress& getRequesterID() const; - void setRequesterID(const SimulationAddress &pX); + unsigned short getNumberOfPoints() const; - SimulationAddress& getReceivingID(); - const SimulationAddress& getReceivingID() const; - void setReceivingID(const SimulationAddress &pX); + SimulationAddress& getRequesterID(); + const SimulationAddress& getRequesterID() const; + void setRequesterID(const SimulationAddress& pX); - std::vector& getObjectLocation(); - const std::vector& getObjectLocation() const; - void setObjectLocation(const std::vector& pX); + SimulationAddress& getReceivingID(); + const SimulationAddress& getReceivingID() const; + void setReceivingID(const SimulationAddress& pX); + std::vector& getObjectLocation(); + const std::vector& getObjectLocation() const; + void setObjectLocation(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const ArealObjectStatePdu& rhs) const; + bool operator==(const ArealObjectStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -128,7 +126,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ArticulationParameter.cpp b/src/dis6/ArticulationParameter.cpp index 47575301..35ed19f9 100644 --- a/src/dis6/ArticulationParameter.cpp +++ b/src/dis6/ArticulationParameter.cpp @@ -2,119 +2,96 @@ using namespace DIS; +ArticulationParameter::ArticulationParameter() + : _parameterTypeDesignator(0), + _changeIndicator(0), + _partAttachedTo(0), + _parameterType(0), + _parameterValue(0.0) {} -ArticulationParameter::ArticulationParameter(): - _parameterTypeDesignator(0), - _changeIndicator(0), - _partAttachedTo(0), - _parameterType(0), - _parameterValue(0.0) -{ -} +ArticulationParameter::~ArticulationParameter() {} -ArticulationParameter::~ArticulationParameter() -{ +unsigned char ArticulationParameter::getParameterTypeDesignator() const { + return _parameterTypeDesignator; } -unsigned char ArticulationParameter::getParameterTypeDesignator() const -{ - return _parameterTypeDesignator; +void ArticulationParameter::setParameterTypeDesignator(unsigned char pX) { + _parameterTypeDesignator = pX; } -void ArticulationParameter::setParameterTypeDesignator(unsigned char pX) -{ - _parameterTypeDesignator = pX; +unsigned char ArticulationParameter::getChangeIndicator() const { + return _changeIndicator; } -unsigned char ArticulationParameter::getChangeIndicator() const -{ - return _changeIndicator; +void ArticulationParameter::setChangeIndicator(unsigned char pX) { + _changeIndicator = pX; } -void ArticulationParameter::setChangeIndicator(unsigned char pX) -{ - _changeIndicator = pX; +unsigned short ArticulationParameter::getPartAttachedTo() const { + return _partAttachedTo; } -unsigned short ArticulationParameter::getPartAttachedTo() const -{ - return _partAttachedTo; +void ArticulationParameter::setPartAttachedTo(unsigned short pX) { + _partAttachedTo = pX; } -void ArticulationParameter::setPartAttachedTo(unsigned short pX) -{ - _partAttachedTo = pX; -} +int ArticulationParameter::getParameterType() const { return _parameterType; } -int ArticulationParameter::getParameterType() const -{ - return _parameterType; -} +void ArticulationParameter::setParameterType(int pX) { _parameterType = pX; } -void ArticulationParameter::setParameterType(int pX) -{ - _parameterType = pX; +double ArticulationParameter::getParameterValue() const { + return _parameterValue; } -double ArticulationParameter::getParameterValue() const -{ - return _parameterValue; +void ArticulationParameter::setParameterValue(double pX) { + _parameterValue = pX; } -void ArticulationParameter::setParameterValue(double pX) -{ - _parameterValue = pX; +void ArticulationParameter::marshal(DataStream& dataStream) const { + dataStream << _parameterTypeDesignator; + dataStream << _changeIndicator; + dataStream << _partAttachedTo; + dataStream << _parameterType; + dataStream << _parameterValue; } -void ArticulationParameter::marshal(DataStream& dataStream) const -{ - dataStream << _parameterTypeDesignator; - dataStream << _changeIndicator; - dataStream << _partAttachedTo; - dataStream << _parameterType; - dataStream << _parameterValue; +void ArticulationParameter::unmarshal(DataStream& dataStream) { + dataStream >> _parameterTypeDesignator; + dataStream >> _changeIndicator; + dataStream >> _partAttachedTo; + dataStream >> _parameterType; + dataStream >> _parameterValue; } -void ArticulationParameter::unmarshal(DataStream& dataStream) -{ - dataStream >> _parameterTypeDesignator; - dataStream >> _changeIndicator; - dataStream >> _partAttachedTo; - dataStream >> _parameterType; - dataStream >> _parameterValue; -} +bool ArticulationParameter::operator==(const ArticulationParameter& rhs) const { + bool ivarsEqual = true; + if (!(_parameterTypeDesignator == rhs._parameterTypeDesignator)) + ivarsEqual = false; + if (!(_changeIndicator == rhs._changeIndicator)) ivarsEqual = false; + if (!(_partAttachedTo == rhs._partAttachedTo)) ivarsEqual = false; + if (!(_parameterType == rhs._parameterType)) ivarsEqual = false; + if (!(_parameterValue == rhs._parameterValue)) ivarsEqual = false; -bool ArticulationParameter::operator ==(const ArticulationParameter& rhs) const - { - bool ivarsEqual = true; - - if( ! (_parameterTypeDesignator == rhs._parameterTypeDesignator) ) ivarsEqual = false; - if( ! (_changeIndicator == rhs._changeIndicator) ) ivarsEqual = false; - if( ! (_partAttachedTo == rhs._partAttachedTo) ) ivarsEqual = false; - if( ! (_parameterType == rhs._parameterType) ) ivarsEqual = false; - if( ! (_parameterValue == rhs._parameterValue) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ArticulationParameter::getMarshalledSize() const -{ - int marshalSize = 0; +int ArticulationParameter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _parameterTypeDesignator - marshalSize = marshalSize + 1; // _changeIndicator - marshalSize = marshalSize + 2; // _partAttachedTo - marshalSize = marshalSize + 4; // _parameterType - marshalSize = marshalSize + 8; // _parameterValue - return marshalSize; + marshalSize = marshalSize + 1; // _parameterTypeDesignator + marshalSize = marshalSize + 1; // _changeIndicator + marshalSize = marshalSize + 2; // _partAttachedTo + marshalSize = marshalSize + 4; // _parameterType + marshalSize = marshalSize + 8; // _parameterValue + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +104,7 @@ int ArticulationParameter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ArticulationParameter.h b/src/dis6/ArticulationParameter.h index ad7c0432..4ee9db46 100644 --- a/src/dis6/ArticulationParameter.h +++ b/src/dis6/ArticulationParameter.h @@ -1,65 +1,64 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.5. Articulation parameters for movable parts and attached parts +// of an entity. Specifes wether or not a change has occured, the part +// identifcation of the articulated part to which it is attached, and the type +// and value of each parameter. -namespace DIS -{ -// Section 5.2.5. Articulation parameters for movable parts and attached parts of an entity. Specifes wether or not a change has occured, the part identifcation of the articulated part to which it is attached, and the type and value of each parameter. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ArticulationParameter -{ -protected: - unsigned char _parameterTypeDesignator; - - unsigned char _changeIndicator; +class OPENDIS6_EXPORT ArticulationParameter { + protected: + unsigned char _parameterTypeDesignator; - unsigned short _partAttachedTo; + unsigned char _changeIndicator; - int _parameterType; + unsigned short _partAttachedTo; - double _parameterValue; + int _parameterType; + double _parameterValue; public: - ArticulationParameter(); - virtual ~ArticulationParameter(); + ArticulationParameter(); + virtual ~ArticulationParameter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getParameterTypeDesignator() const; - void setParameterTypeDesignator(unsigned char pX); + unsigned char getParameterTypeDesignator() const; + void setParameterTypeDesignator(unsigned char pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + unsigned char getChangeIndicator() const; + void setChangeIndicator(unsigned char pX); - unsigned short getPartAttachedTo() const; - void setPartAttachedTo(unsigned short pX); + unsigned short getPartAttachedTo() const; + void setPartAttachedTo(unsigned short pX); - int getParameterType() const; - void setParameterType(int pX); + int getParameterType() const; + void setParameterType(int pX); - double getParameterValue() const; - void setParameterValue(double pX); + double getParameterValue() const; + void setParameterValue(double pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ArticulationParameter& rhs) const; + bool operator==(const ArticulationParameter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -72,7 +71,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/BeamAntennaPattern.cpp b/src/dis6/BeamAntennaPattern.cpp index 61822cb5..9734dbf0 100644 --- a/src/dis6/BeamAntennaPattern.cpp +++ b/src/dis6/BeamAntennaPattern.cpp @@ -2,169 +2,119 @@ using namespace DIS; +BeamAntennaPattern::BeamAntennaPattern() + : _beamDirection(), + _azimuthBeamwidth(0), + _referenceSystem(0), + _padding1(0), + _padding2(0), + _ez(0.0), + _ex(0.0), + _phase(0.0) {} -BeamAntennaPattern::BeamAntennaPattern(): - _beamDirection(), - _azimuthBeamwidth(0), - _referenceSystem(0), - _padding1(0), - _padding2(0), - _ez(0.0), - _ex(0.0), - _phase(0.0) -{ -} +BeamAntennaPattern::~BeamAntennaPattern() {} -BeamAntennaPattern::~BeamAntennaPattern() -{ -} +Orientation& BeamAntennaPattern::getBeamDirection() { return _beamDirection; } -Orientation& BeamAntennaPattern::getBeamDirection() -{ - return _beamDirection; +const Orientation& BeamAntennaPattern::getBeamDirection() const { + return _beamDirection; } -const Orientation& BeamAntennaPattern::getBeamDirection() const -{ - return _beamDirection; +void BeamAntennaPattern::setBeamDirection(const Orientation& pX) { + _beamDirection = pX; } -void BeamAntennaPattern::setBeamDirection(const Orientation &pX) -{ - _beamDirection = pX; +float BeamAntennaPattern::getAzimuthBeamwidth() const { + return _azimuthBeamwidth; } -float BeamAntennaPattern::getAzimuthBeamwidth() const -{ - return _azimuthBeamwidth; +void BeamAntennaPattern::setAzimuthBeamwidth(float pX) { + _azimuthBeamwidth = pX; } -void BeamAntennaPattern::setAzimuthBeamwidth(float pX) -{ - _azimuthBeamwidth = pX; +float BeamAntennaPattern::getReferenceSystem() const { + return _referenceSystem; } -float BeamAntennaPattern::getReferenceSystem() const -{ - return _referenceSystem; -} +void BeamAntennaPattern::setReferenceSystem(float pX) { _referenceSystem = pX; } -void BeamAntennaPattern::setReferenceSystem(float pX) -{ - _referenceSystem = pX; -} +short BeamAntennaPattern::getPadding1() const { return _padding1; } -short BeamAntennaPattern::getPadding1() const -{ - return _padding1; -} +void BeamAntennaPattern::setPadding1(short pX) { _padding1 = pX; } -void BeamAntennaPattern::setPadding1(short pX) -{ - _padding1 = pX; -} +char BeamAntennaPattern::getPadding2() const { return _padding2; } -char BeamAntennaPattern::getPadding2() const -{ - return _padding2; -} +void BeamAntennaPattern::setPadding2(char pX) { _padding2 = pX; } -void BeamAntennaPattern::setPadding2(char pX) -{ - _padding2 = pX; -} +float BeamAntennaPattern::getEz() const { return _ez; } -float BeamAntennaPattern::getEz() const -{ - return _ez; -} +void BeamAntennaPattern::setEz(float pX) { _ez = pX; } -void BeamAntennaPattern::setEz(float pX) -{ - _ez = pX; -} +float BeamAntennaPattern::getEx() const { return _ex; } -float BeamAntennaPattern::getEx() const -{ - return _ex; -} +void BeamAntennaPattern::setEx(float pX) { _ex = pX; } -void BeamAntennaPattern::setEx(float pX) -{ - _ex = pX; -} +float BeamAntennaPattern::getPhase() const { return _phase; } -float BeamAntennaPattern::getPhase() const -{ - return _phase; -} +void BeamAntennaPattern::setPhase(float pX) { _phase = pX; } -void BeamAntennaPattern::setPhase(float pX) -{ - _phase = pX; +void BeamAntennaPattern::marshal(DataStream& dataStream) const { + _beamDirection.marshal(dataStream); + dataStream << _azimuthBeamwidth; + dataStream << _referenceSystem; + dataStream << _padding1; + dataStream << _padding2; + dataStream << _ez; + dataStream << _ex; + dataStream << _phase; } -void BeamAntennaPattern::marshal(DataStream& dataStream) const -{ - _beamDirection.marshal(dataStream); - dataStream << _azimuthBeamwidth; - dataStream << _referenceSystem; - dataStream << _padding1; - dataStream << _padding2; - dataStream << _ez; - dataStream << _ex; - dataStream << _phase; +void BeamAntennaPattern::unmarshal(DataStream& dataStream) { + _beamDirection.unmarshal(dataStream); + dataStream >> _azimuthBeamwidth; + dataStream >> _referenceSystem; + dataStream >> _padding1; + dataStream >> _padding2; + dataStream >> _ez; + dataStream >> _ex; + dataStream >> _phase; } -void BeamAntennaPattern::unmarshal(DataStream& dataStream) -{ - _beamDirection.unmarshal(dataStream); - dataStream >> _azimuthBeamwidth; - dataStream >> _referenceSystem; - dataStream >> _padding1; - dataStream >> _padding2; - dataStream >> _ez; - dataStream >> _ex; - dataStream >> _phase; +bool BeamAntennaPattern::operator==(const BeamAntennaPattern& rhs) const { + bool ivarsEqual = true; + + if (!(_beamDirection == rhs._beamDirection)) ivarsEqual = false; + if (!(_azimuthBeamwidth == rhs._azimuthBeamwidth)) ivarsEqual = false; + if (!(_referenceSystem == rhs._referenceSystem)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_ez == rhs._ez)) ivarsEqual = false; + if (!(_ex == rhs._ex)) ivarsEqual = false; + if (!(_phase == rhs._phase)) ivarsEqual = false; + + return ivarsEqual; } +int BeamAntennaPattern::getMarshalledSize() const { + int marshalSize = 0; -bool BeamAntennaPattern::operator ==(const BeamAntennaPattern& rhs) const - { - bool ivarsEqual = true; - - if( ! (_beamDirection == rhs._beamDirection) ) ivarsEqual = false; - if( ! (_azimuthBeamwidth == rhs._azimuthBeamwidth) ) ivarsEqual = false; - if( ! (_referenceSystem == rhs._referenceSystem) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_ez == rhs._ez) ) ivarsEqual = false; - if( ! (_ex == rhs._ex) ) ivarsEqual = false; - if( ! (_phase == rhs._phase) ) ivarsEqual = false; - - return ivarsEqual; - } - -int BeamAntennaPattern::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + _beamDirection.getMarshalledSize(); // _beamDirection - marshalSize = marshalSize + 4; // _azimuthBeamwidth - marshalSize = marshalSize + 4; // _referenceSystem - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - marshalSize = marshalSize + 4; // _ez - marshalSize = marshalSize + 4; // _ex - marshalSize = marshalSize + 4; // _phase - return marshalSize; + marshalSize = + marshalSize + _beamDirection.getMarshalledSize(); // _beamDirection + marshalSize = marshalSize + 4; // _azimuthBeamwidth + marshalSize = marshalSize + 4; // _referenceSystem + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 + marshalSize = marshalSize + 4; // _ez + marshalSize = marshalSize + 4; // _ex + marshalSize = marshalSize + 4; // _phase + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -177,7 +127,7 @@ int BeamAntennaPattern::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/BeamAntennaPattern.h b/src/dis6/BeamAntennaPattern.h index f424fbf9..cedabbf1 100644 --- a/src/dis6/BeamAntennaPattern.h +++ b/src/dis6/BeamAntennaPattern.h @@ -1,86 +1,89 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. +// Specifies the direction, patter, and polarization of radiation from +// an antenna. -namespace DIS -{ -// Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. Specifies the direction, patter, and polarization of radiation from an antenna. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT BeamAntennaPattern -{ -protected: - /** The rotation that transformst he reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by teh reference system field of the antenna pattern record. */ - Orientation _beamDirection; +class OPENDIS6_EXPORT BeamAntennaPattern { + protected: + /** The rotation that transformst he reference coordinate sytem into the + * beam coordinate system. Either world coordinates or entity coordinates may + * be used as the reference coordinate system, as specified by teh + * reference system field of the antenna pattern record. */ + Orientation _beamDirection; - float _azimuthBeamwidth; + float _azimuthBeamwidth; - float _referenceSystem; + float _referenceSystem; - short _padding1; + short _padding1; - char _padding2; + char _padding2; - /** Magnigute of the z-component in beam coordinates at some arbitrary single point in the mainbeam and in the far field of the antenna. */ - float _ez; + /** Magnigute of the z-component in beam coordinates at some arbitrary single + * point in the mainbeam and in the far field of the antenna. */ + float _ez; - /** Magnigute of the x-component in beam coordinates at some arbitrary single point in the mainbeam and in the far field of the antenna. */ - float _ex; + /** Magnigute of the x-component in beam coordinates at some arbitrary single + * point in the mainbeam and in the far field of the antenna. */ + float _ex; /** THe phase angle between Ez and Ex in radians. */ - float _phase; - + float _phase; public: - BeamAntennaPattern(); - virtual ~BeamAntennaPattern(); + BeamAntennaPattern(); + virtual ~BeamAntennaPattern(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - Orientation& getBeamDirection(); - const Orientation& getBeamDirection() const; - void setBeamDirection(const Orientation &pX); + Orientation& getBeamDirection(); + const Orientation& getBeamDirection() const; + void setBeamDirection(const Orientation& pX); - float getAzimuthBeamwidth() const; - void setAzimuthBeamwidth(float pX); + float getAzimuthBeamwidth() const; + void setAzimuthBeamwidth(float pX); - float getReferenceSystem() const; - void setReferenceSystem(float pX); + float getReferenceSystem() const; + void setReferenceSystem(float pX); - short getPadding1() const; - void setPadding1(short pX); + short getPadding1() const; + void setPadding1(short pX); - char getPadding2() const; - void setPadding2(char pX); + char getPadding2() const; + void setPadding2(char pX); - float getEz() const; - void setEz(float pX); + float getEz() const; + void setEz(float pX); - float getEx() const; - void setEx(float pX); + float getEx() const; + void setEx(float pX); - float getPhase() const; - void setPhase(float pX); + float getPhase() const; + void setPhase(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const BeamAntennaPattern& rhs) const; + bool operator==(const BeamAntennaPattern& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -93,7 +96,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/BeamData.cpp b/src/dis6/BeamData.cpp index 578933a6..c3afb2ce 100644 --- a/src/dis6/BeamData.cpp +++ b/src/dis6/BeamData.cpp @@ -2,119 +2,79 @@ using namespace DIS; +BeamData::BeamData() + : _beamAzimuthCenter(0.0), + _beamAzimuthSweep(0.0), + _beamElevationCenter(0.0), + _beamElevationSweep(0.0), + _beamSweepSync(0.0) {} -BeamData::BeamData(): - _beamAzimuthCenter(0.0), - _beamAzimuthSweep(0.0), - _beamElevationCenter(0.0), - _beamElevationSweep(0.0), - _beamSweepSync(0.0) -{ -} +BeamData::~BeamData() {} -BeamData::~BeamData() -{ -} +float BeamData::getBeamAzimuthCenter() const { return _beamAzimuthCenter; } -float BeamData::getBeamAzimuthCenter() const -{ - return _beamAzimuthCenter; -} +void BeamData::setBeamAzimuthCenter(float pX) { _beamAzimuthCenter = pX; } -void BeamData::setBeamAzimuthCenter(float pX) -{ - _beamAzimuthCenter = pX; -} +float BeamData::getBeamAzimuthSweep() const { return _beamAzimuthSweep; } -float BeamData::getBeamAzimuthSweep() const -{ - return _beamAzimuthSweep; -} +void BeamData::setBeamAzimuthSweep(float pX) { _beamAzimuthSweep = pX; } -void BeamData::setBeamAzimuthSweep(float pX) -{ - _beamAzimuthSweep = pX; -} +float BeamData::getBeamElevationCenter() const { return _beamElevationCenter; } -float BeamData::getBeamElevationCenter() const -{ - return _beamElevationCenter; -} +void BeamData::setBeamElevationCenter(float pX) { _beamElevationCenter = pX; } -void BeamData::setBeamElevationCenter(float pX) -{ - _beamElevationCenter = pX; -} +float BeamData::getBeamElevationSweep() const { return _beamElevationSweep; } -float BeamData::getBeamElevationSweep() const -{ - return _beamElevationSweep; -} +void BeamData::setBeamElevationSweep(float pX) { _beamElevationSweep = pX; } -void BeamData::setBeamElevationSweep(float pX) -{ - _beamElevationSweep = pX; -} +float BeamData::getBeamSweepSync() const { return _beamSweepSync; } -float BeamData::getBeamSweepSync() const -{ - return _beamSweepSync; -} +void BeamData::setBeamSweepSync(float pX) { _beamSweepSync = pX; } -void BeamData::setBeamSweepSync(float pX) -{ - _beamSweepSync = pX; +void BeamData::marshal(DataStream& dataStream) const { + dataStream << _beamAzimuthCenter; + dataStream << _beamAzimuthSweep; + dataStream << _beamElevationCenter; + dataStream << _beamElevationSweep; + dataStream << _beamSweepSync; } -void BeamData::marshal(DataStream& dataStream) const -{ - dataStream << _beamAzimuthCenter; - dataStream << _beamAzimuthSweep; - dataStream << _beamElevationCenter; - dataStream << _beamElevationSweep; - dataStream << _beamSweepSync; +void BeamData::unmarshal(DataStream& dataStream) { + dataStream >> _beamAzimuthCenter; + dataStream >> _beamAzimuthSweep; + dataStream >> _beamElevationCenter; + dataStream >> _beamElevationSweep; + dataStream >> _beamSweepSync; } -void BeamData::unmarshal(DataStream& dataStream) -{ - dataStream >> _beamAzimuthCenter; - dataStream >> _beamAzimuthSweep; - dataStream >> _beamElevationCenter; - dataStream >> _beamElevationSweep; - dataStream >> _beamSweepSync; -} +bool BeamData::operator==(const BeamData& rhs) const { + bool ivarsEqual = true; + if (!(_beamAzimuthCenter == rhs._beamAzimuthCenter)) ivarsEqual = false; + if (!(_beamAzimuthSweep == rhs._beamAzimuthSweep)) ivarsEqual = false; + if (!(_beamElevationCenter == rhs._beamElevationCenter)) ivarsEqual = false; + if (!(_beamElevationSweep == rhs._beamElevationSweep)) ivarsEqual = false; + if (!(_beamSweepSync == rhs._beamSweepSync)) ivarsEqual = false; -bool BeamData::operator ==(const BeamData& rhs) const - { - bool ivarsEqual = true; - - if( ! (_beamAzimuthCenter == rhs._beamAzimuthCenter) ) ivarsEqual = false; - if( ! (_beamAzimuthSweep == rhs._beamAzimuthSweep) ) ivarsEqual = false; - if( ! (_beamElevationCenter == rhs._beamElevationCenter) ) ivarsEqual = false; - if( ! (_beamElevationSweep == rhs._beamElevationSweep) ) ivarsEqual = false; - if( ! (_beamSweepSync == rhs._beamSweepSync) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int BeamData::getMarshalledSize() const -{ - int marshalSize = 0; +int BeamData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _beamAzimuthCenter - marshalSize = marshalSize + 4; // _beamAzimuthSweep - marshalSize = marshalSize + 4; // _beamElevationCenter - marshalSize = marshalSize + 4; // _beamElevationSweep - marshalSize = marshalSize + 4; // _beamSweepSync - return marshalSize; + marshalSize = marshalSize + 4; // _beamAzimuthCenter + marshalSize = marshalSize + 4; // _beamAzimuthSweep + marshalSize = marshalSize + 4; // _beamElevationCenter + marshalSize = marshalSize + 4; // _beamElevationSweep + marshalSize = marshalSize + 4; // _beamSweepSync + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +87,7 @@ int BeamData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/BeamData.h b/src/dis6/BeamData.h index 46623b39..1a5d5e79 100644 --- a/src/dis6/BeamData.h +++ b/src/dis6/BeamData.h @@ -1,70 +1,70 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.39. Specification of the data necessary to describe the scan +// volume of an emitter. -namespace DIS -{ -// Section 5.2.39. Specification of the data necessary to describe the scan volume of an emitter. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT BeamData -{ -protected: - /** Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume */ - float _beamAzimuthCenter; +class OPENDIS6_EXPORT BeamData { + protected: + /** Specifies the beam azimuth an elevation centers and corresponding + * half-angles to describe the scan volume */ + float _beamAzimuthCenter; /** Specifies the beam azimuth sweep to determine scan volume */ - float _beamAzimuthSweep; + float _beamAzimuthSweep; /** Specifies the beam elevation center to determine scan volume */ - float _beamElevationCenter; + float _beamElevationCenter; /** Specifies the beam elevation sweep to determine scan volume */ - float _beamElevationSweep; - - /** allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion. */ - float _beamSweepSync; + float _beamElevationSweep; + /** allows receiver to synchronize its regenerated scan pattern to that of + * the emmitter. Specifies the percentage of time a scan is through its + * pattern from its origion. */ + float _beamSweepSync; public: - BeamData(); - virtual ~BeamData(); + BeamData(); + virtual ~BeamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getBeamAzimuthCenter() const; - void setBeamAzimuthCenter(float pX); + float getBeamAzimuthCenter() const; + void setBeamAzimuthCenter(float pX); - float getBeamAzimuthSweep() const; - void setBeamAzimuthSweep(float pX); + float getBeamAzimuthSweep() const; + void setBeamAzimuthSweep(float pX); - float getBeamElevationCenter() const; - void setBeamElevationCenter(float pX); + float getBeamElevationCenter() const; + void setBeamElevationCenter(float pX); - float getBeamElevationSweep() const; - void setBeamElevationSweep(float pX); + float getBeamElevationSweep() const; + void setBeamElevationSweep(float pX); - float getBeamSweepSync() const; - void setBeamSweepSync(float pX); + float getBeamSweepSync() const; + void setBeamSweepSync(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const BeamData& rhs) const; + bool operator==(const BeamData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +77,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/BurstDescriptor.cpp b/src/dis6/BurstDescriptor.cpp index f6ba40fd..0e1cafad 100644 --- a/src/dis6/BurstDescriptor.cpp +++ b/src/dis6/BurstDescriptor.cpp @@ -2,124 +2,77 @@ using namespace DIS; +BurstDescriptor::BurstDescriptor() + : _munition(), _warhead(0), _fuse(0), _quantity(0), _rate(0) {} -BurstDescriptor::BurstDescriptor(): - _munition(), - _warhead(0), - _fuse(0), - _quantity(0), - _rate(0) -{ -} - -BurstDescriptor::~BurstDescriptor() -{ -} +BurstDescriptor::~BurstDescriptor() {} -EntityType& BurstDescriptor::getMunition() -{ - return _munition; -} +EntityType& BurstDescriptor::getMunition() { return _munition; } -const EntityType& BurstDescriptor::getMunition() const -{ - return _munition; -} +const EntityType& BurstDescriptor::getMunition() const { return _munition; } -void BurstDescriptor::setMunition(const EntityType &pX) -{ - _munition = pX; -} +void BurstDescriptor::setMunition(const EntityType& pX) { _munition = pX; } -unsigned short BurstDescriptor::getWarhead() const -{ - return _warhead; -} +unsigned short BurstDescriptor::getWarhead() const { return _warhead; } -void BurstDescriptor::setWarhead(unsigned short pX) -{ - _warhead = pX; -} +void BurstDescriptor::setWarhead(unsigned short pX) { _warhead = pX; } -unsigned short BurstDescriptor::getFuse() const -{ - return _fuse; -} +unsigned short BurstDescriptor::getFuse() const { return _fuse; } -void BurstDescriptor::setFuse(unsigned short pX) -{ - _fuse = pX; -} +void BurstDescriptor::setFuse(unsigned short pX) { _fuse = pX; } -unsigned short BurstDescriptor::getQuantity() const -{ - return _quantity; -} +unsigned short BurstDescriptor::getQuantity() const { return _quantity; } -void BurstDescriptor::setQuantity(unsigned short pX) -{ - _quantity = pX; -} +void BurstDescriptor::setQuantity(unsigned short pX) { _quantity = pX; } -unsigned short BurstDescriptor::getRate() const -{ - return _rate; -} +unsigned short BurstDescriptor::getRate() const { return _rate; } -void BurstDescriptor::setRate(unsigned short pX) -{ - _rate = pX; -} +void BurstDescriptor::setRate(unsigned short pX) { _rate = pX; } -void BurstDescriptor::marshal(DataStream& dataStream) const -{ - _munition.marshal(dataStream); - dataStream << _warhead; - dataStream << _fuse; - dataStream << _quantity; - dataStream << _rate; +void BurstDescriptor::marshal(DataStream& dataStream) const { + _munition.marshal(dataStream); + dataStream << _warhead; + dataStream << _fuse; + dataStream << _quantity; + dataStream << _rate; } -void BurstDescriptor::unmarshal(DataStream& dataStream) -{ - _munition.unmarshal(dataStream); - dataStream >> _warhead; - dataStream >> _fuse; - dataStream >> _quantity; - dataStream >> _rate; +void BurstDescriptor::unmarshal(DataStream& dataStream) { + _munition.unmarshal(dataStream); + dataStream >> _warhead; + dataStream >> _fuse; + dataStream >> _quantity; + dataStream >> _rate; } +bool BurstDescriptor::operator==(const BurstDescriptor& rhs) const { + bool ivarsEqual = true; -bool BurstDescriptor::operator ==(const BurstDescriptor& rhs) const - { - bool ivarsEqual = true; + if (!(_munition == rhs._munition)) ivarsEqual = false; + if (!(_warhead == rhs._warhead)) ivarsEqual = false; + if (!(_fuse == rhs._fuse)) ivarsEqual = false; + if (!(_quantity == rhs._quantity)) ivarsEqual = false; + if (!(_rate == rhs._rate)) ivarsEqual = false; - if( ! (_munition == rhs._munition) ) ivarsEqual = false; - if( ! (_warhead == rhs._warhead) ) ivarsEqual = false; - if( ! (_fuse == rhs._fuse) ) ivarsEqual = false; - if( ! (_quantity == rhs._quantity) ) ivarsEqual = false; - if( ! (_rate == rhs._rate) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int BurstDescriptor::getMarshalledSize() const -{ - int marshalSize = 0; +int BurstDescriptor::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _munition.getMarshalledSize(); // _munition - marshalSize = marshalSize + 2; // _warhead - marshalSize = marshalSize + 2; // _fuse - marshalSize = marshalSize + 2; // _quantity - marshalSize = marshalSize + 2; // _rate - return marshalSize; + marshalSize = marshalSize + _munition.getMarshalledSize(); // _munition + marshalSize = marshalSize + 2; // _warhead + marshalSize = marshalSize + 2; // _fuse + marshalSize = marshalSize + 2; // _quantity + marshalSize = marshalSize + 2; // _rate + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -132,7 +85,7 @@ int BurstDescriptor::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/BurstDescriptor.h b/src/dis6/BurstDescriptor.h index ad3bb22d..bc97b2b1 100644 --- a/src/dis6/BurstDescriptor.h +++ b/src/dis6/BurstDescriptor.h @@ -1,72 +1,70 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.2.7. Specifies the type of muntion fired, the type of warhead, the +// type of fuse, the number of rounds fired, and the rate at which the roudns +// are fired in rounds per minute. -namespace DIS -{ -// Section 5.2.7. Specifies the type of muntion fired, the type of warhead, the type of fuse, the number of rounds fired, and the rate at which the roudns are fired in rounds per minute. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT BurstDescriptor -{ -protected: +class OPENDIS6_EXPORT BurstDescriptor { + protected: /** What munition was used in the burst */ - EntityType _munition; + EntityType _munition; /** type of warhead */ - unsigned short _warhead; + unsigned short _warhead; /** type of fuse used */ - unsigned short _fuse; + unsigned short _fuse; /** how many of the munition were fired */ - unsigned short _quantity; + unsigned short _quantity; /** rate at which the munition was fired */ - unsigned short _rate; - + unsigned short _rate; public: - BurstDescriptor(); - virtual ~BurstDescriptor(); + BurstDescriptor(); + virtual ~BurstDescriptor(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getMunition(); - const EntityType& getMunition() const; - void setMunition(const EntityType &pX); + EntityType& getMunition(); + const EntityType& getMunition() const; + void setMunition(const EntityType& pX); - unsigned short getWarhead() const; - void setWarhead(unsigned short pX); + unsigned short getWarhead() const; + void setWarhead(unsigned short pX); - unsigned short getFuse() const; - void setFuse(unsigned short pX); + unsigned short getFuse() const; + void setFuse(unsigned short pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + unsigned short getQuantity() const; + void setQuantity(unsigned short pX); - unsigned short getRate() const; - void setRate(unsigned short pX); + unsigned short getRate() const; + void setRate(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const BurstDescriptor& rhs) const; + bool operator==(const BurstDescriptor& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -79,7 +77,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ClockTime.cpp b/src/dis6/ClockTime.cpp index 4ff70909..0a1c960c 100644 --- a/src/dis6/ClockTime.cpp +++ b/src/dis6/ClockTime.cpp @@ -2,74 +2,50 @@ using namespace DIS; +ClockTime::ClockTime() : _hour(0), _timePastHour(0) {} -ClockTime::ClockTime(): - _hour(0), - _timePastHour(0) -{ -} +ClockTime::~ClockTime() {} -ClockTime::~ClockTime() -{ -} +int ClockTime::getHour() const { return _hour; } -int ClockTime::getHour() const -{ - return _hour; -} +void ClockTime::setHour(int pX) { _hour = pX; } -void ClockTime::setHour(int pX) -{ - _hour = pX; -} +unsigned int ClockTime::getTimePastHour() const { return _timePastHour; } -unsigned int ClockTime::getTimePastHour() const -{ - return _timePastHour; -} +void ClockTime::setTimePastHour(unsigned int pX) { _timePastHour = pX; } -void ClockTime::setTimePastHour(unsigned int pX) -{ - _timePastHour = pX; +void ClockTime::marshal(DataStream& dataStream) const { + dataStream << _hour; + dataStream << _timePastHour; } -void ClockTime::marshal(DataStream& dataStream) const -{ - dataStream << _hour; - dataStream << _timePastHour; -} - -void ClockTime::unmarshal(DataStream& dataStream) -{ - dataStream >> _hour; - dataStream >> _timePastHour; +void ClockTime::unmarshal(DataStream& dataStream) { + dataStream >> _hour; + dataStream >> _timePastHour; } +bool ClockTime::operator==(const ClockTime& rhs) const { + bool ivarsEqual = true; -bool ClockTime::operator ==(const ClockTime& rhs) const - { - bool ivarsEqual = true; + if (!(_hour == rhs._hour)) ivarsEqual = false; + if (!(_timePastHour == rhs._timePastHour)) ivarsEqual = false; - if( ! (_hour == rhs._hour) ) ivarsEqual = false; - if( ! (_timePastHour == rhs._timePastHour) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ClockTime::getMarshalledSize() const -{ - int marshalSize = 0; +int ClockTime::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _hour - marshalSize = marshalSize + 4; // _timePastHour - return marshalSize; + marshalSize = marshalSize + 4; // _hour + marshalSize = marshalSize + 4; // _timePastHour + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int ClockTime::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ClockTime.h b/src/dis6/ClockTime.h index d574058c..c0d5d0b3 100644 --- a/src/dis6/ClockTime.h +++ b/src/dis6/ClockTime.h @@ -1,52 +1,49 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.8. Time measurements that exceed one hour. Hours is the number of +// hours since January 1, 1970, UTC -namespace DIS -{ -// Section 5.2.8. Time measurements that exceed one hour. Hours is the number of hours since January 1, 1970, UTC - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ClockTime -{ -protected: +class OPENDIS6_EXPORT ClockTime { + protected: /** Hours in UTC */ - int _hour; + int _hour; /** Time past the hour */ - unsigned int _timePastHour; - + unsigned int _timePastHour; public: - ClockTime(); - virtual ~ClockTime(); + ClockTime(); + virtual ~ClockTime(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - int getHour() const; - void setHour(int pX); + int getHour() const; + void setHour(int pX); - unsigned int getTimePastHour() const; - void setTimePastHour(unsigned int pX); + unsigned int getTimePastHour() const; + void setTimePastHour(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ClockTime& rhs) const; + bool operator==(const ClockTime& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +56,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CollisionElasticPdu.cpp b/src/dis6/CollisionElasticPdu.cpp index c23c1165..fab5bb6c 100644 --- a/src/dis6/CollisionElasticPdu.cpp +++ b/src/dis6/CollisionElasticPdu.cpp @@ -2,306 +2,258 @@ using namespace DIS; - -CollisionElasticPdu::CollisionElasticPdu() : EntityInformationFamilyPdu(), - _issuingEntityID(), - _collidingEntityID(), - _collisionEventID(), - _pad(0), - _contactVelocity(), - _mass(0.0), - _location(), - _collisionResultXX(0.0), - _collisionResultXY(0.0), - _collisionResultXZ(0.0), - _collisionResultYY(0.0), - _collisionResultYZ(0.0), - _collisionResultZZ(0.0), - _unitSurfaceNormal(), - _coefficientOfRestitution(0.0) -{ - setPduType( 66 ); - setProtocolFamily( 1 ); +CollisionElasticPdu::CollisionElasticPdu() + : EntityInformationFamilyPdu(), + _issuingEntityID(), + _collidingEntityID(), + _collisionEventID(), + _pad(0), + _contactVelocity(), + _mass(0.0), + _location(), + _collisionResultXX(0.0), + _collisionResultXY(0.0), + _collisionResultXZ(0.0), + _collisionResultYY(0.0), + _collisionResultYZ(0.0), + _collisionResultZZ(0.0), + _unitSurfaceNormal(), + _coefficientOfRestitution(0.0) { + setPduType(66); + setProtocolFamily(1); } -CollisionElasticPdu::~CollisionElasticPdu() -{ -} +CollisionElasticPdu::~CollisionElasticPdu() {} -EntityID& CollisionElasticPdu::getIssuingEntityID() -{ - return _issuingEntityID; -} +EntityID& CollisionElasticPdu::getIssuingEntityID() { return _issuingEntityID; } -const EntityID& CollisionElasticPdu::getIssuingEntityID() const -{ - return _issuingEntityID; +const EntityID& CollisionElasticPdu::getIssuingEntityID() const { + return _issuingEntityID; } -void CollisionElasticPdu::setIssuingEntityID(const EntityID &pX) -{ - _issuingEntityID = pX; +void CollisionElasticPdu::setIssuingEntityID(const EntityID& pX) { + _issuingEntityID = pX; } -EntityID& CollisionElasticPdu::getCollidingEntityID() -{ - return _collidingEntityID; +EntityID& CollisionElasticPdu::getCollidingEntityID() { + return _collidingEntityID; } -const EntityID& CollisionElasticPdu::getCollidingEntityID() const -{ - return _collidingEntityID; +const EntityID& CollisionElasticPdu::getCollidingEntityID() const { + return _collidingEntityID; } -void CollisionElasticPdu::setCollidingEntityID(const EntityID &pX) -{ - _collidingEntityID = pX; +void CollisionElasticPdu::setCollidingEntityID(const EntityID& pX) { + _collidingEntityID = pX; } -EventID& CollisionElasticPdu::getCollisionEventID() -{ - return _collisionEventID; +EventID& CollisionElasticPdu::getCollisionEventID() { + return _collisionEventID; } -const EventID& CollisionElasticPdu::getCollisionEventID() const -{ - return _collisionEventID; +const EventID& CollisionElasticPdu::getCollisionEventID() const { + return _collisionEventID; } -void CollisionElasticPdu::setCollisionEventID(const EventID &pX) -{ - _collisionEventID = pX; +void CollisionElasticPdu::setCollisionEventID(const EventID& pX) { + _collisionEventID = pX; } -short CollisionElasticPdu::getPad() const -{ - return _pad; -} +short CollisionElasticPdu::getPad() const { return _pad; } -void CollisionElasticPdu::setPad(short pX) -{ - _pad = pX; -} +void CollisionElasticPdu::setPad(short pX) { _pad = pX; } -Vector3Float& CollisionElasticPdu::getContactVelocity() -{ - return _contactVelocity; +Vector3Float& CollisionElasticPdu::getContactVelocity() { + return _contactVelocity; } -const Vector3Float& CollisionElasticPdu::getContactVelocity() const -{ - return _contactVelocity; +const Vector3Float& CollisionElasticPdu::getContactVelocity() const { + return _contactVelocity; } -void CollisionElasticPdu::setContactVelocity(const Vector3Float &pX) -{ - _contactVelocity = pX; +void CollisionElasticPdu::setContactVelocity(const Vector3Float& pX) { + _contactVelocity = pX; } -float CollisionElasticPdu::getMass() const -{ - return _mass; -} +float CollisionElasticPdu::getMass() const { return _mass; } -void CollisionElasticPdu::setMass(float pX) -{ - _mass = pX; -} +void CollisionElasticPdu::setMass(float pX) { _mass = pX; } -Vector3Float& CollisionElasticPdu::getLocation() -{ - return _location; -} +Vector3Float& CollisionElasticPdu::getLocation() { return _location; } -const Vector3Float& CollisionElasticPdu::getLocation() const -{ - return _location; +const Vector3Float& CollisionElasticPdu::getLocation() const { + return _location; } -void CollisionElasticPdu::setLocation(const Vector3Float &pX) -{ - _location = pX; +void CollisionElasticPdu::setLocation(const Vector3Float& pX) { + _location = pX; } -float CollisionElasticPdu::getCollisionResultXX() const -{ - return _collisionResultXX; +float CollisionElasticPdu::getCollisionResultXX() const { + return _collisionResultXX; } -void CollisionElasticPdu::setCollisionResultXX(float pX) -{ - _collisionResultXX = pX; +void CollisionElasticPdu::setCollisionResultXX(float pX) { + _collisionResultXX = pX; } -float CollisionElasticPdu::getCollisionResultXY() const -{ - return _collisionResultXY; +float CollisionElasticPdu::getCollisionResultXY() const { + return _collisionResultXY; } -void CollisionElasticPdu::setCollisionResultXY(float pX) -{ - _collisionResultXY = pX; +void CollisionElasticPdu::setCollisionResultXY(float pX) { + _collisionResultXY = pX; } -float CollisionElasticPdu::getCollisionResultXZ() const -{ - return _collisionResultXZ; +float CollisionElasticPdu::getCollisionResultXZ() const { + return _collisionResultXZ; } -void CollisionElasticPdu::setCollisionResultXZ(float pX) -{ - _collisionResultXZ = pX; +void CollisionElasticPdu::setCollisionResultXZ(float pX) { + _collisionResultXZ = pX; } -float CollisionElasticPdu::getCollisionResultYY() const -{ - return _collisionResultYY; +float CollisionElasticPdu::getCollisionResultYY() const { + return _collisionResultYY; } -void CollisionElasticPdu::setCollisionResultYY(float pX) -{ - _collisionResultYY = pX; +void CollisionElasticPdu::setCollisionResultYY(float pX) { + _collisionResultYY = pX; } -float CollisionElasticPdu::getCollisionResultYZ() const -{ - return _collisionResultYZ; +float CollisionElasticPdu::getCollisionResultYZ() const { + return _collisionResultYZ; } -void CollisionElasticPdu::setCollisionResultYZ(float pX) -{ - _collisionResultYZ = pX; +void CollisionElasticPdu::setCollisionResultYZ(float pX) { + _collisionResultYZ = pX; } -float CollisionElasticPdu::getCollisionResultZZ() const -{ - return _collisionResultZZ; +float CollisionElasticPdu::getCollisionResultZZ() const { + return _collisionResultZZ; } -void CollisionElasticPdu::setCollisionResultZZ(float pX) -{ - _collisionResultZZ = pX; +void CollisionElasticPdu::setCollisionResultZZ(float pX) { + _collisionResultZZ = pX; } -Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() -{ - return _unitSurfaceNormal; +Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() { + return _unitSurfaceNormal; } -const Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() const -{ - return _unitSurfaceNormal; +const Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() const { + return _unitSurfaceNormal; } -void CollisionElasticPdu::setUnitSurfaceNormal(const Vector3Float &pX) -{ - _unitSurfaceNormal = pX; +void CollisionElasticPdu::setUnitSurfaceNormal(const Vector3Float& pX) { + _unitSurfaceNormal = pX; } -float CollisionElasticPdu::getCoefficientOfRestitution() const -{ - return _coefficientOfRestitution; +float CollisionElasticPdu::getCoefficientOfRestitution() const { + return _coefficientOfRestitution; } -void CollisionElasticPdu::setCoefficientOfRestitution(float pX) -{ - _coefficientOfRestitution = pX; +void CollisionElasticPdu::setCoefficientOfRestitution(float pX) { + _coefficientOfRestitution = pX; } -void CollisionElasticPdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _issuingEntityID.marshal(dataStream); - _collidingEntityID.marshal(dataStream); - _collisionEventID.marshal(dataStream); - dataStream << _pad; - _contactVelocity.marshal(dataStream); - dataStream << _mass; - _location.marshal(dataStream); - dataStream << _collisionResultXX; - dataStream << _collisionResultXY; - dataStream << _collisionResultXZ; - dataStream << _collisionResultYY; - dataStream << _collisionResultYZ; - dataStream << _collisionResultZZ; - _unitSurfaceNormal.marshal(dataStream); - dataStream << _coefficientOfRestitution; +void CollisionElasticPdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _issuingEntityID.marshal(dataStream); + _collidingEntityID.marshal(dataStream); + _collisionEventID.marshal(dataStream); + dataStream << _pad; + _contactVelocity.marshal(dataStream); + dataStream << _mass; + _location.marshal(dataStream); + dataStream << _collisionResultXX; + dataStream << _collisionResultXY; + dataStream << _collisionResultXZ; + dataStream << _collisionResultYY; + dataStream << _collisionResultYZ; + dataStream << _collisionResultZZ; + _unitSurfaceNormal.marshal(dataStream); + dataStream << _coefficientOfRestitution; } -void CollisionElasticPdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _issuingEntityID.unmarshal(dataStream); - _collidingEntityID.unmarshal(dataStream); - _collisionEventID.unmarshal(dataStream); - dataStream >> _pad; - _contactVelocity.unmarshal(dataStream); - dataStream >> _mass; - _location.unmarshal(dataStream); - dataStream >> _collisionResultXX; - dataStream >> _collisionResultXY; - dataStream >> _collisionResultXZ; - dataStream >> _collisionResultYY; - dataStream >> _collisionResultYZ; - dataStream >> _collisionResultZZ; - _unitSurfaceNormal.unmarshal(dataStream); - dataStream >> _coefficientOfRestitution; +void CollisionElasticPdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _issuingEntityID.unmarshal(dataStream); + _collidingEntityID.unmarshal(dataStream); + _collisionEventID.unmarshal(dataStream); + dataStream >> _pad; + _contactVelocity.unmarshal(dataStream); + dataStream >> _mass; + _location.unmarshal(dataStream); + dataStream >> _collisionResultXX; + dataStream >> _collisionResultXY; + dataStream >> _collisionResultXZ; + dataStream >> _collisionResultYY; + dataStream >> _collisionResultYZ; + dataStream >> _collisionResultZZ; + _unitSurfaceNormal.unmarshal(dataStream); + dataStream >> _coefficientOfRestitution; } - -bool CollisionElasticPdu::operator ==(const CollisionElasticPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_issuingEntityID == rhs._issuingEntityID) ) ivarsEqual = false; - if( ! (_collidingEntityID == rhs._collidingEntityID) ) ivarsEqual = false; - if( ! (_collisionEventID == rhs._collisionEventID) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - if( ! (_contactVelocity == rhs._contactVelocity) ) ivarsEqual = false; - if( ! (_mass == rhs._mass) ) ivarsEqual = false; - if( ! (_location == rhs._location) ) ivarsEqual = false; - if( ! (_collisionResultXX == rhs._collisionResultXX) ) ivarsEqual = false; - if( ! (_collisionResultXY == rhs._collisionResultXY) ) ivarsEqual = false; - if( ! (_collisionResultXZ == rhs._collisionResultXZ) ) ivarsEqual = false; - if( ! (_collisionResultYY == rhs._collisionResultYY) ) ivarsEqual = false; - if( ! (_collisionResultYZ == rhs._collisionResultYZ) ) ivarsEqual = false; - if( ! (_collisionResultZZ == rhs._collisionResultZZ) ) ivarsEqual = false; - if( ! (_unitSurfaceNormal == rhs._unitSurfaceNormal) ) ivarsEqual = false; - if( ! (_coefficientOfRestitution == rhs._coefficientOfRestitution) ) ivarsEqual = false; - - return ivarsEqual; - } - -int CollisionElasticPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID - marshalSize = marshalSize + _collidingEntityID.getMarshalledSize(); // _collidingEntityID - marshalSize = marshalSize + _collisionEventID.getMarshalledSize(); // _collisionEventID - marshalSize = marshalSize + 2; // _pad - marshalSize = marshalSize + _contactVelocity.getMarshalledSize(); // _contactVelocity - marshalSize = marshalSize + 4; // _mass - marshalSize = marshalSize + _location.getMarshalledSize(); // _location - marshalSize = marshalSize + 4; // _collisionResultXX - marshalSize = marshalSize + 4; // _collisionResultXY - marshalSize = marshalSize + 4; // _collisionResultXZ - marshalSize = marshalSize + 4; // _collisionResultYY - marshalSize = marshalSize + 4; // _collisionResultYZ - marshalSize = marshalSize + 4; // _collisionResultZZ - marshalSize = marshalSize + _unitSurfaceNormal.getMarshalledSize(); // _unitSurfaceNormal - marshalSize = marshalSize + 4; // _coefficientOfRestitution - return marshalSize; +bool CollisionElasticPdu::operator==(const CollisionElasticPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + + if (!(_issuingEntityID == rhs._issuingEntityID)) ivarsEqual = false; + if (!(_collidingEntityID == rhs._collidingEntityID)) ivarsEqual = false; + if (!(_collisionEventID == rhs._collisionEventID)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + if (!(_contactVelocity == rhs._contactVelocity)) ivarsEqual = false; + if (!(_mass == rhs._mass)) ivarsEqual = false; + if (!(_location == rhs._location)) ivarsEqual = false; + if (!(_collisionResultXX == rhs._collisionResultXX)) ivarsEqual = false; + if (!(_collisionResultXY == rhs._collisionResultXY)) ivarsEqual = false; + if (!(_collisionResultXZ == rhs._collisionResultXZ)) ivarsEqual = false; + if (!(_collisionResultYY == rhs._collisionResultYY)) ivarsEqual = false; + if (!(_collisionResultYZ == rhs._collisionResultYZ)) ivarsEqual = false; + if (!(_collisionResultZZ == rhs._collisionResultZZ)) ivarsEqual = false; + if (!(_unitSurfaceNormal == rhs._unitSurfaceNormal)) ivarsEqual = false; + if (!(_coefficientOfRestitution == rhs._coefficientOfRestitution)) + ivarsEqual = false; + + return ivarsEqual; +} + +int CollisionElasticPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID + marshalSize = marshalSize + + _collidingEntityID.getMarshalledSize(); // _collidingEntityID + marshalSize = + marshalSize + _collisionEventID.getMarshalledSize(); // _collisionEventID + marshalSize = marshalSize + 2; // _pad + marshalSize = + marshalSize + _contactVelocity.getMarshalledSize(); // _contactVelocity + marshalSize = marshalSize + 4; // _mass + marshalSize = marshalSize + _location.getMarshalledSize(); // _location + marshalSize = marshalSize + 4; // _collisionResultXX + marshalSize = marshalSize + 4; // _collisionResultXY + marshalSize = marshalSize + 4; // _collisionResultXZ + marshalSize = marshalSize + 4; // _collisionResultYY + marshalSize = marshalSize + 4; // _collisionResultYZ + marshalSize = marshalSize + 4; // _collisionResultZZ + marshalSize = marshalSize + + _unitSurfaceNormal.getMarshalledSize(); // _unitSurfaceNormal + marshalSize = marshalSize + 4; // _coefficientOfRestitution + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -314,7 +266,7 @@ int CollisionElasticPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CollisionElasticPdu.h b/src/dis6/CollisionElasticPdu.h index 20f1eea3..d7938623 100644 --- a/src/dis6/CollisionElasticPdu.h +++ b/src/dis6/CollisionElasticPdu.h @@ -1,143 +1,140 @@ #pragma once #include -#include +#include #include #include -#include -#include -#include -#include #include +#include +namespace DIS { +// 5.3.3.3. Information about elastic collisions in a DIS exercise shall be +// communicated using a Collision-Elastic PDU. COMPLETE -namespace DIS -{ -// 5.3.3.3. Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu -{ -protected: +class OPENDIS6_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu { + protected: /** ID of the entity that issued the collision PDU */ - EntityID _issuingEntityID; + EntityID _issuingEntityID; /** ID of entity that has collided with the issuing entity ID */ - EntityID _collidingEntityID; + EntityID _collidingEntityID; /** ID of event */ - EventID _collisionEventID; + EventID _collisionEventID; /** some padding */ - short _pad; + short _pad; /** velocity at collision */ - Vector3Float _contactVelocity; + Vector3Float _contactVelocity; /** mass of issuing entity */ - float _mass; + float _mass; /** Location with respect to entity the issuing entity collided with */ - Vector3Float _location; + Vector3Float _location; /** tensor values */ - float _collisionResultXX; + float _collisionResultXX; /** tensor values */ - float _collisionResultXY; + float _collisionResultXY; /** tensor values */ - float _collisionResultXZ; + float _collisionResultXZ; /** tensor values */ - float _collisionResultYY; + float _collisionResultYY; /** tensor values */ - float _collisionResultYZ; + float _collisionResultYZ; /** tensor values */ - float _collisionResultZZ; - - /** This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. */ - Vector3Float _unitSurfaceNormal; + float _collisionResultZZ; - /** This field shall represent the degree to which energy is conserved in a collision */ - float _coefficientOfRestitution; + /** This record shall represent the normal vector to the surface at the point + * of collision detection. The surface normal shall be represented in world + * coordinates. */ + Vector3Float _unitSurfaceNormal; + /** This field shall represent the degree to which energy is conserved in a + * collision */ + float _coefficientOfRestitution; public: - CollisionElasticPdu(); - virtual ~CollisionElasticPdu(); + CollisionElasticPdu(); + virtual ~CollisionElasticPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getIssuingEntityID(); - const EntityID& getIssuingEntityID() const; - void setIssuingEntityID(const EntityID &pX); + EntityID& getIssuingEntityID(); + const EntityID& getIssuingEntityID() const; + void setIssuingEntityID(const EntityID& pX); - EntityID& getCollidingEntityID(); - const EntityID& getCollidingEntityID() const; - void setCollidingEntityID(const EntityID &pX); + EntityID& getCollidingEntityID(); + const EntityID& getCollidingEntityID() const; + void setCollidingEntityID(const EntityID& pX); - EventID& getCollisionEventID(); - const EventID& getCollisionEventID() const; - void setCollisionEventID(const EventID &pX); + EventID& getCollisionEventID(); + const EventID& getCollisionEventID() const; + void setCollisionEventID(const EventID& pX); - short getPad() const; - void setPad(short pX); + short getPad() const; + void setPad(short pX); - Vector3Float& getContactVelocity(); - const Vector3Float& getContactVelocity() const; - void setContactVelocity(const Vector3Float &pX); + Vector3Float& getContactVelocity(); + const Vector3Float& getContactVelocity() const; + void setContactVelocity(const Vector3Float& pX); - float getMass() const; - void setMass(float pX); + float getMass() const; + void setMass(float pX); - Vector3Float& getLocation(); - const Vector3Float& getLocation() const; - void setLocation(const Vector3Float &pX); + Vector3Float& getLocation(); + const Vector3Float& getLocation() const; + void setLocation(const Vector3Float& pX); - float getCollisionResultXX() const; - void setCollisionResultXX(float pX); + float getCollisionResultXX() const; + void setCollisionResultXX(float pX); - float getCollisionResultXY() const; - void setCollisionResultXY(float pX); + float getCollisionResultXY() const; + void setCollisionResultXY(float pX); - float getCollisionResultXZ() const; - void setCollisionResultXZ(float pX); + float getCollisionResultXZ() const; + void setCollisionResultXZ(float pX); - float getCollisionResultYY() const; - void setCollisionResultYY(float pX); + float getCollisionResultYY() const; + void setCollisionResultYY(float pX); - float getCollisionResultYZ() const; - void setCollisionResultYZ(float pX); + float getCollisionResultYZ() const; + void setCollisionResultYZ(float pX); - float getCollisionResultZZ() const; - void setCollisionResultZZ(float pX); + float getCollisionResultZZ() const; + void setCollisionResultZZ(float pX); - Vector3Float& getUnitSurfaceNormal(); - const Vector3Float& getUnitSurfaceNormal() const; - void setUnitSurfaceNormal(const Vector3Float &pX); + Vector3Float& getUnitSurfaceNormal(); + const Vector3Float& getUnitSurfaceNormal() const; + void setUnitSurfaceNormal(const Vector3Float& pX); - float getCoefficientOfRestitution() const; - void setCoefficientOfRestitution(float pX); + float getCoefficientOfRestitution() const; + void setCoefficientOfRestitution(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CollisionElasticPdu& rhs) const; + bool operator==(const CollisionElasticPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -150,7 +147,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CollisionPdu.cpp b/src/dis6/CollisionPdu.cpp index ad42ed13..0399ff20 100644 --- a/src/dis6/CollisionPdu.cpp +++ b/src/dis6/CollisionPdu.cpp @@ -2,196 +2,137 @@ using namespace DIS; - -CollisionPdu::CollisionPdu() : EntityInformationFamilyPdu(), - _issuingEntityID(), - _collidingEntityID(), - _eventID(), - _collisionType(0), - _pad(0), - _velocity(), - _mass(0.0), - _location() -{ - setPduType( 4 ); - setProtocolFamily( 1 ); +CollisionPdu::CollisionPdu() + : EntityInformationFamilyPdu(), + _issuingEntityID(), + _collidingEntityID(), + _eventID(), + _collisionType(0), + _pad(0), + _velocity(), + _mass(0.0), + _location() { + setPduType(4); + setProtocolFamily(1); } -CollisionPdu::~CollisionPdu() -{ -} +CollisionPdu::~CollisionPdu() {} -EntityID& CollisionPdu::getIssuingEntityID() -{ - return _issuingEntityID; -} +EntityID& CollisionPdu::getIssuingEntityID() { return _issuingEntityID; } -const EntityID& CollisionPdu::getIssuingEntityID() const -{ - return _issuingEntityID; +const EntityID& CollisionPdu::getIssuingEntityID() const { + return _issuingEntityID; } -void CollisionPdu::setIssuingEntityID(const EntityID &pX) -{ - _issuingEntityID = pX; +void CollisionPdu::setIssuingEntityID(const EntityID& pX) { + _issuingEntityID = pX; } -EntityID& CollisionPdu::getCollidingEntityID() -{ - return _collidingEntityID; -} +EntityID& CollisionPdu::getCollidingEntityID() { return _collidingEntityID; } -const EntityID& CollisionPdu::getCollidingEntityID() const -{ - return _collidingEntityID; +const EntityID& CollisionPdu::getCollidingEntityID() const { + return _collidingEntityID; } -void CollisionPdu::setCollidingEntityID(const EntityID &pX) -{ - _collidingEntityID = pX; +void CollisionPdu::setCollidingEntityID(const EntityID& pX) { + _collidingEntityID = pX; } -EventID& CollisionPdu::getEventID() -{ - return _eventID; -} +EventID& CollisionPdu::getEventID() { return _eventID; } -const EventID& CollisionPdu::getEventID() const -{ - return _eventID; -} +const EventID& CollisionPdu::getEventID() const { return _eventID; } -void CollisionPdu::setEventID(const EventID &pX) -{ - _eventID = pX; -} +void CollisionPdu::setEventID(const EventID& pX) { _eventID = pX; } -unsigned char CollisionPdu::getCollisionType() const -{ - return _collisionType; -} +unsigned char CollisionPdu::getCollisionType() const { return _collisionType; } -void CollisionPdu::setCollisionType(unsigned char pX) -{ - _collisionType = pX; -} +void CollisionPdu::setCollisionType(unsigned char pX) { _collisionType = pX; } -char CollisionPdu::getPad() const -{ - return _pad; -} +char CollisionPdu::getPad() const { return _pad; } -void CollisionPdu::setPad(char pX) -{ - _pad = pX; -} +void CollisionPdu::setPad(char pX) { _pad = pX; } -Vector3Float& CollisionPdu::getVelocity() -{ - return _velocity; -} +Vector3Float& CollisionPdu::getVelocity() { return _velocity; } -const Vector3Float& CollisionPdu::getVelocity() const -{ - return _velocity; -} +const Vector3Float& CollisionPdu::getVelocity() const { return _velocity; } -void CollisionPdu::setVelocity(const Vector3Float &pX) -{ - _velocity = pX; -} +void CollisionPdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -float CollisionPdu::getMass() const -{ - return _mass; -} +float CollisionPdu::getMass() const { return _mass; } -void CollisionPdu::setMass(float pX) -{ - _mass = pX; -} +void CollisionPdu::setMass(float pX) { _mass = pX; } -Vector3Float& CollisionPdu::getLocation() -{ - return _location; -} +Vector3Float& CollisionPdu::getLocation() { return _location; } -const Vector3Float& CollisionPdu::getLocation() const -{ - return _location; -} +const Vector3Float& CollisionPdu::getLocation() const { return _location; } + +void CollisionPdu::setLocation(const Vector3Float& pX) { _location = pX; } -void CollisionPdu::setLocation(const Vector3Float &pX) -{ - _location = pX; +void CollisionPdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _issuingEntityID.marshal(dataStream); + _collidingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _collisionType; + dataStream << _pad; + _velocity.marshal(dataStream); + dataStream << _mass; + _location.marshal(dataStream); } -void CollisionPdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _issuingEntityID.marshal(dataStream); - _collidingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _collisionType; - dataStream << _pad; - _velocity.marshal(dataStream); - dataStream << _mass; - _location.marshal(dataStream); +void CollisionPdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _issuingEntityID.unmarshal(dataStream); + _collidingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _collisionType; + dataStream >> _pad; + _velocity.unmarshal(dataStream); + dataStream >> _mass; + _location.unmarshal(dataStream); } -void CollisionPdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _issuingEntityID.unmarshal(dataStream); - _collidingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _collisionType; - dataStream >> _pad; - _velocity.unmarshal(dataStream); - dataStream >> _mass; - _location.unmarshal(dataStream); +bool CollisionPdu::operator==(const CollisionPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + + if (!(_issuingEntityID == rhs._issuingEntityID)) ivarsEqual = false; + if (!(_collidingEntityID == rhs._collidingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_collisionType == rhs._collisionType)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + if (!(_velocity == rhs._velocity)) ivarsEqual = false; + if (!(_mass == rhs._mass)) ivarsEqual = false; + if (!(_location == rhs._location)) ivarsEqual = false; + + return ivarsEqual; } +int CollisionPdu::getMarshalledSize() const { + int marshalSize = 0; -bool CollisionPdu::operator ==(const CollisionPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_issuingEntityID == rhs._issuingEntityID) ) ivarsEqual = false; - if( ! (_collidingEntityID == rhs._collidingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_collisionType == rhs._collisionType) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - if( ! (_velocity == rhs._velocity) ) ivarsEqual = false; - if( ! (_mass == rhs._mass) ) ivarsEqual = false; - if( ! (_location == rhs._location) ) ivarsEqual = false; - - return ivarsEqual; - } - -int CollisionPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID - marshalSize = marshalSize + _collidingEntityID.getMarshalledSize(); // _collidingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 1; // _collisionType - marshalSize = marshalSize + 1; // _pad - marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity - marshalSize = marshalSize + 4; // _mass - marshalSize = marshalSize + _location.getMarshalledSize(); // _location - return marshalSize; + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID + marshalSize = marshalSize + + _collidingEntityID.getMarshalledSize(); // _collidingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 1; // _collisionType + marshalSize = marshalSize + 1; // _pad + marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity + marshalSize = marshalSize + 4; // _mass + marshalSize = marshalSize + _location.getMarshalledSize(); // _location + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -204,7 +145,7 @@ int CollisionPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CollisionPdu.h b/src/dis6/CollisionPdu.h index fbcf91e1..74187a72 100644 --- a/src/dis6/CollisionPdu.h +++ b/src/dis6/CollisionPdu.h @@ -1,99 +1,93 @@ #pragma once #include -#include +#include #include #include -#include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.3.2. Information about a collision. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT CollisionPdu : public EntityInformationFamilyPdu -{ -protected: +class OPENDIS6_EXPORT CollisionPdu : public EntityInformationFamilyPdu { + protected: /** ID of the entity that issued the collision PDU */ - EntityID _issuingEntityID; + EntityID _issuingEntityID; /** ID of entity that has collided with the issuing entity ID */ - EntityID _collidingEntityID; + EntityID _collidingEntityID; /** ID of event */ - EventID _eventID; + EventID _eventID; /** ID of event */ - unsigned char _collisionType; + unsigned char _collisionType; /** some padding */ - char _pad; + char _pad; /** velocity at collision */ - Vector3Float _velocity; + Vector3Float _velocity; /** mass of issuing entity */ - float _mass; + float _mass; /** Location with respect to entity the issuing entity collided with */ - Vector3Float _location; - + Vector3Float _location; public: - CollisionPdu(); - virtual ~CollisionPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + CollisionPdu(); + virtual ~CollisionPdu(); - EntityID& getIssuingEntityID(); - const EntityID& getIssuingEntityID() const; - void setIssuingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getCollidingEntityID(); - const EntityID& getCollidingEntityID() const; - void setCollidingEntityID(const EntityID &pX); + EntityID& getIssuingEntityID(); + const EntityID& getIssuingEntityID() const; + void setIssuingEntityID(const EntityID& pX); - EventID& getEventID(); - const EventID& getEventID() const; - void setEventID(const EventID &pX); + EntityID& getCollidingEntityID(); + const EntityID& getCollidingEntityID() const; + void setCollidingEntityID(const EntityID& pX); - unsigned char getCollisionType() const; - void setCollisionType(unsigned char pX); + EventID& getEventID(); + const EventID& getEventID() const; + void setEventID(const EventID& pX); - char getPad() const; - void setPad(char pX); + unsigned char getCollisionType() const; + void setCollisionType(unsigned char pX); - Vector3Float& getVelocity(); - const Vector3Float& getVelocity() const; - void setVelocity(const Vector3Float &pX); + char getPad() const; + void setPad(char pX); - float getMass() const; - void setMass(float pX); + Vector3Float& getVelocity(); + const Vector3Float& getVelocity() const; + void setVelocity(const Vector3Float& pX); - Vector3Float& getLocation(); - const Vector3Float& getLocation() const; - void setLocation(const Vector3Float &pX); + float getMass() const; + void setMass(float pX); + Vector3Float& getLocation(); + const Vector3Float& getLocation() const; + void setLocation(const Vector3Float& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const CollisionPdu& rhs) const; + bool operator==(const CollisionPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -106,7 +100,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CommentPdu.cpp b/src/dis6/CommentPdu.cpp index c2b65de7..58a0e171 100644 --- a/src/dis6/CommentPdu.cpp +++ b/src/dis6/CommentPdu.cpp @@ -2,156 +2,127 @@ using namespace DIS; - -CommentPdu::CommentPdu() : SimulationManagementFamilyPdu(), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 22 ); +CommentPdu::CommentPdu() + : SimulationManagementFamilyPdu(), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(22); } -CommentPdu::~CommentPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +CommentPdu::~CommentPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int CommentPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int CommentPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int CommentPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int CommentPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& CommentPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& CommentPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& CommentPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& CommentPdu::getFixedDatums() const { + return _fixedDatums; } -void CommentPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void CommentPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& CommentPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& CommentPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& CommentPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& CommentPdu::getVariableDatums() const { + return _variableDatums; } -void CommentPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void CommentPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void CommentPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - +void CommentPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } + + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } -void CommentPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } +void CommentPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; + + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } + + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } } +bool CommentPdu::operator==(const CommentPdu& rhs) const { + bool ivarsEqual = true; -bool CommentPdu::operator ==(const CommentPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int CommentPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int CommentPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -164,7 +135,7 @@ int CommentPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CommentPdu.h b/src/dis6/CommentPdu.h index 88a71323..2692794e 100644 --- a/src/dis6/CommentPdu.h +++ b/src/dis6/CommentPdu.h @@ -1,68 +1,66 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.6.12. Arbitrary messages can be entered into the data stream via +// use of this PDU. COMPLETE -namespace DIS -{ -// Section 5.3.6.12. Arbitrary messages can be entered into the data stream via use of this PDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT CommentPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT CommentPdu : public SimulationManagementFamilyPdu { + protected: /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - CommentPdu(); - virtual ~CommentPdu(); + CommentPdu(); + virtual ~CommentPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CommentPdu& rhs) const; + bool operator==(const CommentPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -75,7 +73,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CommentReliablePdu.cpp b/src/dis6/CommentReliablePdu.cpp index 9ac41cae..30bc7c98 100644 --- a/src/dis6/CommentReliablePdu.cpp +++ b/src/dis6/CommentReliablePdu.cpp @@ -2,156 +2,136 @@ using namespace DIS; - -CommentReliablePdu::CommentReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 62 ); +CommentReliablePdu::CommentReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(62); } -CommentReliablePdu::~CommentReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +CommentReliablePdu::~CommentReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned int CommentReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int CommentReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int CommentReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int CommentReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& CommentReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& CommentReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& CommentReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& CommentReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void CommentReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void CommentReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& CommentReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& CommentReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& CommentReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& CommentReliablePdu::getVariableDatumRecords() + const { + return _variableDatumRecords; } -void CommentReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void CommentReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void CommentReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - +void CommentReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } + + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void CommentReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } - - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } +void CommentReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; + + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } + + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool CommentReliablePdu::operator==(const CommentReliablePdu& rhs) const { + bool ivarsEqual = true; -bool CommentReliablePdu::operator ==(const CommentReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int CommentReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int CommentReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -164,7 +144,7 @@ int CommentReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CommentReliablePdu.h b/src/dis6/CommentReliablePdu.h index 99f9dd95..3cef9bb3 100644 --- a/src/dis6/CommentReliablePdu.h +++ b/src/dis6/CommentReliablePdu.h @@ -1,68 +1,67 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual +// intervention to fix padding in variable datums. UNFINISHED -namespace DIS -{ -// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual intervention to fix padding in variable datums. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT CommentReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT CommentReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - CommentReliablePdu(); - virtual ~CommentReliablePdu(); + CommentReliablePdu(); + virtual ~CommentReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CommentReliablePdu& rhs) const; + bool operator==(const CommentReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -75,7 +74,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CreateEntityPdu.cpp b/src/dis6/CreateEntityPdu.cpp index e93f9193..707c119f 100644 --- a/src/dis6/CreateEntityPdu.cpp +++ b/src/dis6/CreateEntityPdu.cpp @@ -2,65 +2,52 @@ using namespace DIS; - -CreateEntityPdu::CreateEntityPdu() : SimulationManagementFamilyPdu(), - _requestID(0) -{ - setPduType( 11 ); +CreateEntityPdu::CreateEntityPdu() + : SimulationManagementFamilyPdu(), _requestID(0) { + setPduType(11); } -CreateEntityPdu::~CreateEntityPdu() -{ -} +CreateEntityPdu::~CreateEntityPdu() {} -unsigned int CreateEntityPdu::getRequestID() const -{ - return _requestID; -} +unsigned int CreateEntityPdu::getRequestID() const { return _requestID; } -void CreateEntityPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void CreateEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } -void CreateEntityPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; +void CreateEntityPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; } -void CreateEntityPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; +void CreateEntityPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; } +bool CreateEntityPdu::operator==(const CreateEntityPdu& rhs) const { + bool ivarsEqual = true; -bool CreateEntityPdu::operator ==(const CreateEntityPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int CreateEntityPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int CreateEntityPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -73,7 +60,7 @@ int CreateEntityPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CreateEntityPdu.h b/src/dis6/CreateEntityPdu.h index 5b9d1bb7..3a67398a 100644 --- a/src/dis6/CreateEntityPdu.h +++ b/src/dis6/CreateEntityPdu.h @@ -1,47 +1,43 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.6.1. Create a new entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for the request */ - unsigned int _requestID; - + unsigned int _requestID; public: - CreateEntityPdu(); - virtual ~CreateEntityPdu(); + CreateEntityPdu(); + virtual ~CreateEntityPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CreateEntityPdu& rhs) const; + bool operator==(const CreateEntityPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CreateEntityReliablePdu.cpp b/src/dis6/CreateEntityReliablePdu.cpp index 59f97e84..b51f6582 100644 --- a/src/dis6/CreateEntityReliablePdu.cpp +++ b/src/dis6/CreateEntityReliablePdu.cpp @@ -2,110 +2,89 @@ using namespace DIS; - -CreateEntityReliablePdu::CreateEntityReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0) -{ - setPduType( 51 ); +CreateEntityReliablePdu::CreateEntityReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0) { + setPduType(51); } -CreateEntityReliablePdu::~CreateEntityReliablePdu() -{ -} +CreateEntityReliablePdu::~CreateEntityReliablePdu() {} -unsigned char CreateEntityReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char CreateEntityReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void CreateEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void CreateEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short CreateEntityReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short CreateEntityReliablePdu::getPad1() const { return _pad1; } -void CreateEntityReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void CreateEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char CreateEntityReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char CreateEntityReliablePdu::getPad2() const { return _pad2; } -void CreateEntityReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void CreateEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int CreateEntityReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int CreateEntityReliablePdu::getRequestID() const { + return _requestID; } -void CreateEntityReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void CreateEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void CreateEntityReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; +void CreateEntityReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; } -void CreateEntityReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; +void CreateEntityReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; } +bool CreateEntityReliablePdu::operator==( + const CreateEntityReliablePdu& rhs) const { + bool ivarsEqual = true; -bool CreateEntityReliablePdu::operator ==(const CreateEntityReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int CreateEntityReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int CreateEntityReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -118,7 +97,7 @@ int CreateEntityReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/CreateEntityReliablePdu.h b/src/dis6/CreateEntityReliablePdu.h index fc10141d..e19e59b5 100644 --- a/src/dis6/CreateEntityReliablePdu.h +++ b/src/dis6/CreateEntityReliablePdu.h @@ -1,65 +1,62 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.1: creation of an entity , reliable. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT CreateEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT CreateEntityReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - CreateEntityReliablePdu(); - virtual ~CreateEntityReliablePdu(); + CreateEntityReliablePdu(); + virtual ~CreateEntityReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CreateEntityReliablePdu& rhs) const; + bool operator==(const CreateEntityReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -72,7 +69,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataPdu.cpp b/src/dis6/DataPdu.cpp index a4660e12..3401a430 100644 --- a/src/dis6/DataPdu.cpp +++ b/src/dis6/DataPdu.cpp @@ -2,186 +2,146 @@ using namespace DIS; - -DataPdu::DataPdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _padding1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 20 ); +DataPdu::DataPdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _padding1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(20); } -DataPdu::~DataPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +DataPdu::~DataPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int DataPdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataPdu::getRequestID() const { return _requestID; } -void DataPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int DataPdu::getPadding1() const -{ - return _padding1; -} +unsigned int DataPdu::getPadding1() const { return _padding1; } -void DataPdu::setPadding1(unsigned int pX) -{ - _padding1 = pX; -} +void DataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } -unsigned int DataPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int DataPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int DataPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int DataPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& DataPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& DataPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& DataPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& DataPdu::getFixedDatums() const { + return _fixedDatums; } -void DataPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void DataPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& DataPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& DataPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& DataPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& DataPdu::getVariableDatums() const { + return _variableDatums; } -void DataPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void DataPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void DataPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _padding1; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void DataPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _padding1; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void DataPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _padding1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void DataPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _padding1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool DataPdu::operator ==(const DataPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool DataPdu::operator==(const DataPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int DataPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _padding1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int DataPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _padding1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +154,7 @@ int DataPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataPdu.h b/src/dis6/DataPdu.h index f9496f93..e3b44e85 100644 --- a/src/dis6/DataPdu.h +++ b/src/dis6/DataPdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.6.10. Information issued in response to a data query pdu or a set +// data pdu is communicated using a data pdu. COMPLETE -namespace DIS -{ -// Section 5.3.6.10. Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DataPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT DataPdu : public SimulationManagementFamilyPdu { + protected: /** ID of request */ - unsigned int _requestID; + unsigned int _requestID; /** padding */ - unsigned int _padding1; + unsigned int _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - DataPdu(); - virtual ~DataPdu(); + DataPdu(); + virtual ~DataPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + unsigned int getPadding1() const; + void setPadding1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataPdu& rhs) const; + bool operator==(const DataPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataQueryPdu.cpp b/src/dis6/DataQueryPdu.cpp index 1e9494f1..bac5c22b 100644 --- a/src/dis6/DataQueryPdu.cpp +++ b/src/dis6/DataQueryPdu.cpp @@ -2,186 +2,146 @@ using namespace DIS; - -DataQueryPdu::DataQueryPdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _timeInterval(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 18 ); +DataQueryPdu::DataQueryPdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _timeInterval(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(18); } -DataQueryPdu::~DataQueryPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +DataQueryPdu::~DataQueryPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int DataQueryPdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataQueryPdu::getRequestID() const { return _requestID; } -void DataQueryPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataQueryPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int DataQueryPdu::getTimeInterval() const -{ - return _timeInterval; -} +unsigned int DataQueryPdu::getTimeInterval() const { return _timeInterval; } -void DataQueryPdu::setTimeInterval(unsigned int pX) -{ - _timeInterval = pX; -} +void DataQueryPdu::setTimeInterval(unsigned int pX) { _timeInterval = pX; } -unsigned int DataQueryPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int DataQueryPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int DataQueryPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int DataQueryPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& DataQueryPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& DataQueryPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& DataQueryPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& DataQueryPdu::getFixedDatums() const { + return _fixedDatums; } -void DataQueryPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void DataQueryPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& DataQueryPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& DataQueryPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& DataQueryPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& DataQueryPdu::getVariableDatums() const { + return _variableDatums; } -void DataQueryPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void DataQueryPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void DataQueryPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _timeInterval; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void DataQueryPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _timeInterval; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void DataQueryPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _timeInterval; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void DataQueryPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _timeInterval; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool DataQueryPdu::operator ==(const DataQueryPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_timeInterval == rhs._timeInterval) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool DataQueryPdu::operator==(const DataQueryPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_timeInterval == rhs._timeInterval)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int DataQueryPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _timeInterval - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int DataQueryPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _timeInterval + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +154,7 @@ int DataQueryPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataQueryPdu.h b/src/dis6/DataQueryPdu.h index 766953c4..8e2c8a75 100644 --- a/src/dis6/DataQueryPdu.h +++ b/src/dis6/DataQueryPdu.h @@ -1,80 +1,77 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.6.8. Request for data from an entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu { + protected: /** ID of request */ - unsigned int _requestID; + unsigned int _requestID; /** time issues between issues of Data PDUs. Zero means send once only. */ - unsigned int _timeInterval; + unsigned int _timeInterval; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - DataQueryPdu(); - virtual ~DataQueryPdu(); + DataQueryPdu(); + virtual ~DataQueryPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + unsigned int getTimeInterval() const; + void setTimeInterval(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataQueryPdu& rhs) const; + bool operator==(const DataQueryPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataQueryReliablePdu.cpp b/src/dis6/DataQueryReliablePdu.cpp index a83aa79b..96235d45 100644 --- a/src/dis6/DataQueryReliablePdu.cpp +++ b/src/dis6/DataQueryReliablePdu.cpp @@ -2,231 +2,191 @@ using namespace DIS; - -DataQueryReliablePdu::DataQueryReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0), - _timeInterval(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 58 ); +DataQueryReliablePdu::DataQueryReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0), + _timeInterval(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(58); } -DataQueryReliablePdu::~DataQueryReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +DataQueryReliablePdu::~DataQueryReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned char DataQueryReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char DataQueryReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void DataQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void DataQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short DataQueryReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short DataQueryReliablePdu::getPad1() const { return _pad1; } -void DataQueryReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void DataQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char DataQueryReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char DataQueryReliablePdu::getPad2() const { return _pad2; } -void DataQueryReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void DataQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int DataQueryReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataQueryReliablePdu::getRequestID() const { return _requestID; } -void DataQueryReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int DataQueryReliablePdu::getTimeInterval() const -{ - return _timeInterval; +unsigned int DataQueryReliablePdu::getTimeInterval() const { + return _timeInterval; } -void DataQueryReliablePdu::setTimeInterval(unsigned int pX) -{ - _timeInterval = pX; +void DataQueryReliablePdu::setTimeInterval(unsigned int pX) { + _timeInterval = pX; } -unsigned int DataQueryReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int DataQueryReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int DataQueryReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int DataQueryReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& DataQueryReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& DataQueryReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& DataQueryReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& DataQueryReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void DataQueryReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void DataQueryReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& DataQueryReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& DataQueryReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& DataQueryReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +DataQueryReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void DataQueryReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void DataQueryReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void DataQueryReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; - dataStream << _timeInterval; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); +void DataQueryReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; + dataStream << _timeInterval; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void DataQueryReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; - dataStream >> _timeInterval; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void DataQueryReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; + dataStream >> _timeInterval; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool DataQueryReliablePdu::operator==(const DataQueryReliablePdu& rhs) const { + bool ivarsEqual = true; -bool DataQueryReliablePdu::operator ==(const DataQueryReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_timeInterval == rhs._timeInterval) ) ivarsEqual = false; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_timeInterval == rhs._timeInterval)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int DataQueryReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _timeInterval - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int DataQueryReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _timeInterval + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - return marshalSize; + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -239,7 +199,7 @@ int DataQueryReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataQueryReliablePdu.h b/src/dis6/DataQueryReliablePdu.h index d58623f4..73627f76 100644 --- a/src/dis6/DataQueryReliablePdu.h +++ b/src/dis6/DataQueryReliablePdu.h @@ -1,98 +1,96 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.8: request for data from an entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DataQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT DataQueryReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** time interval between issuing data query PDUs */ - unsigned int _timeInterval; + unsigned int _timeInterval; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - DataQueryReliablePdu(); - virtual ~DataQueryReliablePdu(); + DataQueryReliablePdu(); + virtual ~DataQueryReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + unsigned int getTimeInterval() const; + void setTimeInterval(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataQueryReliablePdu& rhs) const; + bool operator==(const DataQueryReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +103,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataReliablePdu.cpp b/src/dis6/DataReliablePdu.cpp index 06dbc00e..cea57e15 100644 --- a/src/dis6/DataReliablePdu.cpp +++ b/src/dis6/DataReliablePdu.cpp @@ -2,216 +2,176 @@ using namespace DIS; - -DataReliablePdu::DataReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requestID(0), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 60 ); +DataReliablePdu::DataReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requestID(0), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(60); } -DataReliablePdu::~DataReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +DataReliablePdu::~DataReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned int DataReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataReliablePdu::getRequestID() const { return _requestID; } -void DataReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned char DataReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char DataReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void DataReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void DataReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short DataReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short DataReliablePdu::getPad1() const { return _pad1; } -void DataReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void DataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char DataReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char DataReliablePdu::getPad2() const { return _pad2; } -void DataReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void DataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int DataReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int DataReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int DataReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int DataReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& DataReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& DataReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& DataReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& DataReliablePdu::getFixedDatumRecords() const { + return _fixedDatumRecords; } -void DataReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void DataReliablePdu::setFixedDatumRecords(const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& DataReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& DataReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& DataReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& DataReliablePdu::getVariableDatumRecords() + const { + return _variableDatumRecords; } -void DataReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void DataReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void DataReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void DataReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void DataReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void DataReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool DataReliablePdu::operator==(const DataReliablePdu& rhs) const { + bool ivarsEqual = true; -bool DataReliablePdu::operator ==(const DataReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } - -int DataReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int DataReliablePdu::getMarshalledSize() const { + int marshalSize = 0; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -224,7 +184,7 @@ int DataReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DataReliablePdu.h b/src/dis6/DataReliablePdu.h index e0787314..64c2756d 100644 --- a/src/dis6/DataReliablePdu.h +++ b/src/dis6/DataReliablePdu.h @@ -1,92 +1,91 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. +// Needs manual intervention to fix padding on variable datums. UNFINSIHED -namespace DIS -{ -// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. Needs manual intervention to fix padding on variable datums. UNFINSIHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT DataReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** Request ID */ - unsigned int _requestID; + unsigned int _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - DataReliablePdu(); - virtual ~DataReliablePdu(); + DataReliablePdu(); + virtual ~DataReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataReliablePdu& rhs) const; + bool operator==(const DataReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -99,7 +98,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DeadReckoningParameter.cpp b/src/dis6/DeadReckoningParameter.cpp index fbf89020..b213588a 100644 --- a/src/dis6/DeadReckoningParameter.cpp +++ b/src/dis6/DeadReckoningParameter.cpp @@ -2,142 +2,126 @@ using namespace DIS; - -DeadReckoningParameter::DeadReckoningParameter(): - _deadReckoningAlgorithm(0), - _entityLinearAcceleration(), - _entityAngularVelocity() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 15; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +DeadReckoningParameter::DeadReckoningParameter() + : _deadReckoningAlgorithm(0), + _entityLinearAcceleration(), + _entityAngularVelocity() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 15; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -DeadReckoningParameter::~DeadReckoningParameter() -{ -} +DeadReckoningParameter::~DeadReckoningParameter() {} -unsigned char DeadReckoningParameter::getDeadReckoningAlgorithm() const -{ - return _deadReckoningAlgorithm; +unsigned char DeadReckoningParameter::getDeadReckoningAlgorithm() const { + return _deadReckoningAlgorithm; } -void DeadReckoningParameter::setDeadReckoningAlgorithm(unsigned char pX) -{ - _deadReckoningAlgorithm = pX; +void DeadReckoningParameter::setDeadReckoningAlgorithm(unsigned char pX) { + _deadReckoningAlgorithm = pX; } -char* DeadReckoningParameter::getOtherParameters() -{ - return _otherParameters; -} +char* DeadReckoningParameter::getOtherParameters() { return _otherParameters; } -const char* DeadReckoningParameter::getOtherParameters() const -{ - return _otherParameters; +const char* DeadReckoningParameter::getOtherParameters() const { + return _otherParameters; } -void DeadReckoningParameter::setOtherParameters(const char* x) -{ - for(int i = 0; i < 15; i++) - { - _otherParameters[i] = x[i]; - } +void DeadReckoningParameter::setOtherParameters(const char* x) { + for (int i = 0; i < 15; i++) { + _otherParameters[i] = x[i]; + } } -Vector3Float& DeadReckoningParameter::getEntityLinearAcceleration() -{ - return _entityLinearAcceleration; +Vector3Float& DeadReckoningParameter::getEntityLinearAcceleration() { + return _entityLinearAcceleration; } -const Vector3Float& DeadReckoningParameter::getEntityLinearAcceleration() const -{ - return _entityLinearAcceleration; +const Vector3Float& DeadReckoningParameter::getEntityLinearAcceleration() + const { + return _entityLinearAcceleration; } -void DeadReckoningParameter::setEntityLinearAcceleration(const Vector3Float &pX) -{ - _entityLinearAcceleration = pX; +void DeadReckoningParameter::setEntityLinearAcceleration( + const Vector3Float& pX) { + _entityLinearAcceleration = pX; } -Vector3Float& DeadReckoningParameter::getEntityAngularVelocity() -{ - return _entityAngularVelocity; +Vector3Float& DeadReckoningParameter::getEntityAngularVelocity() { + return _entityAngularVelocity; } -const Vector3Float& DeadReckoningParameter::getEntityAngularVelocity() const -{ - return _entityAngularVelocity; +const Vector3Float& DeadReckoningParameter::getEntityAngularVelocity() const { + return _entityAngularVelocity; } -void DeadReckoningParameter::setEntityAngularVelocity(const Vector3Float &pX) -{ - _entityAngularVelocity = pX; +void DeadReckoningParameter::setEntityAngularVelocity(const Vector3Float& pX) { + _entityAngularVelocity = pX; } -void DeadReckoningParameter::marshal(DataStream& dataStream) const -{ - dataStream << _deadReckoningAlgorithm; +void DeadReckoningParameter::marshal(DataStream& dataStream) const { + dataStream << _deadReckoningAlgorithm; - for(size_t idx = 0; idx < 15; idx++) - { - dataStream << _otherParameters[idx]; - } + for (size_t idx = 0; idx < 15; idx++) { + dataStream << _otherParameters[idx]; + } - _entityLinearAcceleration.marshal(dataStream); - _entityAngularVelocity.marshal(dataStream); + _entityLinearAcceleration.marshal(dataStream); + _entityAngularVelocity.marshal(dataStream); } -void DeadReckoningParameter::unmarshal(DataStream& dataStream) -{ - dataStream >> _deadReckoningAlgorithm; +void DeadReckoningParameter::unmarshal(DataStream& dataStream) { + dataStream >> _deadReckoningAlgorithm; - for(size_t idx = 0; idx < 15; idx++) - { - dataStream >> _otherParameters[idx]; - } + for (size_t idx = 0; idx < 15; idx++) { + dataStream >> _otherParameters[idx]; + } - _entityLinearAcceleration.unmarshal(dataStream); - _entityAngularVelocity.unmarshal(dataStream); + _entityLinearAcceleration.unmarshal(dataStream); + _entityAngularVelocity.unmarshal(dataStream); } +bool DeadReckoningParameter::operator==( + const DeadReckoningParameter& rhs) const { + bool ivarsEqual = true; -bool DeadReckoningParameter::operator ==(const DeadReckoningParameter& rhs) const - { - bool ivarsEqual = true; - - if( ! (_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm) ) ivarsEqual = false; + if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) + ivarsEqual = false; - for(unsigned char idx = 0; idx < 15; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } + for (unsigned char idx = 0; idx < 15; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - if( ! (_entityLinearAcceleration == rhs._entityLinearAcceleration) ) ivarsEqual = false; - if( ! (_entityAngularVelocity == rhs._entityAngularVelocity) ) ivarsEqual = false; + if (!(_entityLinearAcceleration == rhs._entityLinearAcceleration)) + ivarsEqual = false; + if (!(_entityAngularVelocity == rhs._entityAngularVelocity)) + ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int DeadReckoningParameter::getMarshalledSize() const -{ - int marshalSize = 0; +int DeadReckoningParameter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _deadReckoningAlgorithm - marshalSize = marshalSize + 15 * 1; // _otherParameters - marshalSize = marshalSize + _entityLinearAcceleration.getMarshalledSize(); // _entityLinearAcceleration - marshalSize = marshalSize + _entityAngularVelocity.getMarshalledSize(); // _entityAngularVelocity - return marshalSize; + marshalSize = marshalSize + 1; // _deadReckoningAlgorithm + marshalSize = marshalSize + 15 * 1; // _otherParameters + marshalSize = + marshalSize + _entityLinearAcceleration + .getMarshalledSize(); // _entityLinearAcceleration + marshalSize = + marshalSize + + _entityAngularVelocity.getMarshalledSize(); // _entityAngularVelocity + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -150,7 +134,7 @@ int DeadReckoningParameter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DeadReckoningParameter.h b/src/dis6/DeadReckoningParameter.h index 379d4462..f975a986 100644 --- a/src/dis6/DeadReckoningParameter.h +++ b/src/dis6/DeadReckoningParameter.h @@ -1,69 +1,64 @@ #pragma once #include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // represents values used in dead reckoning algorithms -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DeadReckoningParameter -{ -protected: +class OPENDIS6_EXPORT DeadReckoningParameter { + protected: /** enumeration of what dead reckoning algorighm to use */ - unsigned char _deadReckoningAlgorithm; + unsigned char _deadReckoningAlgorithm; /** other parameters to use in the dead reckoning algorithm */ - char _otherParameters[15]; + char _otherParameters[15]; /** Linear acceleration of the entity */ - Vector3Float _entityLinearAcceleration; + Vector3Float _entityLinearAcceleration; /** angular velocity of the entity */ - Vector3Float _entityAngularVelocity; - + Vector3Float _entityAngularVelocity; public: - DeadReckoningParameter(); - virtual ~DeadReckoningParameter(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DeadReckoningParameter(); + virtual ~DeadReckoningParameter(); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + unsigned char getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(unsigned char pX); - Vector3Float& getEntityLinearAcceleration(); - const Vector3Float& getEntityLinearAcceleration() const; - void setEntityLinearAcceleration(const Vector3Float &pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); - Vector3Float& getEntityAngularVelocity(); - const Vector3Float& getEntityAngularVelocity() const; - void setEntityAngularVelocity(const Vector3Float &pX); + Vector3Float& getEntityLinearAcceleration(); + const Vector3Float& getEntityLinearAcceleration() const; + void setEntityLinearAcceleration(const Vector3Float& pX); + Vector3Float& getEntityAngularVelocity(); + const Vector3Float& getEntityAngularVelocity() const; + void setEntityAngularVelocity(const Vector3Float& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DeadReckoningParameter& rhs) const; + bool operator==(const DeadReckoningParameter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -76,7 +71,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DesignatorPdu.cpp b/src/dis6/DesignatorPdu.cpp index 07d2d667..c48ea022 100644 --- a/src/dis6/DesignatorPdu.cpp +++ b/src/dis6/DesignatorPdu.cpp @@ -2,255 +2,215 @@ using namespace DIS; - -DesignatorPdu::DesignatorPdu() : DistributedEmissionsFamilyPdu(), - _designatingEntityID(), - _codeName(0), - _designatedEntityID(), - _designatorCode(0), - _designatorPower(0.0), - _designatorWavelength(0.0), - _designatorSpotWrtDesignated(), - _designatorSpotLocation(), - _deadReckoningAlgorithm(0), - _padding1(0), - _padding2(0), - _entityLinearAcceleration() -{ - setPduType( 24 ); +DesignatorPdu::DesignatorPdu() + : DistributedEmissionsFamilyPdu(), + _designatingEntityID(), + _codeName(0), + _designatedEntityID(), + _designatorCode(0), + _designatorPower(0.0), + _designatorWavelength(0.0), + _designatorSpotWrtDesignated(), + _designatorSpotLocation(), + _deadReckoningAlgorithm(0), + _padding1(0), + _padding2(0), + _entityLinearAcceleration() { + setPduType(24); } -DesignatorPdu::~DesignatorPdu() -{ -} +DesignatorPdu::~DesignatorPdu() {} -EntityID& DesignatorPdu::getDesignatingEntityID() -{ - return _designatingEntityID; +EntityID& DesignatorPdu::getDesignatingEntityID() { + return _designatingEntityID; } -const EntityID& DesignatorPdu::getDesignatingEntityID() const -{ - return _designatingEntityID; +const EntityID& DesignatorPdu::getDesignatingEntityID() const { + return _designatingEntityID; } -void DesignatorPdu::setDesignatingEntityID(const EntityID &pX) -{ - _designatingEntityID = pX; +void DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { + _designatingEntityID = pX; } -unsigned short DesignatorPdu::getCodeName() const -{ - return _codeName; -} +unsigned short DesignatorPdu::getCodeName() const { return _codeName; } -void DesignatorPdu::setCodeName(unsigned short pX) -{ - _codeName = pX; -} +void DesignatorPdu::setCodeName(unsigned short pX) { _codeName = pX; } -EntityID& DesignatorPdu::getDesignatedEntityID() -{ - return _designatedEntityID; -} +EntityID& DesignatorPdu::getDesignatedEntityID() { return _designatedEntityID; } -const EntityID& DesignatorPdu::getDesignatedEntityID() const -{ - return _designatedEntityID; +const EntityID& DesignatorPdu::getDesignatedEntityID() const { + return _designatedEntityID; } -void DesignatorPdu::setDesignatedEntityID(const EntityID &pX) -{ - _designatedEntityID = pX; +void DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { + _designatedEntityID = pX; } -unsigned short DesignatorPdu::getDesignatorCode() const -{ - return _designatorCode; +unsigned short DesignatorPdu::getDesignatorCode() const { + return _designatorCode; } -void DesignatorPdu::setDesignatorCode(unsigned short pX) -{ - _designatorCode = pX; +void DesignatorPdu::setDesignatorCode(unsigned short pX) { + _designatorCode = pX; } -float DesignatorPdu::getDesignatorPower() const -{ - return _designatorPower; -} +float DesignatorPdu::getDesignatorPower() const { return _designatorPower; } -void DesignatorPdu::setDesignatorPower(float pX) -{ - _designatorPower = pX; -} +void DesignatorPdu::setDesignatorPower(float pX) { _designatorPower = pX; } -float DesignatorPdu::getDesignatorWavelength() const -{ - return _designatorWavelength; +float DesignatorPdu::getDesignatorWavelength() const { + return _designatorWavelength; } -void DesignatorPdu::setDesignatorWavelength(float pX) -{ - _designatorWavelength = pX; +void DesignatorPdu::setDesignatorWavelength(float pX) { + _designatorWavelength = pX; } -Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() -{ - return _designatorSpotWrtDesignated; +Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() { + return _designatorSpotWrtDesignated; } -const Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() const -{ - return _designatorSpotWrtDesignated; +const Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() const { + return _designatorSpotWrtDesignated; } -void DesignatorPdu::setDesignatorSpotWrtDesignated(const Vector3Float &pX) -{ - _designatorSpotWrtDesignated = pX; +void DesignatorPdu::setDesignatorSpotWrtDesignated(const Vector3Float& pX) { + _designatorSpotWrtDesignated = pX; } -Vector3Double& DesignatorPdu::getDesignatorSpotLocation() -{ - return _designatorSpotLocation; +Vector3Double& DesignatorPdu::getDesignatorSpotLocation() { + return _designatorSpotLocation; } -const Vector3Double& DesignatorPdu::getDesignatorSpotLocation() const -{ - return _designatorSpotLocation; +const Vector3Double& DesignatorPdu::getDesignatorSpotLocation() const { + return _designatorSpotLocation; } -void DesignatorPdu::setDesignatorSpotLocation(const Vector3Double &pX) -{ - _designatorSpotLocation = pX; +void DesignatorPdu::setDesignatorSpotLocation(const Vector3Double& pX) { + _designatorSpotLocation = pX; } -char DesignatorPdu::getDeadReckoningAlgorithm() const -{ - return _deadReckoningAlgorithm; +char DesignatorPdu::getDeadReckoningAlgorithm() const { + return _deadReckoningAlgorithm; } -void DesignatorPdu::setDeadReckoningAlgorithm(char pX) -{ - _deadReckoningAlgorithm = pX; +void DesignatorPdu::setDeadReckoningAlgorithm(char pX) { + _deadReckoningAlgorithm = pX; } -unsigned short DesignatorPdu::getPadding1() const -{ - return _padding1; -} +unsigned short DesignatorPdu::getPadding1() const { return _padding1; } -void DesignatorPdu::setPadding1(unsigned short pX) -{ - _padding1 = pX; -} +void DesignatorPdu::setPadding1(unsigned short pX) { _padding1 = pX; } -char DesignatorPdu::getPadding2() const -{ - return _padding2; -} +char DesignatorPdu::getPadding2() const { return _padding2; } + +void DesignatorPdu::setPadding2(char pX) { _padding2 = pX; } -void DesignatorPdu::setPadding2(char pX) -{ - _padding2 = pX; +Vector3Float& DesignatorPdu::getEntityLinearAcceleration() { + return _entityLinearAcceleration; } -Vector3Float& DesignatorPdu::getEntityLinearAcceleration() -{ - return _entityLinearAcceleration; +const Vector3Float& DesignatorPdu::getEntityLinearAcceleration() const { + return _entityLinearAcceleration; } -const Vector3Float& DesignatorPdu::getEntityLinearAcceleration() const -{ - return _entityLinearAcceleration; +void DesignatorPdu::setEntityLinearAcceleration(const Vector3Float& pX) { + _entityLinearAcceleration = pX; } -void DesignatorPdu::setEntityLinearAcceleration(const Vector3Float &pX) -{ - _entityLinearAcceleration = pX; +void DesignatorPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _designatingEntityID.marshal(dataStream); + dataStream << _codeName; + _designatedEntityID.marshal(dataStream); + dataStream << _designatorCode; + dataStream << _designatorPower; + dataStream << _designatorWavelength; + _designatorSpotWrtDesignated.marshal(dataStream); + _designatorSpotLocation.marshal(dataStream); + dataStream << _deadReckoningAlgorithm; + dataStream << _padding1; + dataStream << _padding2; + _entityLinearAcceleration.marshal(dataStream); } -void DesignatorPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _designatingEntityID.marshal(dataStream); - dataStream << _codeName; - _designatedEntityID.marshal(dataStream); - dataStream << _designatorCode; - dataStream << _designatorPower; - dataStream << _designatorWavelength; - _designatorSpotWrtDesignated.marshal(dataStream); - _designatorSpotLocation.marshal(dataStream); - dataStream << _deadReckoningAlgorithm; - dataStream << _padding1; - dataStream << _padding2; - _entityLinearAcceleration.marshal(dataStream); +void DesignatorPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _designatingEntityID.unmarshal(dataStream); + dataStream >> _codeName; + _designatedEntityID.unmarshal(dataStream); + dataStream >> _designatorCode; + dataStream >> _designatorPower; + dataStream >> _designatorWavelength; + _designatorSpotWrtDesignated.unmarshal(dataStream); + _designatorSpotLocation.unmarshal(dataStream); + dataStream >> _deadReckoningAlgorithm; + dataStream >> _padding1; + dataStream >> _padding2; + _entityLinearAcceleration.unmarshal(dataStream); } -void DesignatorPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _designatingEntityID.unmarshal(dataStream); - dataStream >> _codeName; - _designatedEntityID.unmarshal(dataStream); - dataStream >> _designatorCode; - dataStream >> _designatorPower; - dataStream >> _designatorWavelength; - _designatorSpotWrtDesignated.unmarshal(dataStream); - _designatorSpotLocation.unmarshal(dataStream); - dataStream >> _deadReckoningAlgorithm; - dataStream >> _padding1; - dataStream >> _padding2; - _entityLinearAcceleration.unmarshal(dataStream); +bool DesignatorPdu::operator==(const DesignatorPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); + + if (!(_designatingEntityID == rhs._designatingEntityID)) ivarsEqual = false; + if (!(_codeName == rhs._codeName)) ivarsEqual = false; + if (!(_designatedEntityID == rhs._designatedEntityID)) ivarsEqual = false; + if (!(_designatorCode == rhs._designatorCode)) ivarsEqual = false; + if (!(_designatorPower == rhs._designatorPower)) ivarsEqual = false; + if (!(_designatorWavelength == rhs._designatorWavelength)) ivarsEqual = false; + if (!(_designatorSpotWrtDesignated == rhs._designatorSpotWrtDesignated)) + ivarsEqual = false; + if (!(_designatorSpotLocation == rhs._designatorSpotLocation)) + ivarsEqual = false; + if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) + ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_entityLinearAcceleration == rhs._entityLinearAcceleration)) + ivarsEqual = false; + + return ivarsEqual; } +int DesignatorPdu::getMarshalledSize() const { + int marshalSize = 0; -bool DesignatorPdu::operator ==(const DesignatorPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - - if( ! (_designatingEntityID == rhs._designatingEntityID) ) ivarsEqual = false; - if( ! (_codeName == rhs._codeName) ) ivarsEqual = false; - if( ! (_designatedEntityID == rhs._designatedEntityID) ) ivarsEqual = false; - if( ! (_designatorCode == rhs._designatorCode) ) ivarsEqual = false; - if( ! (_designatorPower == rhs._designatorPower) ) ivarsEqual = false; - if( ! (_designatorWavelength == rhs._designatorWavelength) ) ivarsEqual = false; - if( ! (_designatorSpotWrtDesignated == rhs._designatorSpotWrtDesignated) ) ivarsEqual = false; - if( ! (_designatorSpotLocation == rhs._designatorSpotLocation) ) ivarsEqual = false; - if( ! (_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_entityLinearAcceleration == rhs._entityLinearAcceleration) ) ivarsEqual = false; - - return ivarsEqual; - } - -int DesignatorPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _designatingEntityID.getMarshalledSize(); // _designatingEntityID - marshalSize = marshalSize + 2; // _codeName - marshalSize = marshalSize + _designatedEntityID.getMarshalledSize(); // _designatedEntityID - marshalSize = marshalSize + 2; // _designatorCode - marshalSize = marshalSize + 4; // _designatorPower - marshalSize = marshalSize + 4; // _designatorWavelength - marshalSize = marshalSize + _designatorSpotWrtDesignated.getMarshalledSize(); // _designatorSpotWrtDesignated - marshalSize = marshalSize + _designatorSpotLocation.getMarshalledSize(); // _designatorSpotLocation - marshalSize = marshalSize + 1; // _deadReckoningAlgorithm - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - marshalSize = marshalSize + _entityLinearAcceleration.getMarshalledSize(); // _entityLinearAcceleration - return marshalSize; + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + + _designatingEntityID.getMarshalledSize(); // _designatingEntityID + marshalSize = marshalSize + 2; // _codeName + marshalSize = marshalSize + + _designatedEntityID.getMarshalledSize(); // _designatedEntityID + marshalSize = marshalSize + 2; // _designatorCode + marshalSize = marshalSize + 4; // _designatorPower + marshalSize = marshalSize + 4; // _designatorWavelength + marshalSize = + marshalSize + _designatorSpotWrtDesignated + .getMarshalledSize(); // _designatorSpotWrtDesignated + marshalSize = + marshalSize + + _designatorSpotLocation.getMarshalledSize(); // _designatorSpotLocation + marshalSize = marshalSize + 1; // _deadReckoningAlgorithm + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 + marshalSize = + marshalSize + _entityLinearAcceleration + .getMarshalledSize(); // _entityLinearAcceleration + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -263,7 +223,7 @@ int DesignatorPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DesignatorPdu.h b/src/dis6/DesignatorPdu.h index b421773b..84887ab3 100644 --- a/src/dis6/DesignatorPdu.h +++ b/src/dis6/DesignatorPdu.h @@ -1,123 +1,120 @@ #pragma once +#include #include -#include -#include #include #include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.7.2. Handles designating operations. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity designating */ - EntityID _designatingEntityID; + EntityID _designatingEntityID; - /** This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system. */ - unsigned short _codeName; + /** This field shall specify a unique emitter database number assigned to + * differentiate between otherwise similar or identical emitter beams within + * an emitter system. */ + unsigned short _codeName; /** ID of the entity being designated */ - EntityID _designatedEntityID; + EntityID _designatedEntityID; - /** This field shall identify the designator code being used by the designating entity */ - unsigned short _designatorCode; + /** This field shall identify the designator code being used by the + * designating entity */ + unsigned short _designatorCode; /** This field shall identify the designator output power in watts */ - float _designatorPower; + float _designatorPower; /** This field shall identify the designator wavelength in units of microns */ - float _designatorWavelength; + float _designatorWavelength; /** designtor spot wrt the designated entity */ - Vector3Float _designatorSpotWrtDesignated; + Vector3Float _designatorSpotWrtDesignated; /** designtor spot wrt the designated entity */ - Vector3Double _designatorSpotLocation; + Vector3Double _designatorSpotLocation; /** Dead reckoning algorithm */ - char _deadReckoningAlgorithm; + char _deadReckoningAlgorithm; /** padding */ - unsigned short _padding1; + unsigned short _padding1; /** padding */ - char _padding2; + char _padding2; /** linear accelleration of entity */ - Vector3Float _entityLinearAcceleration; - + Vector3Float _entityLinearAcceleration; public: - DesignatorPdu(); - virtual ~DesignatorPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DesignatorPdu(); + virtual ~DesignatorPdu(); - EntityID& getDesignatingEntityID(); - const EntityID& getDesignatingEntityID() const; - void setDesignatingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getCodeName() const; - void setCodeName(unsigned short pX); + EntityID& getDesignatingEntityID(); + const EntityID& getDesignatingEntityID() const; + void setDesignatingEntityID(const EntityID& pX); - EntityID& getDesignatedEntityID(); - const EntityID& getDesignatedEntityID() const; - void setDesignatedEntityID(const EntityID &pX); + unsigned short getCodeName() const; + void setCodeName(unsigned short pX); - unsigned short getDesignatorCode() const; - void setDesignatorCode(unsigned short pX); + EntityID& getDesignatedEntityID(); + const EntityID& getDesignatedEntityID() const; + void setDesignatedEntityID(const EntityID& pX); - float getDesignatorPower() const; - void setDesignatorPower(float pX); + unsigned short getDesignatorCode() const; + void setDesignatorCode(unsigned short pX); - float getDesignatorWavelength() const; - void setDesignatorWavelength(float pX); + float getDesignatorPower() const; + void setDesignatorPower(float pX); - Vector3Float& getDesignatorSpotWrtDesignated(); - const Vector3Float& getDesignatorSpotWrtDesignated() const; - void setDesignatorSpotWrtDesignated(const Vector3Float &pX); + float getDesignatorWavelength() const; + void setDesignatorWavelength(float pX); - Vector3Double& getDesignatorSpotLocation(); - const Vector3Double& getDesignatorSpotLocation() const; - void setDesignatorSpotLocation(const Vector3Double &pX); + Vector3Float& getDesignatorSpotWrtDesignated(); + const Vector3Float& getDesignatorSpotWrtDesignated() const; + void setDesignatorSpotWrtDesignated(const Vector3Float& pX); - char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(char pX); + Vector3Double& getDesignatorSpotLocation(); + const Vector3Double& getDesignatorSpotLocation() const; + void setDesignatorSpotLocation(const Vector3Double& pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + char getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(char pX); - char getPadding2() const; - void setPadding2(char pX); + unsigned short getPadding1() const; + void setPadding1(unsigned short pX); - Vector3Float& getEntityLinearAcceleration(); - const Vector3Float& getEntityLinearAcceleration() const; - void setEntityLinearAcceleration(const Vector3Float &pX); + char getPadding2() const; + void setPadding2(char pX); + Vector3Float& getEntityLinearAcceleration(); + const Vector3Float& getEntityLinearAcceleration() const; + void setEntityLinearAcceleration(const Vector3Float& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DesignatorPdu& rhs) const; + bool operator==(const DesignatorPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -130,7 +127,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DetonationPdu.cpp b/src/dis6/DetonationPdu.cpp index 12d25f41..e1dba5ac 100644 --- a/src/dis6/DetonationPdu.cpp +++ b/src/dis6/DetonationPdu.cpp @@ -2,253 +2,203 @@ using namespace DIS; - -DetonationPdu::DetonationPdu() : WarfareFamilyPdu(), - _munitionID(), - _eventID(), - _velocity(), - _locationInWorldCoordinates(), - _burstDescriptor(), - _locationInEntityCoordinates(), - _detonationResult(0), - _numberOfArticulationParameters(0), - _pad(0) -{ - setPduType( 3 ); +DetonationPdu::DetonationPdu() + : WarfareFamilyPdu(), + _munitionID(), + _eventID(), + _velocity(), + _locationInWorldCoordinates(), + _burstDescriptor(), + _locationInEntityCoordinates(), + _detonationResult(0), + _numberOfArticulationParameters(0), + _pad(0) { + setPduType(3); } -DetonationPdu::~DetonationPdu() -{ - _articulationParameters.clear(); -} +DetonationPdu::~DetonationPdu() { _articulationParameters.clear(); } -EntityID& DetonationPdu::getMunitionID() -{ - return _munitionID; -} +EntityID& DetonationPdu::getMunitionID() { return _munitionID; } -const EntityID& DetonationPdu::getMunitionID() const -{ - return _munitionID; -} +const EntityID& DetonationPdu::getMunitionID() const { return _munitionID; } -void DetonationPdu::setMunitionID(const EntityID &pX) -{ - _munitionID = pX; -} +void DetonationPdu::setMunitionID(const EntityID& pX) { _munitionID = pX; } -EventID& DetonationPdu::getEventID() -{ - return _eventID; -} +EventID& DetonationPdu::getEventID() { return _eventID; } -const EventID& DetonationPdu::getEventID() const -{ - return _eventID; -} +const EventID& DetonationPdu::getEventID() const { return _eventID; } -void DetonationPdu::setEventID(const EventID &pX) -{ - _eventID = pX; -} +void DetonationPdu::setEventID(const EventID& pX) { _eventID = pX; } -Vector3Float& DetonationPdu::getVelocity() -{ - return _velocity; -} +Vector3Float& DetonationPdu::getVelocity() { return _velocity; } -const Vector3Float& DetonationPdu::getVelocity() const -{ - return _velocity; -} +const Vector3Float& DetonationPdu::getVelocity() const { return _velocity; } -void DetonationPdu::setVelocity(const Vector3Float &pX) -{ - _velocity = pX; -} +void DetonationPdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -Vector3Double& DetonationPdu::getLocationInWorldCoordinates() -{ - return _locationInWorldCoordinates; +Vector3Double& DetonationPdu::getLocationInWorldCoordinates() { + return _locationInWorldCoordinates; } -const Vector3Double& DetonationPdu::getLocationInWorldCoordinates() const -{ - return _locationInWorldCoordinates; +const Vector3Double& DetonationPdu::getLocationInWorldCoordinates() const { + return _locationInWorldCoordinates; } -void DetonationPdu::setLocationInWorldCoordinates(const Vector3Double &pX) -{ - _locationInWorldCoordinates = pX; +void DetonationPdu::setLocationInWorldCoordinates(const Vector3Double& pX) { + _locationInWorldCoordinates = pX; } -BurstDescriptor& DetonationPdu::getBurstDescriptor() -{ - return _burstDescriptor; +BurstDescriptor& DetonationPdu::getBurstDescriptor() { + return _burstDescriptor; } -const BurstDescriptor& DetonationPdu::getBurstDescriptor() const -{ - return _burstDescriptor; +const BurstDescriptor& DetonationPdu::getBurstDescriptor() const { + return _burstDescriptor; } -void DetonationPdu::setBurstDescriptor(const BurstDescriptor &pX) -{ - _burstDescriptor = pX; +void DetonationPdu::setBurstDescriptor(const BurstDescriptor& pX) { + _burstDescriptor = pX; } -Vector3Float& DetonationPdu::getLocationInEntityCoordinates() -{ - return _locationInEntityCoordinates; +Vector3Float& DetonationPdu::getLocationInEntityCoordinates() { + return _locationInEntityCoordinates; } -const Vector3Float& DetonationPdu::getLocationInEntityCoordinates() const -{ - return _locationInEntityCoordinates; +const Vector3Float& DetonationPdu::getLocationInEntityCoordinates() const { + return _locationInEntityCoordinates; } -void DetonationPdu::setLocationInEntityCoordinates(const Vector3Float &pX) -{ - _locationInEntityCoordinates = pX; +void DetonationPdu::setLocationInEntityCoordinates(const Vector3Float& pX) { + _locationInEntityCoordinates = pX; } -unsigned char DetonationPdu::getDetonationResult() const -{ - return _detonationResult; +unsigned char DetonationPdu::getDetonationResult() const { + return _detonationResult; } -void DetonationPdu::setDetonationResult(unsigned char pX) -{ - _detonationResult = pX; +void DetonationPdu::setDetonationResult(unsigned char pX) { + _detonationResult = pX; } -unsigned char DetonationPdu::getNumberOfArticulationParameters() const -{ - return _articulationParameters.size(); +unsigned char DetonationPdu::getNumberOfArticulationParameters() const { + return _articulationParameters.size(); } -short DetonationPdu::getPad() const -{ - return _pad; -} +short DetonationPdu::getPad() const { return _pad; } -void DetonationPdu::setPad(short pX) -{ - _pad = pX; +void DetonationPdu::setPad(short pX) { _pad = pX; } + +std::vector& DetonationPdu::getArticulationParameters() { + return _articulationParameters; } -std::vector& DetonationPdu::getArticulationParameters() -{ - return _articulationParameters; +const std::vector& +DetonationPdu::getArticulationParameters() const { + return _articulationParameters; } -const std::vector& DetonationPdu::getArticulationParameters() const -{ - return _articulationParameters; +void DetonationPdu::setArticulationParameters( + const std::vector& pX) { + _articulationParameters = pX; } -void DetonationPdu::setArticulationParameters(const std::vector& pX) -{ - _articulationParameters = pX; +void DetonationPdu::marshal(DataStream& dataStream) const { + WarfareFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _munitionID.marshal(dataStream); + _eventID.marshal(dataStream); + _velocity.marshal(dataStream); + _locationInWorldCoordinates.marshal(dataStream); + _burstDescriptor.marshal(dataStream); + _locationInEntityCoordinates.marshal(dataStream); + dataStream << _detonationResult; + dataStream << (unsigned char)_articulationParameters.size(); + dataStream << _pad; + + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + ArticulationParameter x = _articulationParameters[idx]; + x.marshal(dataStream); + } } -void DetonationPdu::marshal(DataStream& dataStream) const -{ - WarfareFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _munitionID.marshal(dataStream); - _eventID.marshal(dataStream); - _velocity.marshal(dataStream); - _locationInWorldCoordinates.marshal(dataStream); - _burstDescriptor.marshal(dataStream); - _locationInEntityCoordinates.marshal(dataStream); - dataStream << _detonationResult; - dataStream << ( unsigned char )_articulationParameters.size(); - dataStream << _pad; - - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter x = _articulationParameters[idx]; - x.marshal(dataStream); - } +void DetonationPdu::unmarshal(DataStream& dataStream) { + WarfareFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _munitionID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + _velocity.unmarshal(dataStream); + _locationInWorldCoordinates.unmarshal(dataStream); + _burstDescriptor.unmarshal(dataStream); + _locationInEntityCoordinates.unmarshal(dataStream); + dataStream >> _detonationResult; + dataStream >> _numberOfArticulationParameters; + dataStream >> _pad; + _articulationParameters.clear(); + for (size_t idx = 0; idx < _numberOfArticulationParameters; idx++) { + ArticulationParameter x; + x.unmarshal(dataStream); + _articulationParameters.push_back(x); + } } -void DetonationPdu::unmarshal(DataStream& dataStream) -{ - WarfareFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _munitionID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - _velocity.unmarshal(dataStream); - _locationInWorldCoordinates.unmarshal(dataStream); - _burstDescriptor.unmarshal(dataStream); - _locationInEntityCoordinates.unmarshal(dataStream); - dataStream >> _detonationResult; - dataStream >> _numberOfArticulationParameters; - dataStream >> _pad; - - _articulationParameters.clear(); - for(size_t idx = 0; idx < _numberOfArticulationParameters; idx++) - { - ArticulationParameter x; - x.unmarshal(dataStream); - _articulationParameters.push_back(x); - } +bool DetonationPdu::operator==(const DetonationPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = WarfareFamilyPdu::operator==(rhs); + + if (!(_munitionID == rhs._munitionID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_velocity == rhs._velocity)) ivarsEqual = false; + if (!(_locationInWorldCoordinates == rhs._locationInWorldCoordinates)) + ivarsEqual = false; + if (!(_burstDescriptor == rhs._burstDescriptor)) ivarsEqual = false; + if (!(_locationInEntityCoordinates == rhs._locationInEntityCoordinates)) + ivarsEqual = false; + if (!(_detonationResult == rhs._detonationResult)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + if (!(_articulationParameters[idx] == rhs._articulationParameters[idx])) + ivarsEqual = false; + } + + return ivarsEqual; } +int DetonationPdu::getMarshalledSize() const { + int marshalSize = 0; -bool DetonationPdu::operator ==(const DetonationPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = WarfareFamilyPdu::operator==(rhs); - - if( ! (_munitionID == rhs._munitionID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_velocity == rhs._velocity) ) ivarsEqual = false; - if( ! (_locationInWorldCoordinates == rhs._locationInWorldCoordinates) ) ivarsEqual = false; - if( ! (_burstDescriptor == rhs._burstDescriptor) ) ivarsEqual = false; - if( ! (_locationInEntityCoordinates == rhs._locationInEntityCoordinates) ) ivarsEqual = false; - if( ! (_detonationResult == rhs._detonationResult) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - if( ! ( _articulationParameters[idx] == rhs._articulationParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int DetonationPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = WarfareFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _munitionID.getMarshalledSize(); // _munitionID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity - marshalSize = marshalSize + _locationInWorldCoordinates.getMarshalledSize(); // _locationInWorldCoordinates - marshalSize = marshalSize + _burstDescriptor.getMarshalledSize(); // _burstDescriptor - marshalSize = marshalSize + _locationInEntityCoordinates.getMarshalledSize(); // _locationInEntityCoordinates - marshalSize = marshalSize + 1; // _detonationResult - marshalSize = marshalSize + 1; // _numberOfArticulationParameters - marshalSize = marshalSize + 2; // _pad - - for(unsigned long long idx=0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter listElement = _articulationParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + marshalSize = WarfareFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _munitionID.getMarshalledSize(); // _munitionID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity + marshalSize = + marshalSize + _locationInWorldCoordinates + .getMarshalledSize(); // _locationInWorldCoordinates + marshalSize = + marshalSize + _burstDescriptor.getMarshalledSize(); // _burstDescriptor + marshalSize = + marshalSize + _locationInEntityCoordinates + .getMarshalledSize(); // _locationInEntityCoordinates + marshalSize = marshalSize + 1; // _detonationResult + marshalSize = marshalSize + 1; // _numberOfArticulationParameters + marshalSize = marshalSize + 2; // _pad + + for (unsigned long long idx = 0; idx < _articulationParameters.size(); + idx++) { + ArticulationParameter listElement = _articulationParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -261,7 +211,7 @@ int DetonationPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DetonationPdu.h b/src/dis6/DetonationPdu.h index d22282e9..cbd9e782 100644 --- a/src/dis6/DetonationPdu.h +++ b/src/dis6/DetonationPdu.h @@ -1,114 +1,111 @@ #pragma once +#include + +#include +#include #include #include -#include #include -#include #include -#include -#include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.4.2. Information about stuff exploding. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DetonationPdu : public WarfareFamilyPdu -{ -protected: +class OPENDIS6_EXPORT DetonationPdu : public WarfareFamilyPdu { + protected: /** ID of muntion that was fired */ - EntityID _munitionID; + EntityID _munitionID; /** ID firing event */ - EventID _eventID; + EventID _eventID; /** ID firing event */ - Vector3Float _velocity; + Vector3Float _velocity; /** where the detonation is, in world coordinates */ - Vector3Double _locationInWorldCoordinates; + Vector3Double _locationInWorldCoordinates; /** Describes munition used */ - BurstDescriptor _burstDescriptor; + BurstDescriptor _burstDescriptor; - /** location of the detonation or impact in the target entity's coordinate system. This information should be used for damage assessment. */ - Vector3Float _locationInEntityCoordinates; + /** location of the detonation or impact in the target entity's coordinate + * system. This information should be used for damage assessment. */ + Vector3Float _locationInEntityCoordinates; /** result of the explosion */ - unsigned char _detonationResult; + unsigned char _detonationResult; /** How many articulation parameters we have */ - unsigned char _numberOfArticulationParameters; + unsigned char _numberOfArticulationParameters; /** padding */ - short _pad; - - std::vector _articulationParameters; + short _pad; + std::vector _articulationParameters; public: - DetonationPdu(); - virtual ~DetonationPdu(); + DetonationPdu(); + virtual ~DetonationPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getMunitionID(); - const EntityID& getMunitionID() const; - void setMunitionID(const EntityID &pX); + EntityID& getMunitionID(); + const EntityID& getMunitionID() const; + void setMunitionID(const EntityID& pX); - EventID& getEventID(); - const EventID& getEventID() const; - void setEventID(const EventID &pX); + EventID& getEventID(); + const EventID& getEventID() const; + void setEventID(const EventID& pX); - Vector3Float& getVelocity(); - const Vector3Float& getVelocity() const; - void setVelocity(const Vector3Float &pX); + Vector3Float& getVelocity(); + const Vector3Float& getVelocity() const; + void setVelocity(const Vector3Float& pX); - Vector3Double& getLocationInWorldCoordinates(); - const Vector3Double& getLocationInWorldCoordinates() const; - void setLocationInWorldCoordinates(const Vector3Double &pX); + Vector3Double& getLocationInWorldCoordinates(); + const Vector3Double& getLocationInWorldCoordinates() const; + void setLocationInWorldCoordinates(const Vector3Double& pX); - BurstDescriptor& getBurstDescriptor(); - const BurstDescriptor& getBurstDescriptor() const; - void setBurstDescriptor(const BurstDescriptor &pX); + BurstDescriptor& getBurstDescriptor(); + const BurstDescriptor& getBurstDescriptor() const; + void setBurstDescriptor(const BurstDescriptor& pX); - Vector3Float& getLocationInEntityCoordinates(); - const Vector3Float& getLocationInEntityCoordinates() const; - void setLocationInEntityCoordinates(const Vector3Float &pX); + Vector3Float& getLocationInEntityCoordinates(); + const Vector3Float& getLocationInEntityCoordinates() const; + void setLocationInEntityCoordinates(const Vector3Float& pX); - unsigned char getDetonationResult() const; - void setDetonationResult(unsigned char pX); + unsigned char getDetonationResult() const; + void setDetonationResult(unsigned char pX); - unsigned char getNumberOfArticulationParameters() const; + unsigned char getNumberOfArticulationParameters() const; - short getPad() const; - void setPad(short pX); + short getPad() const; + void setPad(short pX); - std::vector& getArticulationParameters(); - const std::vector& getArticulationParameters() const; - void setArticulationParameters(const std::vector& pX); + std::vector& getArticulationParameters(); + const std::vector& getArticulationParameters() const; + void setArticulationParameters(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DetonationPdu& rhs) const; + bool operator==(const DetonationPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -121,7 +118,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DistributedEmissionsFamilyPdu.cpp b/src/dis6/DistributedEmissionsFamilyPdu.cpp index bc52fd59..7d5c659a 100644 --- a/src/dis6/DistributedEmissionsFamilyPdu.cpp +++ b/src/dis6/DistributedEmissionsFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -DistributedEmissionsFamilyPdu::DistributedEmissionsFamilyPdu() : Pdu() +DistributedEmissionsFamilyPdu::DistributedEmissionsFamilyPdu() + : Pdu() { - setProtocolFamily( 6 ); + setProtocolFamily(6); } -DistributedEmissionsFamilyPdu::~DistributedEmissionsFamilyPdu() -{ -} +DistributedEmissionsFamilyPdu::~DistributedEmissionsFamilyPdu() {} -void DistributedEmissionsFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void DistributedEmissionsFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void DistributedEmissionsFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void DistributedEmissionsFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool DistributedEmissionsFamilyPdu::operator==( + const DistributedEmissionsFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool DistributedEmissionsFamilyPdu::operator ==(const DistributedEmissionsFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int DistributedEmissionsFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int DistributedEmissionsFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int DistributedEmissionsFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/DistributedEmissionsFamilyPdu.h b/src/dis6/DistributedEmissionsFamilyPdu.h index ac7de425..ab6b1af3 100644 --- a/src/dis6/DistributedEmissionsFamilyPdu.h +++ b/src/dis6/DistributedEmissionsFamilyPdu.h @@ -1,41 +1,38 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.7. Electromagnetic Emissions. Abstract superclass for distirubted +// emissions PDU -namespace DIS -{ -// Section 5.3.7. Electromagnetic Emissions. Abstract superclass for distirubted emissions PDU - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT DistributedEmissionsFamilyPdu : public Pdu -{ -protected: - +class OPENDIS6_EXPORT DistributedEmissionsFamilyPdu : public Pdu { + protected: public: - DistributedEmissionsFamilyPdu(); - virtual ~DistributedEmissionsFamilyPdu(); + DistributedEmissionsFamilyPdu(); + virtual ~DistributedEmissionsFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DistributedEmissionsFamilyPdu& rhs) const; + bool operator==(const DistributedEmissionsFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +45,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EightByteChunk.cpp b/src/dis6/EightByteChunk.cpp index 88aaaf0c..7cd5f71b 100644 --- a/src/dis6/EightByteChunk.cpp +++ b/src/dis6/EightByteChunk.cpp @@ -2,87 +2,63 @@ using namespace DIS; - -EightByteChunk::EightByteChunk() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 8; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +EightByteChunk::EightByteChunk() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 8; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -EightByteChunk::~EightByteChunk() -{ -} +EightByteChunk::~EightByteChunk() {} -char* EightByteChunk::getOtherParameters() -{ - return _otherParameters; -} +char* EightByteChunk::getOtherParameters() { return _otherParameters; } -const char* EightByteChunk::getOtherParameters() const -{ - return _otherParameters; +const char* EightByteChunk::getOtherParameters() const { + return _otherParameters; } -void EightByteChunk::setOtherParameters(const char* x) -{ - for(int i = 0; i < 8; i++) - { - _otherParameters[i] = x[i]; - } +void EightByteChunk::setOtherParameters(const char* x) { + for (int i = 0; i < 8; i++) { + _otherParameters[i] = x[i]; + } } -void EightByteChunk::marshal(DataStream& dataStream) const -{ - - for(size_t idx = 0; idx < 8; idx++) - { - dataStream << _otherParameters[idx]; - } - +void EightByteChunk::marshal(DataStream& dataStream) const { + for (size_t idx = 0; idx < 8; idx++) { + dataStream << _otherParameters[idx]; + } } -void EightByteChunk::unmarshal(DataStream& dataStream) -{ - - for(size_t idx = 0; idx < 8; idx++) - { - dataStream >> _otherParameters[idx]; - } - +void EightByteChunk::unmarshal(DataStream& dataStream) { + for (size_t idx = 0; idx < 8; idx++) { + dataStream >> _otherParameters[idx]; + } } +bool EightByteChunk::operator==(const EightByteChunk& rhs) const { + bool ivarsEqual = true; -bool EightByteChunk::operator ==(const EightByteChunk& rhs) const - { - bool ivarsEqual = true; - + for (unsigned char idx = 0; idx < 8; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - for(unsigned char idx = 0; idx < 8; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int EightByteChunk::getMarshalledSize() const -{ - int marshalSize = 0; +int EightByteChunk::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 8 * 1; // _otherParameters - return marshalSize; + marshalSize = marshalSize + 8 * 1; // _otherParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +71,7 @@ int EightByteChunk::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EightByteChunk.h b/src/dis6/EightByteChunk.h index 1dc3e9d2..1c2b7033 100644 --- a/src/dis6/EightByteChunk.h +++ b/src/dis6/EightByteChunk.h @@ -1,47 +1,43 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 64 bit piece of data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EightByteChunk -{ -protected: +class OPENDIS6_EXPORT EightByteChunk { + protected: /** Eight bytes of arbitrary data */ - char _otherParameters[8]; - + char _otherParameters[8]; public: - EightByteChunk(); - virtual ~EightByteChunk(); + EightByteChunk(); + virtual ~EightByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EightByteChunk& rhs) const; + bool operator==(const EightByteChunk& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ElectromagneticEmissionBeamData.cpp b/src/dis6/ElectromagneticEmissionBeamData.cpp index ff870f8f..e8f5ef6d 100644 --- a/src/dis6/ElectromagneticEmissionBeamData.cpp +++ b/src/dis6/ElectromagneticEmissionBeamData.cpp @@ -2,222 +2,194 @@ using namespace DIS; +ElectromagneticEmissionBeamData::ElectromagneticEmissionBeamData() + : _beamDataLength(0), + _beamIDNumber(0), + _beamParameterIndex(0), + _fundamentalParameterData(), + _beamFunction(0), + _numberOfTrackJamTargets(0), + _highDensityTrackJam(0), + _pad4(0), + _jammingModeSequence(0) {} -ElectromagneticEmissionBeamData::ElectromagneticEmissionBeamData(): - _beamDataLength(0), - _beamIDNumber(0), - _beamParameterIndex(0), - _fundamentalParameterData(), - _beamFunction(0), - _numberOfTrackJamTargets(0), - _highDensityTrackJam(0), - _pad4(0), - _jammingModeSequence(0) -{ +ElectromagneticEmissionBeamData::~ElectromagneticEmissionBeamData() { + _trackJamTargets.clear(); } -ElectromagneticEmissionBeamData::~ElectromagneticEmissionBeamData() -{ - _trackJamTargets.clear(); +unsigned char ElectromagneticEmissionBeamData::getBeamDataLength() const { + return _beamDataLength; } -unsigned char ElectromagneticEmissionBeamData::getBeamDataLength() const -{ - return _beamDataLength; +void ElectromagneticEmissionBeamData::setBeamDataLength(unsigned char pX) { + _beamDataLength = pX; } -void ElectromagneticEmissionBeamData::setBeamDataLength(unsigned char pX) -{ - _beamDataLength = pX; +unsigned char ElectromagneticEmissionBeamData::getBeamIDNumber() const { + return _beamIDNumber; } -unsigned char ElectromagneticEmissionBeamData::getBeamIDNumber() const -{ - return _beamIDNumber; +void ElectromagneticEmissionBeamData::setBeamIDNumber(unsigned char pX) { + _beamIDNumber = pX; } -void ElectromagneticEmissionBeamData::setBeamIDNumber(unsigned char pX) -{ - _beamIDNumber = pX; +unsigned short ElectromagneticEmissionBeamData::getBeamParameterIndex() const { + return _beamParameterIndex; } -unsigned short ElectromagneticEmissionBeamData::getBeamParameterIndex() const -{ - return _beamParameterIndex; +void ElectromagneticEmissionBeamData::setBeamParameterIndex(unsigned short pX) { + _beamParameterIndex = pX; } -void ElectromagneticEmissionBeamData::setBeamParameterIndex(unsigned short pX) -{ - _beamParameterIndex = pX; +FundamentalParameterData& +ElectromagneticEmissionBeamData::getFundamentalParameterData() { + return _fundamentalParameterData; } -FundamentalParameterData& ElectromagneticEmissionBeamData::getFundamentalParameterData() -{ - return _fundamentalParameterData; +const FundamentalParameterData& +ElectromagneticEmissionBeamData::getFundamentalParameterData() const { + return _fundamentalParameterData; } -const FundamentalParameterData& ElectromagneticEmissionBeamData::getFundamentalParameterData() const -{ - return _fundamentalParameterData; +void ElectromagneticEmissionBeamData::setFundamentalParameterData( + const FundamentalParameterData& pX) { + _fundamentalParameterData = pX; } -void ElectromagneticEmissionBeamData::setFundamentalParameterData(const FundamentalParameterData &pX) -{ - _fundamentalParameterData = pX; +unsigned char ElectromagneticEmissionBeamData::getBeamFunction() const { + return _beamFunction; } -unsigned char ElectromagneticEmissionBeamData::getBeamFunction() const -{ - return _beamFunction; +void ElectromagneticEmissionBeamData::setBeamFunction(unsigned char pX) { + _beamFunction = pX; } -void ElectromagneticEmissionBeamData::setBeamFunction(unsigned char pX) -{ - _beamFunction = pX; +unsigned char ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() + const { + return _trackJamTargets.size(); } -unsigned char ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() const -{ - return _trackJamTargets.size(); +unsigned char ElectromagneticEmissionBeamData::getHighDensityTrackJam() const { + return _highDensityTrackJam; } -unsigned char ElectromagneticEmissionBeamData::getHighDensityTrackJam() const -{ - return _highDensityTrackJam; +void ElectromagneticEmissionBeamData::setHighDensityTrackJam(unsigned char pX) { + _highDensityTrackJam = pX; } -void ElectromagneticEmissionBeamData::setHighDensityTrackJam(unsigned char pX) -{ - _highDensityTrackJam = pX; -} - -unsigned char ElectromagneticEmissionBeamData::getPad4() const -{ - return _pad4; -} +unsigned char ElectromagneticEmissionBeamData::getPad4() const { return _pad4; } -void ElectromagneticEmissionBeamData::setPad4(unsigned char pX) -{ - _pad4 = pX; -} +void ElectromagneticEmissionBeamData::setPad4(unsigned char pX) { _pad4 = pX; } -unsigned int ElectromagneticEmissionBeamData::getJammingModeSequence() const -{ - return _jammingModeSequence; +unsigned int ElectromagneticEmissionBeamData::getJammingModeSequence() const { + return _jammingModeSequence; } -void ElectromagneticEmissionBeamData::setJammingModeSequence(unsigned int pX) -{ - _jammingModeSequence = pX; +void ElectromagneticEmissionBeamData::setJammingModeSequence(unsigned int pX) { + _jammingModeSequence = pX; } -std::vector& ElectromagneticEmissionBeamData::getTrackJamTargets() -{ - return _trackJamTargets; +std::vector& +ElectromagneticEmissionBeamData::getTrackJamTargets() { + return _trackJamTargets; } -const std::vector& ElectromagneticEmissionBeamData::getTrackJamTargets() const -{ - return _trackJamTargets; +const std::vector& +ElectromagneticEmissionBeamData::getTrackJamTargets() const { + return _trackJamTargets; } -void ElectromagneticEmissionBeamData::setTrackJamTargets(const std::vector& pX) -{ - _trackJamTargets = pX; +void ElectromagneticEmissionBeamData::setTrackJamTargets( + const std::vector& pX) { + _trackJamTargets = pX; } -void ElectromagneticEmissionBeamData::marshal(DataStream& dataStream) const -{ - dataStream << _beamDataLength; - dataStream << _beamIDNumber; - dataStream << _beamParameterIndex; - _fundamentalParameterData.marshal(dataStream); - dataStream << _beamFunction; - dataStream << ( unsigned char )_trackJamTargets.size(); - dataStream << _highDensityTrackJam; - dataStream << _pad4; - dataStream << _jammingModeSequence; - - for(size_t idx = 0; idx < _trackJamTargets.size(); idx++) - { - TrackJamTarget x = _trackJamTargets[idx]; - x.marshal(dataStream); - } +void ElectromagneticEmissionBeamData::marshal(DataStream& dataStream) const { + dataStream << _beamDataLength; + dataStream << _beamIDNumber; + dataStream << _beamParameterIndex; + _fundamentalParameterData.marshal(dataStream); + dataStream << _beamFunction; + dataStream << (unsigned char)_trackJamTargets.size(); + dataStream << _highDensityTrackJam; + dataStream << _pad4; + dataStream << _jammingModeSequence; + for (size_t idx = 0; idx < _trackJamTargets.size(); idx++) { + TrackJamTarget x = _trackJamTargets[idx]; + x.marshal(dataStream); + } } -void ElectromagneticEmissionBeamData::unmarshal(DataStream& dataStream) -{ - dataStream >> _beamDataLength; - dataStream >> _beamIDNumber; - dataStream >> _beamParameterIndex; - _fundamentalParameterData.unmarshal(dataStream); - dataStream >> _beamFunction; - dataStream >> _numberOfTrackJamTargets; - dataStream >> _highDensityTrackJam; - dataStream >> _pad4; - dataStream >> _jammingModeSequence; +void ElectromagneticEmissionBeamData::unmarshal(DataStream& dataStream) { + dataStream >> _beamDataLength; + dataStream >> _beamIDNumber; + dataStream >> _beamParameterIndex; + _fundamentalParameterData.unmarshal(dataStream); + dataStream >> _beamFunction; + dataStream >> _numberOfTrackJamTargets; + dataStream >> _highDensityTrackJam; + dataStream >> _pad4; + dataStream >> _jammingModeSequence; - _trackJamTargets.clear(); - for(size_t idx = 0; idx < _numberOfTrackJamTargets; idx++) - { - TrackJamTarget x; - x.unmarshal(dataStream); - _trackJamTargets.push_back(x); - } + _trackJamTargets.clear(); + for (size_t idx = 0; idx < _numberOfTrackJamTargets; idx++) { + TrackJamTarget x; + x.unmarshal(dataStream); + _trackJamTargets.push_back(x); + } } +bool ElectromagneticEmissionBeamData::operator==( + const ElectromagneticEmissionBeamData& rhs) const { + bool ivarsEqual = true; -bool ElectromagneticEmissionBeamData::operator ==(const ElectromagneticEmissionBeamData& rhs) const - { - bool ivarsEqual = true; - - if( ! (_beamDataLength == rhs._beamDataLength) ) ivarsEqual = false; - if( ! (_beamIDNumber == rhs._beamIDNumber) ) ivarsEqual = false; - if( ! (_beamParameterIndex == rhs._beamParameterIndex) ) ivarsEqual = false; - if( ! (_fundamentalParameterData == rhs._fundamentalParameterData) ) ivarsEqual = false; - if( ! (_beamFunction == rhs._beamFunction) ) ivarsEqual = false; - if( ! (_highDensityTrackJam == rhs._highDensityTrackJam) ) ivarsEqual = false; - if( ! (_pad4 == rhs._pad4) ) ivarsEqual = false; - if( ! (_jammingModeSequence == rhs._jammingModeSequence) ) ivarsEqual = false; + if (!(_beamDataLength == rhs._beamDataLength)) ivarsEqual = false; + if (!(_beamIDNumber == rhs._beamIDNumber)) ivarsEqual = false; + if (!(_beamParameterIndex == rhs._beamParameterIndex)) ivarsEqual = false; + if (!(_fundamentalParameterData == rhs._fundamentalParameterData)) + ivarsEqual = false; + if (!(_beamFunction == rhs._beamFunction)) ivarsEqual = false; + if (!(_highDensityTrackJam == rhs._highDensityTrackJam)) ivarsEqual = false; + if (!(_pad4 == rhs._pad4)) ivarsEqual = false; + if (!(_jammingModeSequence == rhs._jammingModeSequence)) ivarsEqual = false; - for(size_t idx = 0; idx < _trackJamTargets.size(); idx++) - { - if( ! ( _trackJamTargets[idx] == rhs._trackJamTargets[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _trackJamTargets.size(); idx++) { + if (!(_trackJamTargets[idx] == rhs._trackJamTargets[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int ElectromagneticEmissionBeamData::getMarshalledSize() const -{ - int marshalSize = 0; +int ElectromagneticEmissionBeamData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _beamDataLength - marshalSize = marshalSize + 1; // _beamIDNumber - marshalSize = marshalSize + 2; // _beamParameterIndex - marshalSize = marshalSize + _fundamentalParameterData.getMarshalledSize(); // _fundamentalParameterData - marshalSize = marshalSize + 1; // _beamFunction - marshalSize = marshalSize + 1; // _numberOfTrackJamTargets - marshalSize = marshalSize + 1; // _highDensityTrackJam - marshalSize = marshalSize + 1; // _pad4 - marshalSize = marshalSize + 4; // _jammingModeSequence + marshalSize = marshalSize + 1; // _beamDataLength + marshalSize = marshalSize + 1; // _beamIDNumber + marshalSize = marshalSize + 2; // _beamParameterIndex + marshalSize = + marshalSize + _fundamentalParameterData + .getMarshalledSize(); // _fundamentalParameterData + marshalSize = marshalSize + 1; // _beamFunction + marshalSize = marshalSize + 1; // _numberOfTrackJamTargets + marshalSize = marshalSize + 1; // _highDensityTrackJam + marshalSize = marshalSize + 1; // _pad4 + marshalSize = marshalSize + 4; // _jammingModeSequence - for(unsigned long long idx=0; idx < _trackJamTargets.size(); idx++) - { - TrackJamTarget listElement = _trackJamTargets[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _trackJamTargets.size(); idx++) { + TrackJamTarget listElement = _trackJamTargets[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -230,7 +202,7 @@ int ElectromagneticEmissionBeamData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ElectromagneticEmissionBeamData.h b/src/dis6/ElectromagneticEmissionBeamData.h index 3f42cb2c..ad648744 100644 --- a/src/dis6/ElectromagneticEmissionBeamData.h +++ b/src/dis6/ElectromagneticEmissionBeamData.h @@ -1,104 +1,107 @@ #pragma once +#include + #include #include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Description of one electronic emission beam -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ElectromagneticEmissionBeamData -{ -protected: +class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { + protected: /** This field shall specify the length of this beams data in 32 bit words */ - unsigned char _beamDataLength; + unsigned char _beamDataLength; - /** This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system. */ - unsigned char _beamIDNumber; + /** This field shall specify a unique emitter database number assigned to + * differentiate between otherwise similar or identical emitter beams within + * an emitter system. */ + unsigned char _beamIDNumber; - /** This field shall specify a Beam Parameter Index number that shall be used by receiving entities in conjunction with the Emitter Name field to provide a pointer to the stored database parameters required to regenerate the beam. */ - unsigned short _beamParameterIndex; + /** This field shall specify a Beam Parameter Index number that shall be used + * by receiving entities in conjunction with the Emitter Name field to provide + * a pointer to the stored database parameters required to regenerate the + * beam. */ + unsigned short _beamParameterIndex; /** Fundamental parameter data such as frequency range, beam sweep, etc. */ - FundamentalParameterData _fundamentalParameterData; + FundamentalParameterData _fundamentalParameterData; /** beam function of a particular beam */ - unsigned char _beamFunction; + unsigned char _beamFunction; /** Number of track/jam targets */ - unsigned char _numberOfTrackJamTargets; + unsigned char _numberOfTrackJamTargets; - /** wheher or not the receiving simulation apps can assume all the targets in the scan pattern are being tracked/jammed */ - unsigned char _highDensityTrackJam; + /** wheher or not the receiving simulation apps can assume all the targets in + * the scan pattern are being tracked/jammed */ + unsigned char _highDensityTrackJam; /** padding */ - unsigned char _pad4; + unsigned char _pad4; /** identify jamming techniques used */ - unsigned int _jammingModeSequence; + unsigned int _jammingModeSequence; /** variable length list of track/jam targets */ - std::vector _trackJamTargets; - + std::vector _trackJamTargets; public: - ElectromagneticEmissionBeamData(); - virtual ~ElectromagneticEmissionBeamData(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + ElectromagneticEmissionBeamData(); + virtual ~ElectromagneticEmissionBeamData(); - unsigned char getBeamDataLength() const; - void setBeamDataLength(unsigned char pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getBeamIDNumber() const; - void setBeamIDNumber(unsigned char pX); + unsigned char getBeamDataLength() const; + void setBeamDataLength(unsigned char pX); - unsigned short getBeamParameterIndex() const; - void setBeamParameterIndex(unsigned short pX); + unsigned char getBeamIDNumber() const; + void setBeamIDNumber(unsigned char pX); - FundamentalParameterData& getFundamentalParameterData(); - const FundamentalParameterData& getFundamentalParameterData() const; - void setFundamentalParameterData(const FundamentalParameterData &pX); + unsigned short getBeamParameterIndex() const; + void setBeamParameterIndex(unsigned short pX); - unsigned char getBeamFunction() const; - void setBeamFunction(unsigned char pX); + FundamentalParameterData& getFundamentalParameterData(); + const FundamentalParameterData& getFundamentalParameterData() const; + void setFundamentalParameterData(const FundamentalParameterData& pX); - unsigned char getNumberOfTrackJamTargets() const; + unsigned char getBeamFunction() const; + void setBeamFunction(unsigned char pX); - unsigned char getHighDensityTrackJam() const; - void setHighDensityTrackJam(unsigned char pX); + unsigned char getNumberOfTrackJamTargets() const; - unsigned char getPad4() const; - void setPad4(unsigned char pX); + unsigned char getHighDensityTrackJam() const; + void setHighDensityTrackJam(unsigned char pX); - unsigned int getJammingModeSequence() const; - void setJammingModeSequence(unsigned int pX); + unsigned char getPad4() const; + void setPad4(unsigned char pX); - std::vector& getTrackJamTargets(); - const std::vector& getTrackJamTargets() const; - void setTrackJamTargets(const std::vector& pX); + unsigned int getJammingModeSequence() const; + void setJammingModeSequence(unsigned int pX); + std::vector& getTrackJamTargets(); + const std::vector& getTrackJamTargets() const; + void setTrackJamTargets(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const ElectromagneticEmissionBeamData& rhs) const; + bool operator==(const ElectromagneticEmissionBeamData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -111,7 +114,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ElectromagneticEmissionSystemData.cpp b/src/dis6/ElectromagneticEmissionSystemData.cpp index 95880231..cb8c827d 100644 --- a/src/dis6/ElectromagneticEmissionSystemData.cpp +++ b/src/dis6/ElectromagneticEmissionSystemData.cpp @@ -2,167 +2,147 @@ using namespace DIS; +ElectromagneticEmissionSystemData::ElectromagneticEmissionSystemData() + : _systemDataLength(0), + _numberOfBeams(0), + _emissionsPadding2(0), + _emitterSystem(), + _location() {} -ElectromagneticEmissionSystemData::ElectromagneticEmissionSystemData(): - _systemDataLength(0), - _numberOfBeams(0), - _emissionsPadding2(0), - _emitterSystem(), - _location() -{ +ElectromagneticEmissionSystemData::~ElectromagneticEmissionSystemData() { + _beamDataRecords.clear(); } -ElectromagneticEmissionSystemData::~ElectromagneticEmissionSystemData() -{ - _beamDataRecords.clear(); +unsigned char ElectromagneticEmissionSystemData::getSystemDataLength() const { + return _systemDataLength; } -unsigned char ElectromagneticEmissionSystemData::getSystemDataLength() const -{ - return _systemDataLength; +void ElectromagneticEmissionSystemData::setSystemDataLength(unsigned char pX) { + _systemDataLength = pX; } -void ElectromagneticEmissionSystemData::setSystemDataLength(unsigned char pX) -{ - _systemDataLength = pX; +unsigned char ElectromagneticEmissionSystemData::getNumberOfBeams() const { + return _beamDataRecords.size(); } -unsigned char ElectromagneticEmissionSystemData::getNumberOfBeams() const -{ - return _beamDataRecords.size(); +unsigned short ElectromagneticEmissionSystemData::getEmissionsPadding2() const { + return _emissionsPadding2; } -unsigned short ElectromagneticEmissionSystemData::getEmissionsPadding2() const -{ - return _emissionsPadding2; +void ElectromagneticEmissionSystemData::setEmissionsPadding2( + unsigned short pX) { + _emissionsPadding2 = pX; } -void ElectromagneticEmissionSystemData::setEmissionsPadding2(unsigned short pX) -{ - _emissionsPadding2 = pX; +EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() { + return _emitterSystem; } -EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() -{ - return _emitterSystem; +const EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() + const { + return _emitterSystem; } -const EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() const -{ - return _emitterSystem; +void ElectromagneticEmissionSystemData::setEmitterSystem( + const EmitterSystem& pX) { + _emitterSystem = pX; } -void ElectromagneticEmissionSystemData::setEmitterSystem(const EmitterSystem &pX) -{ - _emitterSystem = pX; +Vector3Float& ElectromagneticEmissionSystemData::getLocation() { + return _location; } -Vector3Float& ElectromagneticEmissionSystemData::getLocation() -{ - return _location; +const Vector3Float& ElectromagneticEmissionSystemData::getLocation() const { + return _location; } -const Vector3Float& ElectromagneticEmissionSystemData::getLocation() const -{ - return _location; +void ElectromagneticEmissionSystemData::setLocation(const Vector3Float& pX) { + _location = pX; } -void ElectromagneticEmissionSystemData::setLocation(const Vector3Float &pX) -{ - _location = pX; +std::vector& +ElectromagneticEmissionSystemData::getBeamDataRecords() { + return _beamDataRecords; } -std::vector& ElectromagneticEmissionSystemData::getBeamDataRecords() -{ - return _beamDataRecords; +const std::vector& +ElectromagneticEmissionSystemData::getBeamDataRecords() const { + return _beamDataRecords; } -const std::vector& ElectromagneticEmissionSystemData::getBeamDataRecords() const -{ - return _beamDataRecords; +void ElectromagneticEmissionSystemData::setBeamDataRecords( + const std::vector& pX) { + _beamDataRecords = pX; } -void ElectromagneticEmissionSystemData::setBeamDataRecords(const std::vector& pX) -{ - _beamDataRecords = pX; -} - -void ElectromagneticEmissionSystemData::marshal(DataStream& dataStream) const -{ - dataStream << _systemDataLength; - dataStream << ( unsigned char )_beamDataRecords.size(); - dataStream << _emissionsPadding2; - _emitterSystem.marshal(dataStream); - _location.marshal(dataStream); - - for(size_t idx = 0; idx < _beamDataRecords.size(); idx++) - { - ElectromagneticEmissionBeamData x = _beamDataRecords[idx]; - x.marshal(dataStream); - } +void ElectromagneticEmissionSystemData::marshal(DataStream& dataStream) const { + dataStream << _systemDataLength; + dataStream << (unsigned char)_beamDataRecords.size(); + dataStream << _emissionsPadding2; + _emitterSystem.marshal(dataStream); + _location.marshal(dataStream); + for (size_t idx = 0; idx < _beamDataRecords.size(); idx++) { + ElectromagneticEmissionBeamData x = _beamDataRecords[idx]; + x.marshal(dataStream); + } } -void ElectromagneticEmissionSystemData::unmarshal(DataStream& dataStream) -{ - dataStream >> _systemDataLength; - dataStream >> _numberOfBeams; - dataStream >> _emissionsPadding2; - _emitterSystem.unmarshal(dataStream); - _location.unmarshal(dataStream); +void ElectromagneticEmissionSystemData::unmarshal(DataStream& dataStream) { + dataStream >> _systemDataLength; + dataStream >> _numberOfBeams; + dataStream >> _emissionsPadding2; + _emitterSystem.unmarshal(dataStream); + _location.unmarshal(dataStream); - _beamDataRecords.clear(); - for(size_t idx = 0; idx < _numberOfBeams; idx++) - { - ElectromagneticEmissionBeamData x; - x.unmarshal(dataStream); - _beamDataRecords.push_back(x); - } + _beamDataRecords.clear(); + for (size_t idx = 0; idx < _numberOfBeams; idx++) { + ElectromagneticEmissionBeamData x; + x.unmarshal(dataStream); + _beamDataRecords.push_back(x); + } } +bool ElectromagneticEmissionSystemData::operator==( + const ElectromagneticEmissionSystemData& rhs) const { + bool ivarsEqual = true; -bool ElectromagneticEmissionSystemData::operator ==(const ElectromagneticEmissionSystemData& rhs) const - { - bool ivarsEqual = true; + if (!(_systemDataLength == rhs._systemDataLength)) ivarsEqual = false; + if (!(_emissionsPadding2 == rhs._emissionsPadding2)) ivarsEqual = false; + if (!(_emitterSystem == rhs._emitterSystem)) ivarsEqual = false; + if (!(_location == rhs._location)) ivarsEqual = false; - if( ! (_systemDataLength == rhs._systemDataLength) ) ivarsEqual = false; - if( ! (_emissionsPadding2 == rhs._emissionsPadding2) ) ivarsEqual = false; - if( ! (_emitterSystem == rhs._emitterSystem) ) ivarsEqual = false; - if( ! (_location == rhs._location) ) ivarsEqual = false; + for (size_t idx = 0; idx < _beamDataRecords.size(); idx++) { + if (!(_beamDataRecords[idx] == rhs._beamDataRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _beamDataRecords.size(); idx++) - { - if( ! ( _beamDataRecords[idx] == rhs._beamDataRecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int ElectromagneticEmissionSystemData::getMarshalledSize() const -{ - int marshalSize = 0; +int ElectromagneticEmissionSystemData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _systemDataLength - marshalSize = marshalSize + 1; // _numberOfBeams - marshalSize = marshalSize + 2; // _emissionsPadding2 - marshalSize = marshalSize + _emitterSystem.getMarshalledSize(); // _emitterSystem - marshalSize = marshalSize + _location.getMarshalledSize(); // _location + marshalSize = marshalSize + 1; // _systemDataLength + marshalSize = marshalSize + 1; // _numberOfBeams + marshalSize = marshalSize + 2; // _emissionsPadding2 + marshalSize = + marshalSize + _emitterSystem.getMarshalledSize(); // _emitterSystem + marshalSize = marshalSize + _location.getMarshalledSize(); // _location - for(unsigned long long idx=0; idx < _beamDataRecords.size(); idx++) - { - ElectromagneticEmissionBeamData listElement = _beamDataRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _beamDataRecords.size(); idx++) { + ElectromagneticEmissionBeamData listElement = _beamDataRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -175,7 +155,7 @@ int ElectromagneticEmissionSystemData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ElectromagneticEmissionSystemData.h b/src/dis6/ElectromagneticEmissionSystemData.h index 353c827b..7384b533 100644 --- a/src/dis6/ElectromagneticEmissionSystemData.h +++ b/src/dis6/ElectromagneticEmissionSystemData.h @@ -1,82 +1,84 @@ #pragma once +#include + +#include #include #include -#include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Data about one electronic system -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ElectromagneticEmissionSystemData -{ -protected: - /** This field shall specify the length of this emitter system�s data (including beam data and its track/jam information) in 32-bit words. The length shall include the System Data Length field. */ - unsigned char _systemDataLength; +class OPENDIS6_EXPORT ElectromagneticEmissionSystemData { + protected: + /** This field shall specify the length of this emitter system�s data + * (including beam data and its track/jam information) in 32-bit words. The + * length shall include the System Data Length field. */ + unsigned char _systemDataLength; - /** This field shall specify the number of beams being described in the current PDU for the system being described. */ - unsigned char _numberOfBeams; + /** This field shall specify the number of beams being described in the + * current PDU for the system being described. */ + unsigned char _numberOfBeams; /** padding. */ - unsigned short _emissionsPadding2; + unsigned short _emissionsPadding2; /** This field shall specify information about a particular emitter system */ - EmitterSystem _emitterSystem; + EmitterSystem _emitterSystem; /** Location with respect to the entity */ - Vector3Float _location; + Vector3Float _location; /** variable length list of beam data records */ - std::vector _beamDataRecords; - + std::vector _beamDataRecords; public: - ElectromagneticEmissionSystemData(); - virtual ~ElectromagneticEmissionSystemData(); + ElectromagneticEmissionSystemData(); + virtual ~ElectromagneticEmissionSystemData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getSystemDataLength() const; - void setSystemDataLength(unsigned char pX); + unsigned char getSystemDataLength() const; + void setSystemDataLength(unsigned char pX); - unsigned char getNumberOfBeams() const; + unsigned char getNumberOfBeams() const; - unsigned short getEmissionsPadding2() const; - void setEmissionsPadding2(unsigned short pX); + unsigned short getEmissionsPadding2() const; + void setEmissionsPadding2(unsigned short pX); - EmitterSystem& getEmitterSystem(); - const EmitterSystem& getEmitterSystem() const; - void setEmitterSystem(const EmitterSystem &pX); + EmitterSystem& getEmitterSystem(); + const EmitterSystem& getEmitterSystem() const; + void setEmitterSystem(const EmitterSystem& pX); - Vector3Float& getLocation(); - const Vector3Float& getLocation() const; - void setLocation(const Vector3Float &pX); + Vector3Float& getLocation(); + const Vector3Float& getLocation() const; + void setLocation(const Vector3Float& pX); - std::vector& getBeamDataRecords(); - const std::vector& getBeamDataRecords() const; - void setBeamDataRecords(const std::vector& pX); + std::vector& getBeamDataRecords(); + const std::vector& getBeamDataRecords() + const; + void setBeamDataRecords( + const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ElectromagneticEmissionSystemData& rhs) const; + bool operator==(const ElectromagneticEmissionSystemData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +91,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ElectromagneticEmissionsPdu.cpp b/src/dis6/ElectromagneticEmissionsPdu.cpp index 9178a40d..5deb2a67 100644 --- a/src/dis6/ElectromagneticEmissionsPdu.cpp +++ b/src/dis6/ElectromagneticEmissionsPdu.cpp @@ -2,174 +2,153 @@ using namespace DIS; - -ElectromagneticEmissionsPdu::ElectromagneticEmissionsPdu() : DistributedEmissionsFamilyPdu(), - _emittingEntityID(), - _eventID(), - _stateUpdateIndicator(0), - _numberOfSystems(0), - _paddingForEmissionsPdu(0) -{ - setPduType( 23 ); - setPaddingForEmissionsPdu( 0 ); +ElectromagneticEmissionsPdu::ElectromagneticEmissionsPdu() + : DistributedEmissionsFamilyPdu(), + _emittingEntityID(), + _eventID(), + _stateUpdateIndicator(0), + _numberOfSystems(0), + _paddingForEmissionsPdu(0) { + setPduType(23); + setPaddingForEmissionsPdu(0); } -ElectromagneticEmissionsPdu::~ElectromagneticEmissionsPdu() -{ - _systems.clear(); +ElectromagneticEmissionsPdu::~ElectromagneticEmissionsPdu() { + _systems.clear(); } -EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() -{ - return _emittingEntityID; +EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() { + return _emittingEntityID; } -const EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() const -{ - return _emittingEntityID; +const EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() const { + return _emittingEntityID; } -void ElectromagneticEmissionsPdu::setEmittingEntityID(const EntityID &pX) -{ - _emittingEntityID = pX; +void ElectromagneticEmissionsPdu::setEmittingEntityID(const EntityID& pX) { + _emittingEntityID = pX; } -EventID& ElectromagneticEmissionsPdu::getEventID() -{ - return _eventID; -} +EventID& ElectromagneticEmissionsPdu::getEventID() { return _eventID; } -const EventID& ElectromagneticEmissionsPdu::getEventID() const -{ - return _eventID; +const EventID& ElectromagneticEmissionsPdu::getEventID() const { + return _eventID; } -void ElectromagneticEmissionsPdu::setEventID(const EventID &pX) -{ - _eventID = pX; +void ElectromagneticEmissionsPdu::setEventID(const EventID& pX) { + _eventID = pX; } -unsigned char ElectromagneticEmissionsPdu::getStateUpdateIndicator() const -{ - return _stateUpdateIndicator; +unsigned char ElectromagneticEmissionsPdu::getStateUpdateIndicator() const { + return _stateUpdateIndicator; } -void ElectromagneticEmissionsPdu::setStateUpdateIndicator(unsigned char pX) -{ - _stateUpdateIndicator = pX; +void ElectromagneticEmissionsPdu::setStateUpdateIndicator(unsigned char pX) { + _stateUpdateIndicator = pX; } -unsigned char ElectromagneticEmissionsPdu::getNumberOfSystems() const -{ - return _systems.size(); +unsigned char ElectromagneticEmissionsPdu::getNumberOfSystems() const { + return _systems.size(); } -unsigned short ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const -{ - return _paddingForEmissionsPdu; +unsigned short ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const { + return _paddingForEmissionsPdu; } -void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(unsigned short pX) -{ - _paddingForEmissionsPdu = pX; +void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(unsigned short pX) { + _paddingForEmissionsPdu = pX; } -std::vector& ElectromagneticEmissionsPdu::getSystems() -{ - return _systems; +std::vector& +ElectromagneticEmissionsPdu::getSystems() { + return _systems; } -const std::vector& ElectromagneticEmissionsPdu::getSystems() const -{ - return _systems; +const std::vector& +ElectromagneticEmissionsPdu::getSystems() const { + return _systems; } -void ElectromagneticEmissionsPdu::setSystems(const std::vector& pX) -{ - _systems = pX; +void ElectromagneticEmissionsPdu::setSystems( + const std::vector& pX) { + _systems = pX; } -void ElectromagneticEmissionsPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _emittingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _stateUpdateIndicator; - dataStream << ( unsigned char )_systems.size(); - dataStream << _paddingForEmissionsPdu; - - for(size_t idx = 0; idx < _systems.size(); idx++) - { - ElectromagneticEmissionSystemData x = _systems[idx]; - x.marshal(dataStream); - } +void ElectromagneticEmissionsPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _emittingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _stateUpdateIndicator; + dataStream << (unsigned char)_systems.size(); + dataStream << _paddingForEmissionsPdu; + for (size_t idx = 0; idx < _systems.size(); idx++) { + ElectromagneticEmissionSystemData x = _systems[idx]; + x.marshal(dataStream); + } } -void ElectromagneticEmissionsPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _emittingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _stateUpdateIndicator; - dataStream >> _numberOfSystems; - dataStream >> _paddingForEmissionsPdu; +void ElectromagneticEmissionsPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _emittingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _stateUpdateIndicator; + dataStream >> _numberOfSystems; + dataStream >> _paddingForEmissionsPdu; - _systems.clear(); - for(size_t idx = 0; idx < _numberOfSystems; idx++) - { - ElectromagneticEmissionSystemData x; - x.unmarshal(dataStream); - _systems.push_back(x); - } + _systems.clear(); + for (size_t idx = 0; idx < _numberOfSystems; idx++) { + ElectromagneticEmissionSystemData x; + x.unmarshal(dataStream); + _systems.push_back(x); + } } +bool ElectromagneticEmissionsPdu::operator==( + const ElectromagneticEmissionsPdu& rhs) const { + bool ivarsEqual = true; -bool ElectromagneticEmissionsPdu::operator ==(const ElectromagneticEmissionsPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); + if (!(_emittingEntityID == rhs._emittingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_stateUpdateIndicator == rhs._stateUpdateIndicator)) ivarsEqual = false; + if (!(_paddingForEmissionsPdu == rhs._paddingForEmissionsPdu)) + ivarsEqual = false; - if( ! (_emittingEntityID == rhs._emittingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_stateUpdateIndicator == rhs._stateUpdateIndicator) ) ivarsEqual = false; - if( ! (_paddingForEmissionsPdu == rhs._paddingForEmissionsPdu) ) ivarsEqual = false; + for (size_t idx = 0; idx < _systems.size(); idx++) { + if (!(_systems[idx] == rhs._systems[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _systems.size(); idx++) - { - if( ! ( _systems[idx] == rhs._systems[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int ElectromagneticEmissionsPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ElectromagneticEmissionsPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 1; // _stateUpdateIndicator - marshalSize = marshalSize + 1; // _numberOfSystems - marshalSize = marshalSize + 2; // _paddingForEmissionsPdu + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 1; // _stateUpdateIndicator + marshalSize = marshalSize + 1; // _numberOfSystems + marshalSize = marshalSize + 2; // _paddingForEmissionsPdu - for(unsigned long long idx=0; idx < _systems.size(); idx++) - { - ElectromagneticEmissionSystemData listElement = _systems[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _systems.size(); idx++) { + ElectromagneticEmissionSystemData listElement = _systems[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -182,7 +161,7 @@ int ElectromagneticEmissionsPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ElectromagneticEmissionsPdu.h b/src/dis6/ElectromagneticEmissionsPdu.h index 3b891cef..5dfb828b 100644 --- a/src/dis6/ElectromagneticEmissionsPdu.h +++ b/src/dis6/ElectromagneticEmissionsPdu.h @@ -1,83 +1,87 @@ #pragma once -#include -#include -#include #include + #include -#include +#include +#include +#include #include +#include +namespace DIS { +// Section 5.3.7.1. Information about active electronic warfare (EW) emissions +// and active EW countermeasures shall be communicated using an Electromagnetic +// Emission PDU. COMPLETE (I think) -namespace DIS -{ -// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be communicated using an Electromagnetic Emission PDU. COMPLETE (I think) - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ElectromagneticEmissionsPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ElectromagneticEmissionsPdu + : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity emitting */ - EntityID _emittingEntityID; + EntityID _emittingEntityID; /** ID of event */ - EventID _eventID; + EventID _eventID; - /** This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)]. */ - unsigned char _stateUpdateIndicator; + /** This field shall be used to indicate if the data in the PDU represents a + * state update or just data that has changed since issuance of the last + * Electromagnetic Emission PDU [relative to the identified entity and + * emission system(s)]. */ + unsigned char _stateUpdateIndicator; - /** This field shall specify the number of emission systems being described in the current PDU. */ - unsigned char _numberOfSystems; + /** This field shall specify the number of emission systems being described in + * the current PDU. */ + unsigned char _numberOfSystems; /** padding */ - unsigned short _paddingForEmissionsPdu; + unsigned short _paddingForEmissionsPdu; /** Electromagnetic emmissions systems */ - std::vector _systems; - + std::vector _systems; public: - ElectromagneticEmissionsPdu(); - virtual ~ElectromagneticEmissionsPdu(); + ElectromagneticEmissionsPdu(); + virtual ~ElectromagneticEmissionsPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEmittingEntityID(); - const EntityID& getEmittingEntityID() const; - void setEmittingEntityID(const EntityID &pX); + EntityID& getEmittingEntityID(); + const EntityID& getEmittingEntityID() const; + void setEmittingEntityID(const EntityID& pX); - EventID& getEventID(); - const EventID& getEventID() const; - void setEventID(const EventID &pX); + EventID& getEventID(); + const EventID& getEventID() const; + void setEventID(const EventID& pX); - unsigned char getStateUpdateIndicator() const; - void setStateUpdateIndicator(unsigned char pX); + unsigned char getStateUpdateIndicator() const; + void setStateUpdateIndicator(unsigned char pX); - unsigned char getNumberOfSystems() const; + unsigned char getNumberOfSystems() const; - unsigned short getPaddingForEmissionsPdu() const; - void setPaddingForEmissionsPdu(unsigned short pX); + unsigned short getPaddingForEmissionsPdu() const; + void setPaddingForEmissionsPdu(unsigned short pX); - std::vector& getSystems(); - const std::vector& getSystems() const; - void setSystems(const std::vector& pX); + std::vector& getSystems(); + const std::vector& getSystems() const; + void setSystems(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ElectromagneticEmissionsPdu& rhs) const; + bool operator==(const ElectromagneticEmissionsPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -90,7 +94,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EmitterSystem.cpp b/src/dis6/EmitterSystem.cpp index d3b16f26..56d36bf0 100644 --- a/src/dis6/EmitterSystem.cpp +++ b/src/dis6/EmitterSystem.cpp @@ -2,89 +2,63 @@ using namespace DIS; +EmitterSystem::EmitterSystem() + : _emitterName(0), _function(0), _emitterIdNumber(0) {} -EmitterSystem::EmitterSystem(): - _emitterName(0), - _function(0), - _emitterIdNumber(0) -{ -} +EmitterSystem::~EmitterSystem() {} -EmitterSystem::~EmitterSystem() -{ -} +unsigned short EmitterSystem::getEmitterName() const { return _emitterName; } -unsigned short EmitterSystem::getEmitterName() const -{ - return _emitterName; -} +void EmitterSystem::setEmitterName(unsigned short pX) { _emitterName = pX; } -void EmitterSystem::setEmitterName(unsigned short pX) -{ - _emitterName = pX; -} +unsigned char EmitterSystem::getFunction() const { return _function; } -unsigned char EmitterSystem::getFunction() const -{ - return _function; -} +void EmitterSystem::setFunction(unsigned char pX) { _function = pX; } -void EmitterSystem::setFunction(unsigned char pX) -{ - _function = pX; +unsigned char EmitterSystem::getEmitterIdNumber() const { + return _emitterIdNumber; } -unsigned char EmitterSystem::getEmitterIdNumber() const -{ - return _emitterIdNumber; +void EmitterSystem::setEmitterIdNumber(unsigned char pX) { + _emitterIdNumber = pX; } -void EmitterSystem::setEmitterIdNumber(unsigned char pX) -{ - _emitterIdNumber = pX; +void EmitterSystem::marshal(DataStream& dataStream) const { + dataStream << _emitterName; + dataStream << _function; + dataStream << _emitterIdNumber; } -void EmitterSystem::marshal(DataStream& dataStream) const -{ - dataStream << _emitterName; - dataStream << _function; - dataStream << _emitterIdNumber; -} - -void EmitterSystem::unmarshal(DataStream& dataStream) -{ - dataStream >> _emitterName; - dataStream >> _function; - dataStream >> _emitterIdNumber; +void EmitterSystem::unmarshal(DataStream& dataStream) { + dataStream >> _emitterName; + dataStream >> _function; + dataStream >> _emitterIdNumber; } +bool EmitterSystem::operator==(const EmitterSystem& rhs) const { + bool ivarsEqual = true; -bool EmitterSystem::operator ==(const EmitterSystem& rhs) const - { - bool ivarsEqual = true; + if (!(_emitterName == rhs._emitterName)) ivarsEqual = false; + if (!(_function == rhs._function)) ivarsEqual = false; + if (!(_emitterIdNumber == rhs._emitterIdNumber)) ivarsEqual = false; - if( ! (_emitterName == rhs._emitterName) ) ivarsEqual = false; - if( ! (_function == rhs._function) ) ivarsEqual = false; - if( ! (_emitterIdNumber == rhs._emitterIdNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EmitterSystem::getMarshalledSize() const -{ - int marshalSize = 0; +int EmitterSystem::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _emitterName - marshalSize = marshalSize + 1; // _function - marshalSize = marshalSize + 1; // _emitterIdNumber - return marshalSize; + marshalSize = marshalSize + 2; // _emitterName + marshalSize = marshalSize + 1; // _function + marshalSize = marshalSize + 1; // _emitterIdNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +71,7 @@ int EmitterSystem::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EmitterSystem.h b/src/dis6/EmitterSystem.h index ef3838a9..0b373cf9 100644 --- a/src/dis6/EmitterSystem.h +++ b/src/dis6/EmitterSystem.h @@ -1,58 +1,55 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.11. This field shall specify information about a particular +// emitter system -namespace DIS -{ -// Section 5.2.11. This field shall specify information about a particular emitter system - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EmitterSystem -{ -protected: +class OPENDIS6_EXPORT EmitterSystem { + protected: /** Name of the emitter, 16 bit enumeration */ - unsigned short _emitterName; + unsigned short _emitterName; /** function of the emitter, 8 bit enumeration */ - unsigned char _function; + unsigned char _function; /** emitter ID, 8 bit enumeration */ - unsigned char _emitterIdNumber; - + unsigned char _emitterIdNumber; public: - EmitterSystem(); - virtual ~EmitterSystem(); + EmitterSystem(); + virtual ~EmitterSystem(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getEmitterName() const; - void setEmitterName(unsigned short pX); + unsigned short getEmitterName() const; + void setEmitterName(unsigned short pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + unsigned char getFunction() const; + void setFunction(unsigned char pX); - unsigned char getEmitterIdNumber() const; - void setEmitterIdNumber(unsigned char pX); + unsigned char getEmitterIdNumber() const; + void setEmitterIdNumber(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EmitterSystem& rhs) const; + bool operator==(const EmitterSystem& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityID.cpp b/src/dis6/EntityID.cpp index d94a0e4a..95e8ac56 100644 --- a/src/dis6/EntityID.cpp +++ b/src/dis6/EntityID.cpp @@ -2,89 +2,58 @@ using namespace DIS; +EntityID::EntityID() : _site(0), _application(0), _entity(0) {} -EntityID::EntityID(): - _site(0), - _application(0), - _entity(0) -{ -} +EntityID::~EntityID() {} -EntityID::~EntityID() -{ -} +unsigned short EntityID::getSite() const { return _site; } -unsigned short EntityID::getSite() const -{ - return _site; -} +void EntityID::setSite(unsigned short pX) { _site = pX; } -void EntityID::setSite(unsigned short pX) -{ - _site = pX; -} +unsigned short EntityID::getApplication() const { return _application; } -unsigned short EntityID::getApplication() const -{ - return _application; -} +void EntityID::setApplication(unsigned short pX) { _application = pX; } -void EntityID::setApplication(unsigned short pX) -{ - _application = pX; -} +unsigned short EntityID::getEntity() const { return _entity; } -unsigned short EntityID::getEntity() const -{ - return _entity; -} - -void EntityID::setEntity(unsigned short pX) -{ - _entity = pX; -} +void EntityID::setEntity(unsigned short pX) { _entity = pX; } -void EntityID::marshal(DataStream& dataStream) const -{ - dataStream << _site; - dataStream << _application; - dataStream << _entity; +void EntityID::marshal(DataStream& dataStream) const { + dataStream << _site; + dataStream << _application; + dataStream << _entity; } -void EntityID::unmarshal(DataStream& dataStream) -{ - dataStream >> _site; - dataStream >> _application; - dataStream >> _entity; +void EntityID::unmarshal(DataStream& dataStream) { + dataStream >> _site; + dataStream >> _application; + dataStream >> _entity; } +bool EntityID::operator==(const EntityID& rhs) const { + bool ivarsEqual = true; -bool EntityID::operator ==(const EntityID& rhs) const - { - bool ivarsEqual = true; + if (!(_site == rhs._site)) ivarsEqual = false; + if (!(_application == rhs._application)) ivarsEqual = false; + if (!(_entity == rhs._entity)) ivarsEqual = false; - if( ! (_site == rhs._site) ) ivarsEqual = false; - if( ! (_application == rhs._application) ) ivarsEqual = false; - if( ! (_entity == rhs._entity) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EntityID::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityID::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _entity - return marshalSize; + marshalSize = marshalSize + 2; // _site + marshalSize = marshalSize + 2; // _application + marshalSize = marshalSize + 2; // _entity + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int EntityID::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityID.h b/src/dis6/EntityID.h index 8891936e..ee6d5632 100644 --- a/src/dis6/EntityID.h +++ b/src/dis6/EntityID.h @@ -1,58 +1,67 @@ #pragma once -#include #include +#include - -namespace DIS -{ -// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all other entities in that application. This identifier number is valid for the duration of the exercise; however, entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden- tifier number need not be registered or retained for future exercises. The entity identifier number shall be specified by a 16-bit unsigned integer. An entity identifier number equal to zero with valid site and application identification shall address a simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the receiver of the create entity to define the entity identifier number of the new entity. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +namespace DIS { +// Each entity in a given DIS simulation application shall be given an entity +// identifier number unique to all other entities in that application. This +// identifier number is valid for the duration of the exercise; however, entity +// identifier numbers may be reused when all possible numbers have been +// exhausted. No entity shall have an entity identifier number of NO_ENTITY, +// ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden- tifier number need not be +// registered or retained for future exercises. The entity identifier number +// shall be specified by a 16-bit unsigned integer. An entity identifier +// number equal to zero with valid site and application identification shall +// address a simulation application. An entity identifier number equal to +// ALL_ENTITIES shall mean all entities within the specified site and +// application. An entity identifier number equal to RQST_ASSIGN_ID allows the +// receiver of the create entity to define the entity identifier number of the +// new entity. + +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityID -{ -protected: +class OPENDIS6_EXPORT EntityID { + protected: /** The site ID */ - unsigned short _site; + unsigned short _site; /** The application ID */ - unsigned short _application; + unsigned short _application; /** the entity ID */ - unsigned short _entity; - + unsigned short _entity; public: - EntityID(); - virtual ~EntityID(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + EntityID(); + virtual ~EntityID(); - unsigned short getSite() const; - void setSite(unsigned short pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + unsigned short getSite() const; + void setSite(unsigned short pX); - unsigned short getEntity() const; - void setEntity(unsigned short pX); + unsigned short getApplication() const; + void setApplication(unsigned short pX); + unsigned short getEntity() const; + void setEntity(unsigned short pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const EntityID& rhs) const; + bool operator==(const EntityID& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +74,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityInformationFamilyPdu.cpp b/src/dis6/EntityInformationFamilyPdu.cpp index 4ab2591d..615d22f8 100644 --- a/src/dis6/EntityInformationFamilyPdu.cpp +++ b/src/dis6/EntityInformationFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -EntityInformationFamilyPdu::EntityInformationFamilyPdu() : Pdu() +EntityInformationFamilyPdu::EntityInformationFamilyPdu() + : Pdu() { - setProtocolFamily( 1 ); + setProtocolFamily(1); } -EntityInformationFamilyPdu::~EntityInformationFamilyPdu() -{ -} +EntityInformationFamilyPdu::~EntityInformationFamilyPdu() {} -void EntityInformationFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void EntityInformationFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void EntityInformationFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void EntityInformationFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool EntityInformationFamilyPdu::operator==( + const EntityInformationFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool EntityInformationFamilyPdu::operator ==(const EntityInformationFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int EntityInformationFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityInformationFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int EntityInformationFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityInformationFamilyPdu.h b/src/dis6/EntityInformationFamilyPdu.h index a0edd496..dff0216e 100644 --- a/src/dis6/EntityInformationFamilyPdu.h +++ b/src/dis6/EntityInformationFamilyPdu.h @@ -1,41 +1,39 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.3. Common superclass for EntityState, Collision, +// collision-elastic, and entity state update PDUs. This should be abstract. +// COMPLETE -namespace DIS -{ -// Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs. This should be abstract. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityInformationFamilyPdu : public Pdu -{ -protected: - +class OPENDIS6_EXPORT EntityInformationFamilyPdu : public Pdu { + protected: public: - EntityInformationFamilyPdu(); - virtual ~EntityInformationFamilyPdu(); + EntityInformationFamilyPdu(); + virtual ~EntityInformationFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityInformationFamilyPdu& rhs) const; + bool operator==(const EntityInformationFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +46,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityManagementFamilyPdu.cpp b/src/dis6/EntityManagementFamilyPdu.cpp index 32686f27..20fc4ba2 100644 --- a/src/dis6/EntityManagementFamilyPdu.cpp +++ b/src/dis6/EntityManagementFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -EntityManagementFamilyPdu::EntityManagementFamilyPdu() : Pdu() +EntityManagementFamilyPdu::EntityManagementFamilyPdu() + : Pdu() { - setProtocolFamily( 7 ); + setProtocolFamily(7); } -EntityManagementFamilyPdu::~EntityManagementFamilyPdu() -{ -} +EntityManagementFamilyPdu::~EntityManagementFamilyPdu() {} -void EntityManagementFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void EntityManagementFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void EntityManagementFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void EntityManagementFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool EntityManagementFamilyPdu::operator==( + const EntityManagementFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool EntityManagementFamilyPdu::operator ==(const EntityManagementFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int EntityManagementFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityManagementFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int EntityManagementFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityManagementFamilyPdu.h b/src/dis6/EntityManagementFamilyPdu.h index baa8641e..11bb0aaf 100644 --- a/src/dis6/EntityManagementFamilyPdu.h +++ b/src/dis6/EntityManagementFamilyPdu.h @@ -1,41 +1,38 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.9. Common superclass for EntityManagment PDUs, including +// aggregate state, isGroupOf, TransferControLRequest, and isPartOf -namespace DIS -{ -// Section 5.3.9. Common superclass for EntityManagment PDUs, including aggregate state, isGroupOf, TransferControLRequest, and isPartOf - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityManagementFamilyPdu : public Pdu -{ -protected: - +class OPENDIS6_EXPORT EntityManagementFamilyPdu : public Pdu { + protected: public: - EntityManagementFamilyPdu(); - virtual ~EntityManagementFamilyPdu(); + EntityManagementFamilyPdu(); + virtual ~EntityManagementFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityManagementFamilyPdu& rhs) const; + bool operator==(const EntityManagementFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +45,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityStatePdu.cpp b/src/dis6/EntityStatePdu.cpp index 7ae48961..388fdc58 100644 --- a/src/dis6/EntityStatePdu.cpp +++ b/src/dis6/EntityStatePdu.cpp @@ -2,308 +2,246 @@ using namespace DIS; - -EntityStatePdu::EntityStatePdu() : EntityInformationFamilyPdu(), - _entityID(), - _forceId(0), - _numberOfArticulationParameters(0), - _entityType(), - _alternativeEntityType(), - _entityLinearVelocity(), - _entityLocation(), - _entityOrientation(), - _entityAppearance(0), - _deadReckoningParameters(), - _marking(), - _capabilities(0) -{ - setPduType( 1 ); +EntityStatePdu::EntityStatePdu() + : EntityInformationFamilyPdu(), + _entityID(), + _forceId(0), + _numberOfArticulationParameters(0), + _entityType(), + _alternativeEntityType(), + _entityLinearVelocity(), + _entityLocation(), + _entityOrientation(), + _entityAppearance(0), + _deadReckoningParameters(), + _marking(), + _capabilities(0) { + setPduType(1); } -EntityStatePdu::~EntityStatePdu() -{ - _articulationParameters.clear(); -} +EntityStatePdu::~EntityStatePdu() { _articulationParameters.clear(); } -EntityID& EntityStatePdu::getEntityID() -{ - return _entityID; -} +EntityID& EntityStatePdu::getEntityID() { return _entityID; } -const EntityID& EntityStatePdu::getEntityID() const -{ - return _entityID; -} +const EntityID& EntityStatePdu::getEntityID() const { return _entityID; } -void EntityStatePdu::setEntityID(const EntityID &pX) -{ - _entityID = pX; -} +void EntityStatePdu::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned char EntityStatePdu::getForceId() const -{ - return _forceId; -} +unsigned char EntityStatePdu::getForceId() const { return _forceId; } -void EntityStatePdu::setForceId(unsigned char pX) -{ - _forceId = pX; -} +void EntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } -char EntityStatePdu::getNumberOfArticulationParameters() const -{ - return _articulationParameters.size(); +char EntityStatePdu::getNumberOfArticulationParameters() const { + return _articulationParameters.size(); } -EntityType& EntityStatePdu::getEntityType() -{ - return _entityType; -} +EntityType& EntityStatePdu::getEntityType() { return _entityType; } -const EntityType& EntityStatePdu::getEntityType() const -{ - return _entityType; -} +const EntityType& EntityStatePdu::getEntityType() const { return _entityType; } -void EntityStatePdu::setEntityType(const EntityType &pX) -{ - _entityType = pX; -} +void EntityStatePdu::setEntityType(const EntityType& pX) { _entityType = pX; } -EntityType& EntityStatePdu::getAlternativeEntityType() -{ - return _alternativeEntityType; +EntityType& EntityStatePdu::getAlternativeEntityType() { + return _alternativeEntityType; } -const EntityType& EntityStatePdu::getAlternativeEntityType() const -{ - return _alternativeEntityType; +const EntityType& EntityStatePdu::getAlternativeEntityType() const { + return _alternativeEntityType; } -void EntityStatePdu::setAlternativeEntityType(const EntityType &pX) -{ - _alternativeEntityType = pX; +void EntityStatePdu::setAlternativeEntityType(const EntityType& pX) { + _alternativeEntityType = pX; } -Vector3Float& EntityStatePdu::getEntityLinearVelocity() -{ - return _entityLinearVelocity; +Vector3Float& EntityStatePdu::getEntityLinearVelocity() { + return _entityLinearVelocity; } -const Vector3Float& EntityStatePdu::getEntityLinearVelocity() const -{ - return _entityLinearVelocity; +const Vector3Float& EntityStatePdu::getEntityLinearVelocity() const { + return _entityLinearVelocity; } -void EntityStatePdu::setEntityLinearVelocity(const Vector3Float &pX) -{ - _entityLinearVelocity = pX; +void EntityStatePdu::setEntityLinearVelocity(const Vector3Float& pX) { + _entityLinearVelocity = pX; } -Vector3Double& EntityStatePdu::getEntityLocation() -{ - return _entityLocation; -} +Vector3Double& EntityStatePdu::getEntityLocation() { return _entityLocation; } -const Vector3Double& EntityStatePdu::getEntityLocation() const -{ - return _entityLocation; +const Vector3Double& EntityStatePdu::getEntityLocation() const { + return _entityLocation; } -void EntityStatePdu::setEntityLocation(const Vector3Double &pX) -{ - _entityLocation = pX; +void EntityStatePdu::setEntityLocation(const Vector3Double& pX) { + _entityLocation = pX; } -Orientation& EntityStatePdu::getEntityOrientation() -{ - return _entityOrientation; +Orientation& EntityStatePdu::getEntityOrientation() { + return _entityOrientation; } -const Orientation& EntityStatePdu::getEntityOrientation() const -{ - return _entityOrientation; +const Orientation& EntityStatePdu::getEntityOrientation() const { + return _entityOrientation; } -void EntityStatePdu::setEntityOrientation(const Orientation &pX) -{ - _entityOrientation = pX; +void EntityStatePdu::setEntityOrientation(const Orientation& pX) { + _entityOrientation = pX; } -int EntityStatePdu::getEntityAppearance() const -{ - return _entityAppearance; -} +int EntityStatePdu::getEntityAppearance() const { return _entityAppearance; } -void EntityStatePdu::setEntityAppearance(int pX) -{ - _entityAppearance = pX; -} +void EntityStatePdu::setEntityAppearance(int pX) { _entityAppearance = pX; } -DeadReckoningParameter& EntityStatePdu::getDeadReckoningParameters() -{ - return _deadReckoningParameters; +DeadReckoningParameter& EntityStatePdu::getDeadReckoningParameters() { + return _deadReckoningParameters; } -const DeadReckoningParameter& EntityStatePdu::getDeadReckoningParameters() const -{ - return _deadReckoningParameters; +const DeadReckoningParameter& EntityStatePdu::getDeadReckoningParameters() + const { + return _deadReckoningParameters; } -void EntityStatePdu::setDeadReckoningParameters(const DeadReckoningParameter &pX) -{ - _deadReckoningParameters = pX; +void EntityStatePdu::setDeadReckoningParameters( + const DeadReckoningParameter& pX) { + _deadReckoningParameters = pX; } -Marking& EntityStatePdu::getMarking() -{ - return _marking; -} +Marking& EntityStatePdu::getMarking() { return _marking; } -const Marking& EntityStatePdu::getMarking() const -{ - return _marking; -} +const Marking& EntityStatePdu::getMarking() const { return _marking; } -void EntityStatePdu::setMarking(const Marking &pX) -{ - _marking = pX; -} +void EntityStatePdu::setMarking(const Marking& pX) { _marking = pX; } -int EntityStatePdu::getCapabilities() const -{ - return _capabilities; -} +int EntityStatePdu::getCapabilities() const { return _capabilities; } -void EntityStatePdu::setCapabilities(int pX) -{ - _capabilities = pX; -} +void EntityStatePdu::setCapabilities(int pX) { _capabilities = pX; } -std::vector& EntityStatePdu::getArticulationParameters() -{ - return _articulationParameters; +std::vector& +EntityStatePdu::getArticulationParameters() { + return _articulationParameters; } -const std::vector& EntityStatePdu::getArticulationParameters() const -{ - return _articulationParameters; +const std::vector& +EntityStatePdu::getArticulationParameters() const { + return _articulationParameters; } -void EntityStatePdu::setArticulationParameters(const std::vector& pX) -{ - _articulationParameters = pX; +void EntityStatePdu::setArticulationParameters( + const std::vector& pX) { + _articulationParameters = pX; } -void EntityStatePdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _entityID.marshal(dataStream); - dataStream << _forceId; - dataStream << ( char )_articulationParameters.size(); - _entityType.marshal(dataStream); - _alternativeEntityType.marshal(dataStream); - _entityLinearVelocity.marshal(dataStream); - _entityLocation.marshal(dataStream); - _entityOrientation.marshal(dataStream); - dataStream << _entityAppearance; - _deadReckoningParameters.marshal(dataStream); - _marking.marshal(dataStream); - dataStream << _capabilities; - - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter x = _articulationParameters[idx]; - x.marshal(dataStream); - } +void EntityStatePdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _entityID.marshal(dataStream); + dataStream << _forceId; + dataStream << (char)_articulationParameters.size(); + _entityType.marshal(dataStream); + _alternativeEntityType.marshal(dataStream); + _entityLinearVelocity.marshal(dataStream); + _entityLocation.marshal(dataStream); + _entityOrientation.marshal(dataStream); + dataStream << _entityAppearance; + _deadReckoningParameters.marshal(dataStream); + _marking.marshal(dataStream); + dataStream << _capabilities; + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + ArticulationParameter x = _articulationParameters[idx]; + x.marshal(dataStream); + } } -void EntityStatePdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _entityID.unmarshal(dataStream); - dataStream >> _forceId; - dataStream >> _numberOfArticulationParameters; - _entityType.unmarshal(dataStream); - _alternativeEntityType.unmarshal(dataStream); - _entityLinearVelocity.unmarshal(dataStream); - _entityLocation.unmarshal(dataStream); - _entityOrientation.unmarshal(dataStream); - dataStream >> _entityAppearance; - _deadReckoningParameters.unmarshal(dataStream); - _marking.unmarshal(dataStream); - dataStream >> _capabilities; - - _articulationParameters.clear(); - for(char idx = 0; idx < _numberOfArticulationParameters; idx++) - { - ArticulationParameter x; - x.unmarshal(dataStream); - _articulationParameters.push_back(x); - } +void EntityStatePdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _entityID.unmarshal(dataStream); + dataStream >> _forceId; + dataStream >> _numberOfArticulationParameters; + _entityType.unmarshal(dataStream); + _alternativeEntityType.unmarshal(dataStream); + _entityLinearVelocity.unmarshal(dataStream); + _entityLocation.unmarshal(dataStream); + _entityOrientation.unmarshal(dataStream); + dataStream >> _entityAppearance; + _deadReckoningParameters.unmarshal(dataStream); + _marking.unmarshal(dataStream); + dataStream >> _capabilities; + + _articulationParameters.clear(); + for (char idx = 0; idx < _numberOfArticulationParameters; idx++) { + ArticulationParameter x; + x.unmarshal(dataStream); + _articulationParameters.push_back(x); + } } +bool EntityStatePdu::operator==(const EntityStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); -bool EntityStatePdu::operator ==(const EntityStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_entityID == rhs._entityID) ) ivarsEqual = false; - if( ! (_forceId == rhs._forceId) ) ivarsEqual = false; - if( ! (_entityType == rhs._entityType) ) ivarsEqual = false; - if( ! (_alternativeEntityType == rhs._alternativeEntityType) ) ivarsEqual = false; - if( ! (_entityLinearVelocity == rhs._entityLinearVelocity) ) ivarsEqual = false; - if( ! (_entityLocation == rhs._entityLocation) ) ivarsEqual = false; - if( ! (_entityOrientation == rhs._entityOrientation) ) ivarsEqual = false; - if( ! (_entityAppearance == rhs._entityAppearance) ) ivarsEqual = false; - if( ! (_deadReckoningParameters == rhs._deadReckoningParameters) ) ivarsEqual = false; - if( ! (_marking == rhs._marking) ) ivarsEqual = false; - if( ! (_capabilities == rhs._capabilities) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - if( ! ( _articulationParameters[idx] == rhs._articulationParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int EntityStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID - marshalSize = marshalSize + 1; // _forceId - marshalSize = marshalSize + 1; // _numberOfArticulationParameters - marshalSize = marshalSize + _entityType.getMarshalledSize(); // _entityType - marshalSize = marshalSize + _alternativeEntityType.getMarshalledSize(); // _alternativeEntityType - marshalSize = marshalSize + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity - marshalSize = marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation - marshalSize = marshalSize + _entityOrientation.getMarshalledSize(); // _entityOrientation - marshalSize = marshalSize + 4; // _entityAppearance - marshalSize = marshalSize + _deadReckoningParameters.getMarshalledSize(); // _deadReckoningParameters - marshalSize = marshalSize + _marking.getMarshalledSize(); // _marking - marshalSize = marshalSize + 4; // _capabilities - - for(unsigned long long idx=0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter listElement = _articulationParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; + if (!(_forceId == rhs._forceId)) ivarsEqual = false; + if (!(_entityType == rhs._entityType)) ivarsEqual = false; + if (!(_alternativeEntityType == rhs._alternativeEntityType)) + ivarsEqual = false; + if (!(_entityLinearVelocity == rhs._entityLinearVelocity)) ivarsEqual = false; + if (!(_entityLocation == rhs._entityLocation)) ivarsEqual = false; + if (!(_entityOrientation == rhs._entityOrientation)) ivarsEqual = false; + if (!(_entityAppearance == rhs._entityAppearance)) ivarsEqual = false; + if (!(_deadReckoningParameters == rhs._deadReckoningParameters)) + ivarsEqual = false; + if (!(_marking == rhs._marking)) ivarsEqual = false; + if (!(_capabilities == rhs._capabilities)) ivarsEqual = false; + + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + if (!(_articulationParameters[idx] == rhs._articulationParameters[idx])) + ivarsEqual = false; + } + + return ivarsEqual; +} + +int EntityStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID + marshalSize = marshalSize + 1; // _forceId + marshalSize = marshalSize + 1; // _numberOfArticulationParameters + marshalSize = marshalSize + _entityType.getMarshalledSize(); // _entityType + marshalSize = + marshalSize + + _alternativeEntityType.getMarshalledSize(); // _alternativeEntityType + marshalSize = + marshalSize + + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity + marshalSize = + marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation + marshalSize = marshalSize + + _entityOrientation.getMarshalledSize(); // _entityOrientation + marshalSize = marshalSize + 4; // _entityAppearance + marshalSize = + marshalSize + + _deadReckoningParameters.getMarshalledSize(); // _deadReckoningParameters + marshalSize = marshalSize + _marking.getMarshalledSize(); // _marking + marshalSize = marshalSize + 4; // _capabilities + + for (unsigned long long idx = 0; idx < _articulationParameters.size(); + idx++) { + ArticulationParameter listElement = _articulationParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -316,7 +254,7 @@ int EntityStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityStatePdu.h b/src/dis6/EntityStatePdu.h index 2bd62157..ec05530a 100644 --- a/src/dis6/EntityStatePdu.h +++ b/src/dis6/EntityStatePdu.h @@ -1,136 +1,135 @@ #pragma once +#include + +#include +#include #include +#include #include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include +#include +#include +#include #include +#include +namespace DIS { +// Section 5.3.3.1. Represents the postion and state of one entity in the world. +// COMPLETE -namespace DIS -{ -// Section 5.3.3.1. Represents the postion and state of one entity in the world. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityStatePdu : public EntityInformationFamilyPdu -{ -protected: +class OPENDIS6_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { + protected: /** Unique ID for an entity that is tied to this state information */ - EntityID _entityID; + EntityID _entityID; /** What force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + unsigned char _forceId; /** How many articulation parameters are in the variable length list */ - char _numberOfArticulationParameters; + char _numberOfArticulationParameters; /** Describes the type of entity in the world */ - EntityType _entityType; + EntityType _entityType; - EntityType _alternativeEntityType; + EntityType _alternativeEntityType; /** Describes the speed of the entity in the world */ - Vector3Float _entityLinearVelocity; + Vector3Float _entityLinearVelocity; /** describes the location of the entity in the world */ - Vector3Double _entityLocation; + Vector3Double _entityLocation; /** describes the orientation of the entity, in euler angles */ - Orientation _entityOrientation; + Orientation _entityOrientation; - /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */ - int _entityAppearance; + /** a series of bit flags that are used to help draw the entity, such as + * smoking, on fire, etc. */ + int _entityAppearance; /** parameters used for dead reckoning */ - DeadReckoningParameter _deadReckoningParameters; + DeadReckoningParameter _deadReckoningParameters; - /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */ - Marking _marking; + /** characters that can be used for debugging, or to draw unique strings on + * the side of entities in the world */ + Marking _marking; /** a series of bit flags */ - int _capabilities; + int _capabilities; /** variable length list of articulation parameters */ - std::vector _articulationParameters; - + std::vector _articulationParameters; public: - EntityStatePdu(); - virtual ~EntityStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + EntityStatePdu(); + virtual ~EntityStatePdu(); - EntityID& getEntityID(); - const EntityID& getEntityID() const; - void setEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); - char getNumberOfArticulationParameters() const; + unsigned char getForceId() const; + void setForceId(unsigned char pX); - EntityType& getEntityType(); - const EntityType& getEntityType() const; - void setEntityType(const EntityType &pX); + char getNumberOfArticulationParameters() const; - EntityType& getAlternativeEntityType(); - const EntityType& getAlternativeEntityType() const; - void setAlternativeEntityType(const EntityType &pX); + EntityType& getEntityType(); + const EntityType& getEntityType() const; + void setEntityType(const EntityType& pX); - Vector3Float& getEntityLinearVelocity(); - const Vector3Float& getEntityLinearVelocity() const; - void setEntityLinearVelocity(const Vector3Float &pX); + EntityType& getAlternativeEntityType(); + const EntityType& getAlternativeEntityType() const; + void setAlternativeEntityType(const EntityType& pX); - Vector3Double& getEntityLocation(); - const Vector3Double& getEntityLocation() const; - void setEntityLocation(const Vector3Double &pX); + Vector3Float& getEntityLinearVelocity(); + const Vector3Float& getEntityLinearVelocity() const; + void setEntityLinearVelocity(const Vector3Float& pX); - Orientation& getEntityOrientation(); - const Orientation& getEntityOrientation() const; - void setEntityOrientation(const Orientation &pX); + Vector3Double& getEntityLocation(); + const Vector3Double& getEntityLocation() const; + void setEntityLocation(const Vector3Double& pX); - int getEntityAppearance() const; - void setEntityAppearance(int pX); + Orientation& getEntityOrientation(); + const Orientation& getEntityOrientation() const; + void setEntityOrientation(const Orientation& pX); - DeadReckoningParameter& getDeadReckoningParameters(); - const DeadReckoningParameter& getDeadReckoningParameters() const; - void setDeadReckoningParameters(const DeadReckoningParameter &pX); + int getEntityAppearance() const; + void setEntityAppearance(int pX); - Marking& getMarking(); - const Marking& getMarking() const; - void setMarking(const Marking &pX); + DeadReckoningParameter& getDeadReckoningParameters(); + const DeadReckoningParameter& getDeadReckoningParameters() const; + void setDeadReckoningParameters(const DeadReckoningParameter& pX); - int getCapabilities() const; - void setCapabilities(int pX); + Marking& getMarking(); + const Marking& getMarking() const; + void setMarking(const Marking& pX); - std::vector& getArticulationParameters(); - const std::vector& getArticulationParameters() const; - void setArticulationParameters(const std::vector& pX); + int getCapabilities() const; + void setCapabilities(int pX); + std::vector& getArticulationParameters(); + const std::vector& getArticulationParameters() const; + void setArticulationParameters(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const EntityStatePdu& rhs) const; + bool operator==(const EntityStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -143,7 +142,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityStateUpdatePdu.cpp b/src/dis6/EntityStateUpdatePdu.cpp index fb486146..a0c1d2a6 100644 --- a/src/dis6/EntityStateUpdatePdu.cpp +++ b/src/dis6/EntityStateUpdatePdu.cpp @@ -2,214 +2,182 @@ using namespace DIS; - -EntityStateUpdatePdu::EntityStateUpdatePdu() : EntityInformationFamilyPdu(), - _entityID(), - _padding1(0), - _numberOfArticulationParameters(0), - _entityLinearVelocity(), - _entityLocation(), - _entityOrientation(), - _entityAppearance(0) -{ - setPduType( 67 ); - setProtocolFamily( 1 ); +EntityStateUpdatePdu::EntityStateUpdatePdu() + : EntityInformationFamilyPdu(), + _entityID(), + _padding1(0), + _numberOfArticulationParameters(0), + _entityLinearVelocity(), + _entityLocation(), + _entityOrientation(), + _entityAppearance(0) { + setPduType(67); + setProtocolFamily(1); } -EntityStateUpdatePdu::~EntityStateUpdatePdu() -{ - _articulationParameters.clear(); +EntityStateUpdatePdu::~EntityStateUpdatePdu() { + _articulationParameters.clear(); } -EntityID& EntityStateUpdatePdu::getEntityID() -{ - return _entityID; -} +EntityID& EntityStateUpdatePdu::getEntityID() { return _entityID; } -const EntityID& EntityStateUpdatePdu::getEntityID() const -{ - return _entityID; -} +const EntityID& EntityStateUpdatePdu::getEntityID() const { return _entityID; } -void EntityStateUpdatePdu::setEntityID(const EntityID &pX) -{ - _entityID = pX; -} +void EntityStateUpdatePdu::setEntityID(const EntityID& pX) { _entityID = pX; } -char EntityStateUpdatePdu::getPadding1() const -{ - return _padding1; -} +char EntityStateUpdatePdu::getPadding1() const { return _padding1; } -void EntityStateUpdatePdu::setPadding1(char pX) -{ - _padding1 = pX; -} +void EntityStateUpdatePdu::setPadding1(char pX) { _padding1 = pX; } -unsigned char EntityStateUpdatePdu::getNumberOfArticulationParameters() const -{ - return _articulationParameters.size(); +unsigned char EntityStateUpdatePdu::getNumberOfArticulationParameters() const { + return _articulationParameters.size(); } -Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() -{ - return _entityLinearVelocity; +Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() { + return _entityLinearVelocity; } -const Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() const -{ - return _entityLinearVelocity; +const Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() const { + return _entityLinearVelocity; } -void EntityStateUpdatePdu::setEntityLinearVelocity(const Vector3Float &pX) -{ - _entityLinearVelocity = pX; +void EntityStateUpdatePdu::setEntityLinearVelocity(const Vector3Float& pX) { + _entityLinearVelocity = pX; } -Vector3Double& EntityStateUpdatePdu::getEntityLocation() -{ - return _entityLocation; +Vector3Double& EntityStateUpdatePdu::getEntityLocation() { + return _entityLocation; } -const Vector3Double& EntityStateUpdatePdu::getEntityLocation() const -{ - return _entityLocation; +const Vector3Double& EntityStateUpdatePdu::getEntityLocation() const { + return _entityLocation; } -void EntityStateUpdatePdu::setEntityLocation(const Vector3Double &pX) -{ - _entityLocation = pX; +void EntityStateUpdatePdu::setEntityLocation(const Vector3Double& pX) { + _entityLocation = pX; } -Orientation& EntityStateUpdatePdu::getEntityOrientation() -{ - return _entityOrientation; +Orientation& EntityStateUpdatePdu::getEntityOrientation() { + return _entityOrientation; } -const Orientation& EntityStateUpdatePdu::getEntityOrientation() const -{ - return _entityOrientation; +const Orientation& EntityStateUpdatePdu::getEntityOrientation() const { + return _entityOrientation; } -void EntityStateUpdatePdu::setEntityOrientation(const Orientation &pX) -{ - _entityOrientation = pX; +void EntityStateUpdatePdu::setEntityOrientation(const Orientation& pX) { + _entityOrientation = pX; } -int EntityStateUpdatePdu::getEntityAppearance() const -{ - return _entityAppearance; +int EntityStateUpdatePdu::getEntityAppearance() const { + return _entityAppearance; } -void EntityStateUpdatePdu::setEntityAppearance(int pX) -{ - _entityAppearance = pX; +void EntityStateUpdatePdu::setEntityAppearance(int pX) { + _entityAppearance = pX; } -std::vector& EntityStateUpdatePdu::getArticulationParameters() -{ - return _articulationParameters; +std::vector& +EntityStateUpdatePdu::getArticulationParameters() { + return _articulationParameters; } -const std::vector& EntityStateUpdatePdu::getArticulationParameters() const -{ - return _articulationParameters; +const std::vector& +EntityStateUpdatePdu::getArticulationParameters() const { + return _articulationParameters; } -void EntityStateUpdatePdu::setArticulationParameters(const std::vector& pX) -{ - _articulationParameters = pX; +void EntityStateUpdatePdu::setArticulationParameters( + const std::vector& pX) { + _articulationParameters = pX; } -void EntityStateUpdatePdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _entityID.marshal(dataStream); - dataStream << _padding1; - dataStream << ( unsigned char )_articulationParameters.size(); - _entityLinearVelocity.marshal(dataStream); - _entityLocation.marshal(dataStream); - _entityOrientation.marshal(dataStream); - dataStream << _entityAppearance; - - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter x = _articulationParameters[idx]; - x.marshal(dataStream); - } +void EntityStateUpdatePdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _entityID.marshal(dataStream); + dataStream << _padding1; + dataStream << (unsigned char)_articulationParameters.size(); + _entityLinearVelocity.marshal(dataStream); + _entityLocation.marshal(dataStream); + _entityOrientation.marshal(dataStream); + dataStream << _entityAppearance; + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + ArticulationParameter x = _articulationParameters[idx]; + x.marshal(dataStream); + } } -void EntityStateUpdatePdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _entityID.unmarshal(dataStream); - dataStream >> _padding1; - dataStream >> _numberOfArticulationParameters; - _entityLinearVelocity.unmarshal(dataStream); - _entityLocation.unmarshal(dataStream); - _entityOrientation.unmarshal(dataStream); - dataStream >> _entityAppearance; +void EntityStateUpdatePdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _entityID.unmarshal(dataStream); + dataStream >> _padding1; + dataStream >> _numberOfArticulationParameters; + _entityLinearVelocity.unmarshal(dataStream); + _entityLocation.unmarshal(dataStream); + _entityOrientation.unmarshal(dataStream); + dataStream >> _entityAppearance; - _articulationParameters.clear(); - for(size_t idx = 0; idx < _numberOfArticulationParameters; idx++) - { - ArticulationParameter x; - x.unmarshal(dataStream); - _articulationParameters.push_back(x); - } + _articulationParameters.clear(); + for (size_t idx = 0; idx < _numberOfArticulationParameters; idx++) { + ArticulationParameter x; + x.unmarshal(dataStream); + _articulationParameters.push_back(x); + } } +bool EntityStateUpdatePdu::operator==(const EntityStateUpdatePdu& rhs) const { + bool ivarsEqual = true; -bool EntityStateUpdatePdu::operator ==(const EntityStateUpdatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - if( ! (_entityID == rhs._entityID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_entityLinearVelocity == rhs._entityLinearVelocity) ) ivarsEqual = false; - if( ! (_entityLocation == rhs._entityLocation) ) ivarsEqual = false; - if( ! (_entityOrientation == rhs._entityOrientation) ) ivarsEqual = false; - if( ! (_entityAppearance == rhs._entityAppearance) ) ivarsEqual = false; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_entityLinearVelocity == rhs._entityLinearVelocity)) ivarsEqual = false; + if (!(_entityLocation == rhs._entityLocation)) ivarsEqual = false; + if (!(_entityOrientation == rhs._entityOrientation)) ivarsEqual = false; + if (!(_entityAppearance == rhs._entityAppearance)) ivarsEqual = false; - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - if( ! ( _articulationParameters[idx] == rhs._articulationParameters[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + if (!(_articulationParameters[idx] == rhs._articulationParameters[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int EntityStateUpdatePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityStateUpdatePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 1; // _numberOfArticulationParameters - marshalSize = marshalSize + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity - marshalSize = marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation - marshalSize = marshalSize + _entityOrientation.getMarshalledSize(); // _entityOrientation - marshalSize = marshalSize + 4; // _entityAppearance + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID + marshalSize = marshalSize + 1; // _padding1 + marshalSize = marshalSize + 1; // _numberOfArticulationParameters + marshalSize = + marshalSize + + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity + marshalSize = + marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation + marshalSize = marshalSize + + _entityOrientation.getMarshalledSize(); // _entityOrientation + marshalSize = marshalSize + 4; // _entityAppearance - for(unsigned long long idx=0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter listElement = _articulationParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _articulationParameters.size(); + idx++) { + ArticulationParameter listElement = _articulationParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -222,7 +190,7 @@ int EntityStateUpdatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityStateUpdatePdu.h b/src/dis6/EntityStateUpdatePdu.h index c498bbb9..8e899a87 100644 --- a/src/dis6/EntityStateUpdatePdu.h +++ b/src/dis6/EntityStateUpdatePdu.h @@ -1,98 +1,97 @@ #pragma once -#include -#include -#include -#include -#include #include + +#include +#include #include -#include +#include +#include +#include #include +#include +namespace DIS { +// 5.3.3.4. Nonstatic information about a particular entity may be communicated +// by issuing an Entity State Update PDU. COMPLETE -namespace DIS -{ -// 5.3.3.4. Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu -{ -protected: +class OPENDIS6_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { + protected: /** This field shall identify the entity issuing the PDU */ - EntityID _entityID; + EntityID _entityID; /** Padding */ - char _padding1; + char _padding1; /** How many articulation parameters are in the variable length list */ - unsigned char _numberOfArticulationParameters; + unsigned char _numberOfArticulationParameters; /** Describes the speed of the entity in the world */ - Vector3Float _entityLinearVelocity; + Vector3Float _entityLinearVelocity; /** describes the location of the entity in the world */ - Vector3Double _entityLocation; + Vector3Double _entityLocation; /** describes the orientation of the entity, in euler angles */ - Orientation _entityOrientation; + Orientation _entityOrientation; - /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */ - int _entityAppearance; - - std::vector _articulationParameters; + /** a series of bit flags that are used to help draw the entity, such as + * smoking, on fire, etc. */ + int _entityAppearance; + std::vector _articulationParameters; public: - EntityStateUpdatePdu(); - virtual ~EntityStateUpdatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + EntityStateUpdatePdu(); + virtual ~EntityStateUpdatePdu(); - EntityID& getEntityID(); - const EntityID& getEntityID() const; - void setEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char getPadding1() const; - void setPadding1(char pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); - unsigned char getNumberOfArticulationParameters() const; + char getPadding1() const; + void setPadding1(char pX); - Vector3Float& getEntityLinearVelocity(); - const Vector3Float& getEntityLinearVelocity() const; - void setEntityLinearVelocity(const Vector3Float &pX); + unsigned char getNumberOfArticulationParameters() const; - Vector3Double& getEntityLocation(); - const Vector3Double& getEntityLocation() const; - void setEntityLocation(const Vector3Double &pX); + Vector3Float& getEntityLinearVelocity(); + const Vector3Float& getEntityLinearVelocity() const; + void setEntityLinearVelocity(const Vector3Float& pX); - Orientation& getEntityOrientation(); - const Orientation& getEntityOrientation() const; - void setEntityOrientation(const Orientation &pX); + Vector3Double& getEntityLocation(); + const Vector3Double& getEntityLocation() const; + void setEntityLocation(const Vector3Double& pX); - int getEntityAppearance() const; - void setEntityAppearance(int pX); + Orientation& getEntityOrientation(); + const Orientation& getEntityOrientation() const; + void setEntityOrientation(const Orientation& pX); - std::vector& getArticulationParameters(); - const std::vector& getArticulationParameters() const; - void setArticulationParameters(const std::vector& pX); + int getEntityAppearance() const; + void setEntityAppearance(int pX); + std::vector& getArticulationParameters(); + const std::vector& getArticulationParameters() const; + void setArticulationParameters(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const EntityStateUpdatePdu& rhs) const; + bool operator==(const EntityStateUpdatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +104,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityType.cpp b/src/dis6/EntityType.cpp index a8d86743..53547065 100644 --- a/src/dis6/EntityType.cpp +++ b/src/dis6/EntityType.cpp @@ -2,149 +2,97 @@ using namespace DIS; +EntityType::EntityType() + : _entityKind(0), + _domain(0), + _country(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0) {} -EntityType::EntityType(): - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0) -{ -} +EntityType::~EntityType() {} -EntityType::~EntityType() -{ -} +unsigned char EntityType::getEntityKind() const { return _entityKind; } -unsigned char EntityType::getEntityKind() const -{ - return _entityKind; -} +void EntityType::setEntityKind(unsigned char pX) { _entityKind = pX; } -void EntityType::setEntityKind(unsigned char pX) -{ - _entityKind = pX; -} +unsigned char EntityType::getDomain() const { return _domain; } -unsigned char EntityType::getDomain() const -{ - return _domain; -} +void EntityType::setDomain(unsigned char pX) { _domain = pX; } -void EntityType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned short EntityType::getCountry() const { return _country; } -unsigned short EntityType::getCountry() const -{ - return _country; -} +void EntityType::setCountry(unsigned short pX) { _country = pX; } -void EntityType::setCountry(unsigned short pX) -{ - _country = pX; -} +unsigned char EntityType::getCategory() const { return _category; } -unsigned char EntityType::getCategory() const -{ - return _category; -} +void EntityType::setCategory(unsigned char pX) { _category = pX; } -void EntityType::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char EntityType::getSubcategory() const { return _subcategory; } -unsigned char EntityType::getSubcategory() const -{ - return _subcategory; -} +void EntityType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void EntityType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +unsigned char EntityType::getSpecific() const { return _specific; } -unsigned char EntityType::getSpecific() const -{ - return _specific; -} +void EntityType::setSpecific(unsigned char pX) { _specific = pX; } -void EntityType::setSpecific(unsigned char pX) -{ - _specific = pX; -} +unsigned char EntityType::getExtra() const { return _extra; } -unsigned char EntityType::getExtra() const -{ - return _extra; -} +void EntityType::setExtra(unsigned char pX) { _extra = pX; } -void EntityType::setExtra(unsigned char pX) -{ - _extra = pX; +void EntityType::marshal(DataStream& dataStream) const { + dataStream << _entityKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; } -void EntityType::marshal(DataStream& dataStream) const -{ - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; +void EntityType::unmarshal(DataStream& dataStream) { + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; } -void EntityType::unmarshal(DataStream& dataStream) -{ - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; +bool EntityType::operator==(const EntityType& rhs) const { + bool ivarsEqual = true; + + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + + return ivarsEqual; } +int EntityType::getMarshalledSize() const { + int marshalSize = 0; -bool EntityType::operator ==(const EntityType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - - return ivarsEqual; - } - -int EntityType::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - return marshalSize; + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +105,7 @@ int EntityType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EntityType.h b/src/dis6/EntityType.h index a5d25e63..8736d902 100644 --- a/src/dis6/EntityType.h +++ b/src/dis6/EntityType.h @@ -1,81 +1,78 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.16. Identifies the type of entity, including kind of entity, +// domain (surface, subsurface, air, etc) country, category, etc. -namespace DIS -{ -// Section 5.2.16. Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityType -{ -protected: +class OPENDIS6_EXPORT EntityType { + protected: /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; + unsigned char _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; - - unsigned char _extra; + unsigned char _specific; + unsigned char _extra; public: - EntityType(); - virtual ~EntityType(); + EntityType(); + virtual ~EntityType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityType& rhs) const; + bool operator==(const EntityType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -88,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Environment.cpp b/src/dis6/Environment.cpp index 26b1a571..cc5d63a6 100644 --- a/src/dis6/Environment.cpp +++ b/src/dis6/Environment.cpp @@ -2,134 +2,90 @@ using namespace DIS; +Environment::Environment() + : _environmentType(0), + _length(0), + _index(0), + _padding1(0), + _geometry(0), + _padding2(0) {} -Environment::Environment(): - _environmentType(0), - _length(0), - _index(0), - _padding1(0), - _geometry(0), - _padding2(0) -{ -} - -Environment::~Environment() -{ -} +Environment::~Environment() {} -unsigned int Environment::getEnvironmentType() const -{ - return _environmentType; +unsigned int Environment::getEnvironmentType() const { + return _environmentType; } -void Environment::setEnvironmentType(unsigned int pX) -{ - _environmentType = pX; -} +void Environment::setEnvironmentType(unsigned int pX) { _environmentType = pX; } -unsigned char Environment::getLength() const -{ - return _length; -} +unsigned char Environment::getLength() const { return _length; } -void Environment::setLength(unsigned char pX) -{ - _length = pX; -} +void Environment::setLength(unsigned char pX) { _length = pX; } -unsigned char Environment::getIndex() const -{ - return _index; -} +unsigned char Environment::getIndex() const { return _index; } -void Environment::setIndex(unsigned char pX) -{ - _index = pX; -} +void Environment::setIndex(unsigned char pX) { _index = pX; } -unsigned char Environment::getPadding1() const -{ - return _padding1; -} +unsigned char Environment::getPadding1() const { return _padding1; } -void Environment::setPadding1(unsigned char pX) -{ - _padding1 = pX; -} +void Environment::setPadding1(unsigned char pX) { _padding1 = pX; } -unsigned char Environment::getGeometry() const -{ - return _geometry; -} +unsigned char Environment::getGeometry() const { return _geometry; } -void Environment::setGeometry(unsigned char pX) -{ - _geometry = pX; -} +void Environment::setGeometry(unsigned char pX) { _geometry = pX; } -unsigned char Environment::getPadding2() const -{ - return _padding2; -} +unsigned char Environment::getPadding2() const { return _padding2; } -void Environment::setPadding2(unsigned char pX) -{ - _padding2 = pX; -} +void Environment::setPadding2(unsigned char pX) { _padding2 = pX; } -void Environment::marshal(DataStream& dataStream) const -{ - dataStream << _environmentType; - dataStream << _length; - dataStream << _index; - dataStream << _padding1; - dataStream << _geometry; - dataStream << _padding2; +void Environment::marshal(DataStream& dataStream) const { + dataStream << _environmentType; + dataStream << _length; + dataStream << _index; + dataStream << _padding1; + dataStream << _geometry; + dataStream << _padding2; } -void Environment::unmarshal(DataStream& dataStream) -{ - dataStream >> _environmentType; - dataStream >> _length; - dataStream >> _index; - dataStream >> _padding1; - dataStream >> _geometry; - dataStream >> _padding2; +void Environment::unmarshal(DataStream& dataStream) { + dataStream >> _environmentType; + dataStream >> _length; + dataStream >> _index; + dataStream >> _padding1; + dataStream >> _geometry; + dataStream >> _padding2; } +bool Environment::operator==(const Environment& rhs) const { + bool ivarsEqual = true; -bool Environment::operator ==(const Environment& rhs) const - { - bool ivarsEqual = true; + if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; + if (!(_length == rhs._length)) ivarsEqual = false; + if (!(_index == rhs._index)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_geometry == rhs._geometry)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; - if( ! (_environmentType == rhs._environmentType) ) ivarsEqual = false; - if( ! (_length == rhs._length) ) ivarsEqual = false; - if( ! (_index == rhs._index) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_geometry == rhs._geometry) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Environment::getMarshalledSize() const -{ - int marshalSize = 0; +int Environment::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _environmentType - marshalSize = marshalSize + 1; // _length - marshalSize = marshalSize + 1; // _index - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 1; // _geometry - marshalSize = marshalSize + 1; // _padding2 - return marshalSize; + marshalSize = marshalSize + 4; // _environmentType + marshalSize = marshalSize + 1; // _length + marshalSize = marshalSize + 1; // _index + marshalSize = marshalSize + 1; // _padding1 + marshalSize = marshalSize + 1; // _geometry + marshalSize = marshalSize + 1; // _padding2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +98,7 @@ int Environment::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Environment.h b/src/dis6/Environment.h index 5a306d14..4ed8ad3e 100644 --- a/src/dis6/Environment.h +++ b/src/dis6/Environment.h @@ -1,76 +1,74 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.40. Information about a geometry, a state associated with a +// geometry, a bounding volume, or an associated entity ID. NOTE: this class +// requires hand coding. -namespace DIS -{ -// Section 5.2.40. Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. NOTE: this class requires hand coding. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Environment -{ -protected: +class OPENDIS6_EXPORT Environment { + protected: /** Record type */ - unsigned int _environmentType; + unsigned int _environmentType; /** length, in bits */ - unsigned char _length; + unsigned char _length; /** Identify the sequentially numbered record index */ - unsigned char _index; + unsigned char _index; /** padding */ - unsigned char _padding1; + unsigned char _padding1; /** Geometry or state record */ - unsigned char _geometry; + unsigned char _geometry; /** padding to bring the total size up to a 64 bit boundry */ - unsigned char _padding2; - + unsigned char _padding2; public: - Environment(); - virtual ~Environment(); + Environment(); + virtual ~Environment(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getEnvironmentType() const; - void setEnvironmentType(unsigned int pX); + unsigned int getEnvironmentType() const; + void setEnvironmentType(unsigned int pX); - unsigned char getLength() const; - void setLength(unsigned char pX); + unsigned char getLength() const; + void setLength(unsigned char pX); - unsigned char getIndex() const; - void setIndex(unsigned char pX); + unsigned char getIndex() const; + void setIndex(unsigned char pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + unsigned char getPadding1() const; + void setPadding1(unsigned char pX); - unsigned char getGeometry() const; - void setGeometry(unsigned char pX); + unsigned char getGeometry() const; + void setGeometry(unsigned char pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + unsigned char getPadding2() const; + void setPadding2(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Environment& rhs) const; + bool operator==(const Environment& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +81,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EnvironmentalProcessPdu.cpp b/src/dis6/EnvironmentalProcessPdu.cpp index cd9e2fc8..9afa2158 100644 --- a/src/dis6/EnvironmentalProcessPdu.cpp +++ b/src/dis6/EnvironmentalProcessPdu.cpp @@ -2,188 +2,169 @@ using namespace DIS; - -EnvironmentalProcessPdu::EnvironmentalProcessPdu() : SyntheticEnvironmentFamilyPdu(), - _environementalProcessID(), - _environmentType(), - _modelType(0), - _environmentStatus(0), - _numberOfEnvironmentRecords(0), - _sequenceNumber(0) -{ - setPduType( 41 ); +EnvironmentalProcessPdu::EnvironmentalProcessPdu() + : SyntheticEnvironmentFamilyPdu(), + _environementalProcessID(), + _environmentType(), + _modelType(0), + _environmentStatus(0), + _numberOfEnvironmentRecords(0), + _sequenceNumber(0) { + setPduType(41); } -EnvironmentalProcessPdu::~EnvironmentalProcessPdu() -{ - _environmentRecords.clear(); +EnvironmentalProcessPdu::~EnvironmentalProcessPdu() { + _environmentRecords.clear(); } -EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() -{ - return _environementalProcessID; +EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() { + return _environementalProcessID; } -const EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() const -{ - return _environementalProcessID; +const EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() const { + return _environementalProcessID; } -void EnvironmentalProcessPdu::setEnvironementalProcessID(const EntityID &pX) -{ - _environementalProcessID = pX; +void EnvironmentalProcessPdu::setEnvironementalProcessID(const EntityID& pX) { + _environementalProcessID = pX; } -EntityType& EnvironmentalProcessPdu::getEnvironmentType() -{ - return _environmentType; +EntityType& EnvironmentalProcessPdu::getEnvironmentType() { + return _environmentType; } -const EntityType& EnvironmentalProcessPdu::getEnvironmentType() const -{ - return _environmentType; +const EntityType& EnvironmentalProcessPdu::getEnvironmentType() const { + return _environmentType; } -void EnvironmentalProcessPdu::setEnvironmentType(const EntityType &pX) -{ - _environmentType = pX; +void EnvironmentalProcessPdu::setEnvironmentType(const EntityType& pX) { + _environmentType = pX; } -unsigned char EnvironmentalProcessPdu::getModelType() const -{ - return _modelType; +unsigned char EnvironmentalProcessPdu::getModelType() const { + return _modelType; } -void EnvironmentalProcessPdu::setModelType(unsigned char pX) -{ - _modelType = pX; +void EnvironmentalProcessPdu::setModelType(unsigned char pX) { + _modelType = pX; } -unsigned char EnvironmentalProcessPdu::getEnvironmentStatus() const -{ - return _environmentStatus; +unsigned char EnvironmentalProcessPdu::getEnvironmentStatus() const { + return _environmentStatus; } -void EnvironmentalProcessPdu::setEnvironmentStatus(unsigned char pX) -{ - _environmentStatus = pX; +void EnvironmentalProcessPdu::setEnvironmentStatus(unsigned char pX) { + _environmentStatus = pX; } -unsigned char EnvironmentalProcessPdu::getNumberOfEnvironmentRecords() const -{ - return _environmentRecords.size(); +unsigned char EnvironmentalProcessPdu::getNumberOfEnvironmentRecords() const { + return _environmentRecords.size(); } -unsigned short EnvironmentalProcessPdu::getSequenceNumber() const -{ - return _sequenceNumber; +unsigned short EnvironmentalProcessPdu::getSequenceNumber() const { + return _sequenceNumber; } -void EnvironmentalProcessPdu::setSequenceNumber(unsigned short pX) -{ - _sequenceNumber = pX; +void EnvironmentalProcessPdu::setSequenceNumber(unsigned short pX) { + _sequenceNumber = pX; } -std::vector& EnvironmentalProcessPdu::getEnvironmentRecords() -{ - return _environmentRecords; +std::vector& EnvironmentalProcessPdu::getEnvironmentRecords() { + return _environmentRecords; } -const std::vector& EnvironmentalProcessPdu::getEnvironmentRecords() const -{ - return _environmentRecords; +const std::vector& EnvironmentalProcessPdu::getEnvironmentRecords() + const { + return _environmentRecords; } -void EnvironmentalProcessPdu::setEnvironmentRecords(const std::vector& pX) -{ - _environmentRecords = pX; +void EnvironmentalProcessPdu::setEnvironmentRecords( + const std::vector& pX) { + _environmentRecords = pX; } -void EnvironmentalProcessPdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _environementalProcessID.marshal(dataStream); - _environmentType.marshal(dataStream); - dataStream << _modelType; - dataStream << _environmentStatus; - dataStream << ( unsigned char )_environmentRecords.size(); - dataStream << _sequenceNumber; - - for(size_t idx = 0; idx < _environmentRecords.size(); idx++) - { - Environment x = _environmentRecords[idx]; - x.marshal(dataStream); - } +void EnvironmentalProcessPdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _environementalProcessID.marshal(dataStream); + _environmentType.marshal(dataStream); + dataStream << _modelType; + dataStream << _environmentStatus; + dataStream << (unsigned char)_environmentRecords.size(); + dataStream << _sequenceNumber; + for (size_t idx = 0; idx < _environmentRecords.size(); idx++) { + Environment x = _environmentRecords[idx]; + x.marshal(dataStream); + } } -void EnvironmentalProcessPdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _environementalProcessID.unmarshal(dataStream); - _environmentType.unmarshal(dataStream); - dataStream >> _modelType; - dataStream >> _environmentStatus; - dataStream >> _numberOfEnvironmentRecords; - dataStream >> _sequenceNumber; +void EnvironmentalProcessPdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _environementalProcessID.unmarshal(dataStream); + _environmentType.unmarshal(dataStream); + dataStream >> _modelType; + dataStream >> _environmentStatus; + dataStream >> _numberOfEnvironmentRecords; + dataStream >> _sequenceNumber; - _environmentRecords.clear(); - for(size_t idx = 0; idx < _numberOfEnvironmentRecords; idx++) - { - Environment x; - x.unmarshal(dataStream); - _environmentRecords.push_back(x); - } + _environmentRecords.clear(); + for (size_t idx = 0; idx < _numberOfEnvironmentRecords; idx++) { + Environment x; + x.unmarshal(dataStream); + _environmentRecords.push_back(x); + } } +bool EnvironmentalProcessPdu::operator==( + const EnvironmentalProcessPdu& rhs) const { + bool ivarsEqual = true; -bool EnvironmentalProcessPdu::operator ==(const EnvironmentalProcessPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - if( ! (_environementalProcessID == rhs._environementalProcessID) ) ivarsEqual = false; - if( ! (_environmentType == rhs._environmentType) ) ivarsEqual = false; - if( ! (_modelType == rhs._modelType) ) ivarsEqual = false; - if( ! (_environmentStatus == rhs._environmentStatus) ) ivarsEqual = false; - if( ! (_sequenceNumber == rhs._sequenceNumber) ) ivarsEqual = false; + if (!(_environementalProcessID == rhs._environementalProcessID)) + ivarsEqual = false; + if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; + if (!(_modelType == rhs._modelType)) ivarsEqual = false; + if (!(_environmentStatus == rhs._environmentStatus)) ivarsEqual = false; + if (!(_sequenceNumber == rhs._sequenceNumber)) ivarsEqual = false; - for(size_t idx = 0; idx < _environmentRecords.size(); idx++) - { - if( ! ( _environmentRecords[idx] == rhs._environmentRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _environmentRecords.size(); idx++) { + if (!(_environmentRecords[idx] == rhs._environmentRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int EnvironmentalProcessPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EnvironmentalProcessPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _environementalProcessID.getMarshalledSize(); // _environementalProcessID - marshalSize = marshalSize + _environmentType.getMarshalledSize(); // _environmentType - marshalSize = marshalSize + 1; // _modelType - marshalSize = marshalSize + 1; // _environmentStatus - marshalSize = marshalSize + 1; // _numberOfEnvironmentRecords - marshalSize = marshalSize + 2; // _sequenceNumber + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + + _environementalProcessID.getMarshalledSize(); // _environementalProcessID + marshalSize = + marshalSize + _environmentType.getMarshalledSize(); // _environmentType + marshalSize = marshalSize + 1; // _modelType + marshalSize = marshalSize + 1; // _environmentStatus + marshalSize = marshalSize + 1; // _numberOfEnvironmentRecords + marshalSize = marshalSize + 2; // _sequenceNumber - for(unsigned long long idx=0; idx < _environmentRecords.size(); idx++) - { - Environment listElement = _environmentRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _environmentRecords.size(); idx++) { + Environment listElement = _environmentRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -196,7 +177,7 @@ int EnvironmentalProcessPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EnvironmentalProcessPdu.h b/src/dis6/EnvironmentalProcessPdu.h index 401792c4..f6ab8cbc 100644 --- a/src/dis6/EnvironmentalProcessPdu.h +++ b/src/dis6/EnvironmentalProcessPdu.h @@ -1,89 +1,90 @@ #pragma once +#include + #include #include #include -#include #include -#include #include +#include +namespace DIS { +// Section 5.3.11.1: Information about environmental effects and processes. This +// requires manual cleanup. the environmental record is variable, as is +// the padding. UNFINISHED -namespace DIS -{ -// Section 5.3.11.1: Information about environmental effects and processes. This requires manual cleanup. the environmental record is variable, as is the padding. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EnvironmentalProcessPdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS6_EXPORT EnvironmentalProcessPdu + : public SyntheticEnvironmentFamilyPdu { + protected: /** Environmental process ID */ - EntityID _environementalProcessID; + EntityID _environementalProcessID; /** Environment type */ - EntityType _environmentType; + EntityType _environmentType; /** model type */ - unsigned char _modelType; + unsigned char _modelType; /** Environment status */ - unsigned char _environmentStatus; + unsigned char _environmentStatus; /** number of environment records */ - unsigned char _numberOfEnvironmentRecords; + unsigned char _numberOfEnvironmentRecords; - /** PDU sequence number for the environmentla process if pdu sequencing required */ - unsigned short _sequenceNumber; + /** PDU sequence number for the environmentla process if pdu sequencing + * required */ + unsigned short _sequenceNumber; /** environemt records */ - std::vector _environmentRecords; - + std::vector _environmentRecords; public: - EnvironmentalProcessPdu(); - virtual ~EnvironmentalProcessPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + EnvironmentalProcessPdu(); + virtual ~EnvironmentalProcessPdu(); - EntityID& getEnvironementalProcessID(); - const EntityID& getEnvironementalProcessID() const; - void setEnvironementalProcessID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getEnvironmentType(); - const EntityType& getEnvironmentType() const; - void setEnvironmentType(const EntityType &pX); + EntityID& getEnvironementalProcessID(); + const EntityID& getEnvironementalProcessID() const; + void setEnvironementalProcessID(const EntityID& pX); - unsigned char getModelType() const; - void setModelType(unsigned char pX); + EntityType& getEnvironmentType(); + const EntityType& getEnvironmentType() const; + void setEnvironmentType(const EntityType& pX); - unsigned char getEnvironmentStatus() const; - void setEnvironmentStatus(unsigned char pX); + unsigned char getModelType() const; + void setModelType(unsigned char pX); - unsigned char getNumberOfEnvironmentRecords() const; + unsigned char getEnvironmentStatus() const; + void setEnvironmentStatus(unsigned char pX); - unsigned short getSequenceNumber() const; - void setSequenceNumber(unsigned short pX); + unsigned char getNumberOfEnvironmentRecords() const; - std::vector& getEnvironmentRecords(); - const std::vector& getEnvironmentRecords() const; - void setEnvironmentRecords(const std::vector& pX); + unsigned short getSequenceNumber() const; + void setSequenceNumber(unsigned short pX); + std::vector& getEnvironmentRecords(); + const std::vector& getEnvironmentRecords() const; + void setEnvironmentRecords(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const EnvironmentalProcessPdu& rhs) const; + bool operator==(const EnvironmentalProcessPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -96,7 +97,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EventID.cpp b/src/dis6/EventID.cpp index db198458..5422bbdb 100644 --- a/src/dis6/EventID.cpp +++ b/src/dis6/EventID.cpp @@ -2,89 +2,58 @@ using namespace DIS; +EventID::EventID() : _site(0), _application(0), _eventNumber(0) {} -EventID::EventID(): - _site(0), - _application(0), - _eventNumber(0) -{ -} +EventID::~EventID() {} -EventID::~EventID() -{ -} +unsigned short EventID::getSite() const { return _site; } -unsigned short EventID::getSite() const -{ - return _site; -} +void EventID::setSite(unsigned short pX) { _site = pX; } -void EventID::setSite(unsigned short pX) -{ - _site = pX; -} +unsigned short EventID::getApplication() const { return _application; } -unsigned short EventID::getApplication() const -{ - return _application; -} +void EventID::setApplication(unsigned short pX) { _application = pX; } -void EventID::setApplication(unsigned short pX) -{ - _application = pX; -} +unsigned short EventID::getEventNumber() const { return _eventNumber; } -unsigned short EventID::getEventNumber() const -{ - return _eventNumber; -} - -void EventID::setEventNumber(unsigned short pX) -{ - _eventNumber = pX; -} +void EventID::setEventNumber(unsigned short pX) { _eventNumber = pX; } -void EventID::marshal(DataStream& dataStream) const -{ - dataStream << _site; - dataStream << _application; - dataStream << _eventNumber; +void EventID::marshal(DataStream& dataStream) const { + dataStream << _site; + dataStream << _application; + dataStream << _eventNumber; } -void EventID::unmarshal(DataStream& dataStream) -{ - dataStream >> _site; - dataStream >> _application; - dataStream >> _eventNumber; +void EventID::unmarshal(DataStream& dataStream) { + dataStream >> _site; + dataStream >> _application; + dataStream >> _eventNumber; } +bool EventID::operator==(const EventID& rhs) const { + bool ivarsEqual = true; -bool EventID::operator ==(const EventID& rhs) const - { - bool ivarsEqual = true; + if (!(_site == rhs._site)) ivarsEqual = false; + if (!(_application == rhs._application)) ivarsEqual = false; + if (!(_eventNumber == rhs._eventNumber)) ivarsEqual = false; - if( ! (_site == rhs._site) ) ivarsEqual = false; - if( ! (_application == rhs._application) ) ivarsEqual = false; - if( ! (_eventNumber == rhs._eventNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EventID::getMarshalledSize() const -{ - int marshalSize = 0; +int EventID::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _eventNumber - return marshalSize; + marshalSize = marshalSize + 2; // _site + marshalSize = marshalSize + 2; // _application + marshalSize = marshalSize + 2; // _eventNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int EventID::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EventID.h b/src/dis6/EventID.h index 409f29f2..dd020ca6 100644 --- a/src/dis6/EventID.h +++ b/src/dis6/EventID.h @@ -1,58 +1,55 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.18. Identifies a unique event in a simulation via the combination +// of three values -namespace DIS -{ -// Section 5.2.18. Identifies a unique event in a simulation via the combination of three values - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EventID -{ -protected: +class OPENDIS6_EXPORT EventID { + protected: /** The site ID */ - unsigned short _site; + unsigned short _site; /** The application ID */ - unsigned short _application; + unsigned short _application; /** the number of the event */ - unsigned short _eventNumber; - + unsigned short _eventNumber; public: - EventID(); - virtual ~EventID(); + EventID(); + virtual ~EventID(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + unsigned short getSite() const; + void setSite(unsigned short pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + unsigned short getApplication() const; + void setApplication(unsigned short pX); - unsigned short getEventNumber() const; - void setEventNumber(unsigned short pX); + unsigned short getEventNumber() const; + void setEventNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EventID& rhs) const; + bool operator==(const EventID& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EventReportPdu.cpp b/src/dis6/EventReportPdu.cpp index 344248e7..f761578d 100644 --- a/src/dis6/EventReportPdu.cpp +++ b/src/dis6/EventReportPdu.cpp @@ -2,186 +2,148 @@ using namespace DIS; - -EventReportPdu::EventReportPdu() : SimulationManagementFamilyPdu(), - _eventType(0), - _padding1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 21 ); +EventReportPdu::EventReportPdu() + : SimulationManagementFamilyPdu(), + _eventType(0), + _padding1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(21); } -EventReportPdu::~EventReportPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +EventReportPdu::~EventReportPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int EventReportPdu::getEventType() const -{ - return _eventType; -} +unsigned int EventReportPdu::getEventType() const { return _eventType; } -void EventReportPdu::setEventType(unsigned int pX) -{ - _eventType = pX; -} +void EventReportPdu::setEventType(unsigned int pX) { _eventType = pX; } -unsigned int EventReportPdu::getPadding1() const -{ - return _padding1; -} +unsigned int EventReportPdu::getPadding1() const { return _padding1; } -void EventReportPdu::setPadding1(unsigned int pX) -{ - _padding1 = pX; -} +void EventReportPdu::setPadding1(unsigned int pX) { _padding1 = pX; } -unsigned int EventReportPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int EventReportPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int EventReportPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int EventReportPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& EventReportPdu::getFixedDatums() -{ - return _fixedDatums; +std::vector& EventReportPdu::getFixedDatums() { + return _fixedDatums; } -const std::vector& EventReportPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& EventReportPdu::getFixedDatums() const { + return _fixedDatums; } -void EventReportPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void EventReportPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& EventReportPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& EventReportPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& EventReportPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& EventReportPdu::getVariableDatums() const { + return _variableDatums; } -void EventReportPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void EventReportPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void EventReportPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _eventType; - dataStream << _padding1; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void EventReportPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _eventType; + dataStream << _padding1; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void EventReportPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _eventType; - dataStream >> _padding1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void EventReportPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _eventType; + dataStream >> _padding1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool EventReportPdu::operator ==(const EventReportPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_eventType == rhs._eventType) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool EventReportPdu::operator==(const EventReportPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_eventType == rhs._eventType)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int EventReportPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _eventType - marshalSize = marshalSize + 4; // _padding1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int EventReportPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _eventType + marshalSize = marshalSize + 4; // _padding1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +156,7 @@ int EventReportPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EventReportPdu.h b/src/dis6/EventReportPdu.h index 33635919..057c3ea6 100644 --- a/src/dis6/EventReportPdu.h +++ b/src/dis6/EventReportPdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.6.11. Reports occurance of a significant event to the simulation +// manager. COMPLETE -namespace DIS -{ -// Section 5.3.6.11. Reports occurance of a significant event to the simulation manager. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EventReportPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT EventReportPdu : public SimulationManagementFamilyPdu { + protected: /** Type of event */ - unsigned int _eventType; + unsigned int _eventType; /** padding */ - unsigned int _padding1; + unsigned int _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - EventReportPdu(); - virtual ~EventReportPdu(); + EventReportPdu(); + virtual ~EventReportPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getEventType() const; - void setEventType(unsigned int pX); + unsigned int getEventType() const; + void setEventType(unsigned int pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + unsigned int getPadding1() const; + void setPadding1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EventReportPdu& rhs) const; + bool operator==(const EventReportPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EventReportReliablePdu.cpp b/src/dis6/EventReportReliablePdu.cpp index 8e20cedf..c9ff41fe 100644 --- a/src/dis6/EventReportReliablePdu.cpp +++ b/src/dis6/EventReportReliablePdu.cpp @@ -2,186 +2,160 @@ using namespace DIS; - -EventReportReliablePdu::EventReportReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _eventType(0), - _pad1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 61 ); +EventReportReliablePdu::EventReportReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _eventType(0), + _pad1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(61); } -EventReportReliablePdu::~EventReportReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +EventReportReliablePdu::~EventReportReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned short EventReportReliablePdu::getEventType() const -{ - return _eventType; +unsigned short EventReportReliablePdu::getEventType() const { + return _eventType; } -void EventReportReliablePdu::setEventType(unsigned short pX) -{ - _eventType = pX; +void EventReportReliablePdu::setEventType(unsigned short pX) { + _eventType = pX; } -unsigned int EventReportReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned int EventReportReliablePdu::getPad1() const { return _pad1; } -void EventReportReliablePdu::setPad1(unsigned int pX) -{ - _pad1 = pX; -} +void EventReportReliablePdu::setPad1(unsigned int pX) { _pad1 = pX; } -unsigned int EventReportReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int EventReportReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int EventReportReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int EventReportReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& EventReportReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& EventReportReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& EventReportReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& EventReportReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void EventReportReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void EventReportReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& EventReportReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& EventReportReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& EventReportReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +EventReportReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void EventReportReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void EventReportReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void EventReportReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _eventType; - dataStream << _pad1; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } - +void EventReportReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _eventType; + dataStream << _pad1; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void EventReportReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _eventType; - dataStream >> _pad1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void EventReportReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _eventType; + dataStream >> _pad1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool EventReportReliablePdu::operator==( + const EventReportReliablePdu& rhs) const { + bool ivarsEqual = true; -bool EventReportReliablePdu::operator ==(const EventReportReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_eventType == rhs._eventType)) ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; - if( ! (_eventType == rhs._eventType) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int EventReportReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _eventType - marshalSize = marshalSize + 4; // _pad1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int EventReportReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _eventType + marshalSize = marshalSize + 4; // _pad1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +168,7 @@ int EventReportReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/EventReportReliablePdu.h b/src/dis6/EventReportReliablePdu.h index 62ddcb0e..f996cee3 100644 --- a/src/dis6/EventReportReliablePdu.h +++ b/src/dis6/EventReportReliablePdu.h @@ -1,80 +1,80 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.11: reports the occurance of a significatnt event to the +// simulation manager. Needs manual intervention to fix padding in variable +// datums. UNFINISHED. -namespace DIS -{ -// Section 5.3.12.11: reports the occurance of a significatnt event to the simulation manager. Needs manual intervention to fix padding in variable datums. UNFINISHED. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT EventReportReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT EventReportReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** Event type */ - unsigned short _eventType; + unsigned short _eventType; /** padding */ - unsigned int _pad1; + unsigned int _pad1; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - EventReportReliablePdu(); - virtual ~EventReportReliablePdu(); + EventReportReliablePdu(); + virtual ~EventReportReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + unsigned short getEventType() const; + void setEventType(unsigned short pX); - unsigned int getPad1() const; - void setPad1(unsigned int pX); + unsigned int getPad1() const; + void setPad1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EventReportReliablePdu& rhs) const; + bool operator==(const EventReportReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +87,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FastEntityStatePdu.cpp b/src/dis6/FastEntityStatePdu.cpp index 593cb115..7e082bc4 100644 --- a/src/dis6/FastEntityStatePdu.cpp +++ b/src/dis6/FastEntityStatePdu.cpp @@ -1,738 +1,527 @@ -#include #include -using namespace DIS; +#include +using namespace DIS; -FastEntityStatePdu::FastEntityStatePdu() : EntityInformationFamilyPdu(), - _site(0), - _application(0), - _entity(0), - _forceId(0), - _numberOfArticulationParameters(0), - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0), - _altEntityKind(0), - _altDomain(0), - _altCountry(0), - _altCategory(0), - _altSubcategory(0), - _altSpecific(0), - _altExtra(0), - _xVelocity(0.0), - _yVelocity(0.0), - _zVelocity(0.0), - _xLocation(0.0), - _yLocation(0.0), - _zLocation(0.0), - _psi(0.0), - _theta(0.0), - _phi(0.0), - _entityAppearance(0), - _deadReckoningAlgorithm(0), - _xAcceleration(0.0), - _yAcceleration(0.0), - _zAcceleration(0.0), - _xAngularVelocity(0.0), - _yAngularVelocity(0.0), - _zAngularVelocity(0.0), - _capabilities(0) -{ - setPduType( 1 ); - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 15; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - - // Initialize fixed length array - for(int lengthmarking= 0; lengthmarking < 12; lengthmarking++) - { - _marking[lengthmarking] = 0; - } +FastEntityStatePdu::FastEntityStatePdu() + : EntityInformationFamilyPdu(), + _site(0), + _application(0), + _entity(0), + _forceId(0), + _numberOfArticulationParameters(0), + _entityKind(0), + _domain(0), + _country(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0), + _altEntityKind(0), + _altDomain(0), + _altCountry(0), + _altCategory(0), + _altSubcategory(0), + _altSpecific(0), + _altExtra(0), + _xVelocity(0.0), + _yVelocity(0.0), + _zVelocity(0.0), + _xLocation(0.0), + _yLocation(0.0), + _zLocation(0.0), + _psi(0.0), + _theta(0.0), + _phi(0.0), + _entityAppearance(0), + _deadReckoningAlgorithm(0), + _xAcceleration(0.0), + _yAcceleration(0.0), + _zAcceleration(0.0), + _xAngularVelocity(0.0), + _yAngularVelocity(0.0), + _zAngularVelocity(0.0), + _capabilities(0) { + setPduType(1); + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 15; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } + // Initialize fixed length array + for (int lengthmarking = 0; lengthmarking < 12; lengthmarking++) { + _marking[lengthmarking] = 0; + } } -FastEntityStatePdu::~FastEntityStatePdu() -{ - _articulationParameters.clear(); -} +FastEntityStatePdu::~FastEntityStatePdu() { _articulationParameters.clear(); } -unsigned short FastEntityStatePdu::getSite() const -{ - return _site; -} +unsigned short FastEntityStatePdu::getSite() const { return _site; } -void FastEntityStatePdu::setSite(unsigned short pX) -{ - _site = pX; -} +void FastEntityStatePdu::setSite(unsigned short pX) { _site = pX; } -unsigned short FastEntityStatePdu::getApplication() const -{ - return _application; +unsigned short FastEntityStatePdu::getApplication() const { + return _application; } -void FastEntityStatePdu::setApplication(unsigned short pX) -{ - _application = pX; +void FastEntityStatePdu::setApplication(unsigned short pX) { + _application = pX; } -unsigned short FastEntityStatePdu::getEntity() const -{ - return _entity; -} +unsigned short FastEntityStatePdu::getEntity() const { return _entity; } -void FastEntityStatePdu::setEntity(unsigned short pX) -{ - _entity = pX; -} +void FastEntityStatePdu::setEntity(unsigned short pX) { _entity = pX; } -unsigned char FastEntityStatePdu::getForceId() const -{ - return _forceId; -} - -void FastEntityStatePdu::setForceId(unsigned char pX) -{ - _forceId = pX; -} - -unsigned char FastEntityStatePdu::getNumberOfArticulationParameters() const -{ - return _articulationParameters.size(); -} +unsigned char FastEntityStatePdu::getForceId() const { return _forceId; } -unsigned char FastEntityStatePdu::getEntityKind() const -{ - return _entityKind; -} +void FastEntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } -void FastEntityStatePdu::setEntityKind(unsigned char pX) -{ - _entityKind = pX; +unsigned char FastEntityStatePdu::getNumberOfArticulationParameters() const { + return _articulationParameters.size(); } -unsigned char FastEntityStatePdu::getDomain() const -{ - return _domain; -} +unsigned char FastEntityStatePdu::getEntityKind() const { return _entityKind; } -void FastEntityStatePdu::setDomain(unsigned char pX) -{ - _domain = pX; -} +void FastEntityStatePdu::setEntityKind(unsigned char pX) { _entityKind = pX; } -unsigned short FastEntityStatePdu::getCountry() const -{ - return _country; -} +unsigned char FastEntityStatePdu::getDomain() const { return _domain; } -void FastEntityStatePdu::setCountry(unsigned short pX) -{ - _country = pX; -} +void FastEntityStatePdu::setDomain(unsigned char pX) { _domain = pX; } -unsigned char FastEntityStatePdu::getCategory() const -{ - return _category; -} +unsigned short FastEntityStatePdu::getCountry() const { return _country; } -void FastEntityStatePdu::setCategory(unsigned char pX) -{ - _category = pX; -} +void FastEntityStatePdu::setCountry(unsigned short pX) { _country = pX; } -unsigned char FastEntityStatePdu::getSubcategory() const -{ - return _subcategory; -} +unsigned char FastEntityStatePdu::getCategory() const { return _category; } -void FastEntityStatePdu::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +void FastEntityStatePdu::setCategory(unsigned char pX) { _category = pX; } -unsigned char FastEntityStatePdu::getSpecific() const -{ - return _specific; +unsigned char FastEntityStatePdu::getSubcategory() const { + return _subcategory; } -void FastEntityStatePdu::setSpecific(unsigned char pX) -{ - _specific = pX; -} +void FastEntityStatePdu::setSubcategory(unsigned char pX) { _subcategory = pX; } -unsigned char FastEntityStatePdu::getExtra() const -{ - return _extra; -} +unsigned char FastEntityStatePdu::getSpecific() const { return _specific; } -void FastEntityStatePdu::setExtra(unsigned char pX) -{ - _extra = pX; -} +void FastEntityStatePdu::setSpecific(unsigned char pX) { _specific = pX; } -unsigned char FastEntityStatePdu::getAltEntityKind() const -{ - return _altEntityKind; -} +unsigned char FastEntityStatePdu::getExtra() const { return _extra; } -void FastEntityStatePdu::setAltEntityKind(unsigned char pX) -{ - _altEntityKind = pX; -} +void FastEntityStatePdu::setExtra(unsigned char pX) { _extra = pX; } -unsigned char FastEntityStatePdu::getAltDomain() const -{ - return _altDomain; +unsigned char FastEntityStatePdu::getAltEntityKind() const { + return _altEntityKind; } -void FastEntityStatePdu::setAltDomain(unsigned char pX) -{ - _altDomain = pX; +void FastEntityStatePdu::setAltEntityKind(unsigned char pX) { + _altEntityKind = pX; } -unsigned short FastEntityStatePdu::getAltCountry() const -{ - return _altCountry; -} +unsigned char FastEntityStatePdu::getAltDomain() const { return _altDomain; } -void FastEntityStatePdu::setAltCountry(unsigned short pX) -{ - _altCountry = pX; -} +void FastEntityStatePdu::setAltDomain(unsigned char pX) { _altDomain = pX; } -unsigned char FastEntityStatePdu::getAltCategory() const -{ - return _altCategory; -} +unsigned short FastEntityStatePdu::getAltCountry() const { return _altCountry; } -void FastEntityStatePdu::setAltCategory(unsigned char pX) -{ - _altCategory = pX; -} +void FastEntityStatePdu::setAltCountry(unsigned short pX) { _altCountry = pX; } -unsigned char FastEntityStatePdu::getAltSubcategory() const -{ - return _altSubcategory; +unsigned char FastEntityStatePdu::getAltCategory() const { + return _altCategory; } -void FastEntityStatePdu::setAltSubcategory(unsigned char pX) -{ - _altSubcategory = pX; -} +void FastEntityStatePdu::setAltCategory(unsigned char pX) { _altCategory = pX; } -unsigned char FastEntityStatePdu::getAltSpecific() const -{ - return _altSpecific; +unsigned char FastEntityStatePdu::getAltSubcategory() const { + return _altSubcategory; } -void FastEntityStatePdu::setAltSpecific(unsigned char pX) -{ - _altSpecific = pX; +void FastEntityStatePdu::setAltSubcategory(unsigned char pX) { + _altSubcategory = pX; } -unsigned char FastEntityStatePdu::getAltExtra() const -{ - return _altExtra; +unsigned char FastEntityStatePdu::getAltSpecific() const { + return _altSpecific; } -void FastEntityStatePdu::setAltExtra(unsigned char pX) -{ - _altExtra = pX; -} +void FastEntityStatePdu::setAltSpecific(unsigned char pX) { _altSpecific = pX; } -float FastEntityStatePdu::getXVelocity() const -{ - return _xVelocity; -} +unsigned char FastEntityStatePdu::getAltExtra() const { return _altExtra; } -void FastEntityStatePdu::setXVelocity(float pX) -{ - _xVelocity = pX; -} +void FastEntityStatePdu::setAltExtra(unsigned char pX) { _altExtra = pX; } -float FastEntityStatePdu::getYVelocity() const -{ - return _yVelocity; -} +float FastEntityStatePdu::getXVelocity() const { return _xVelocity; } -void FastEntityStatePdu::setYVelocity(float pX) -{ - _yVelocity = pX; -} +void FastEntityStatePdu::setXVelocity(float pX) { _xVelocity = pX; } -float FastEntityStatePdu::getZVelocity() const -{ - return _zVelocity; -} +float FastEntityStatePdu::getYVelocity() const { return _yVelocity; } -void FastEntityStatePdu::setZVelocity(float pX) -{ - _zVelocity = pX; -} +void FastEntityStatePdu::setYVelocity(float pX) { _yVelocity = pX; } -double FastEntityStatePdu::getXLocation() const -{ - return _xLocation; -} +float FastEntityStatePdu::getZVelocity() const { return _zVelocity; } -void FastEntityStatePdu::setXLocation(double pX) -{ - _xLocation = pX; -} +void FastEntityStatePdu::setZVelocity(float pX) { _zVelocity = pX; } -double FastEntityStatePdu::getYLocation() const -{ - return _yLocation; -} +double FastEntityStatePdu::getXLocation() const { return _xLocation; } -void FastEntityStatePdu::setYLocation(double pX) -{ - _yLocation = pX; -} +void FastEntityStatePdu::setXLocation(double pX) { _xLocation = pX; } -double FastEntityStatePdu::getZLocation() const -{ - return _zLocation; -} +double FastEntityStatePdu::getYLocation() const { return _yLocation; } -void FastEntityStatePdu::setZLocation(double pX) -{ - _zLocation = pX; -} +void FastEntityStatePdu::setYLocation(double pX) { _yLocation = pX; } -float FastEntityStatePdu::getPsi() const -{ - return _psi; -} +double FastEntityStatePdu::getZLocation() const { return _zLocation; } -void FastEntityStatePdu::setPsi(float pX) -{ - _psi = pX; -} +void FastEntityStatePdu::setZLocation(double pX) { _zLocation = pX; } -float FastEntityStatePdu::getTheta() const -{ - return _theta; -} +float FastEntityStatePdu::getPsi() const { return _psi; } -void FastEntityStatePdu::setTheta(float pX) -{ - _theta = pX; -} +void FastEntityStatePdu::setPsi(float pX) { _psi = pX; } -float FastEntityStatePdu::getPhi() const -{ - return _phi; -} +float FastEntityStatePdu::getTheta() const { return _theta; } -void FastEntityStatePdu::setPhi(float pX) -{ - _phi = pX; -} +void FastEntityStatePdu::setTheta(float pX) { _theta = pX; } -int FastEntityStatePdu::getEntityAppearance() const -{ - return _entityAppearance; -} +float FastEntityStatePdu::getPhi() const { return _phi; } -void FastEntityStatePdu::setEntityAppearance(int pX) -{ - _entityAppearance = pX; -} +void FastEntityStatePdu::setPhi(float pX) { _phi = pX; } -unsigned char FastEntityStatePdu::getDeadReckoningAlgorithm() const -{ - return _deadReckoningAlgorithm; +int FastEntityStatePdu::getEntityAppearance() const { + return _entityAppearance; } -void FastEntityStatePdu::setDeadReckoningAlgorithm(unsigned char pX) -{ - _deadReckoningAlgorithm = pX; -} +void FastEntityStatePdu::setEntityAppearance(int pX) { _entityAppearance = pX; } -char* FastEntityStatePdu::getOtherParameters() -{ - return _otherParameters; +unsigned char FastEntityStatePdu::getDeadReckoningAlgorithm() const { + return _deadReckoningAlgorithm; } -const char* FastEntityStatePdu::getOtherParameters() const -{ - return _otherParameters; +void FastEntityStatePdu::setDeadReckoningAlgorithm(unsigned char pX) { + _deadReckoningAlgorithm = pX; } -void FastEntityStatePdu::setOtherParameters(const char* x) -{ - for(int i = 0; i < 15; i++) - { - _otherParameters[i] = x[i]; - } -} +char* FastEntityStatePdu::getOtherParameters() { return _otherParameters; } -float FastEntityStatePdu::getXAcceleration() const -{ - return _xAcceleration; +const char* FastEntityStatePdu::getOtherParameters() const { + return _otherParameters; } -void FastEntityStatePdu::setXAcceleration(float pX) -{ - _xAcceleration = pX; +void FastEntityStatePdu::setOtherParameters(const char* x) { + for (int i = 0; i < 15; i++) { + _otherParameters[i] = x[i]; + } } -float FastEntityStatePdu::getYAcceleration() const -{ - return _yAcceleration; -} +float FastEntityStatePdu::getXAcceleration() const { return _xAcceleration; } -void FastEntityStatePdu::setYAcceleration(float pX) -{ - _yAcceleration = pX; -} +void FastEntityStatePdu::setXAcceleration(float pX) { _xAcceleration = pX; } -float FastEntityStatePdu::getZAcceleration() const -{ - return _zAcceleration; -} +float FastEntityStatePdu::getYAcceleration() const { return _yAcceleration; } -void FastEntityStatePdu::setZAcceleration(float pX) -{ - _zAcceleration = pX; -} +void FastEntityStatePdu::setYAcceleration(float pX) { _yAcceleration = pX; } -float FastEntityStatePdu::getXAngularVelocity() const -{ - return _xAngularVelocity; -} +float FastEntityStatePdu::getZAcceleration() const { return _zAcceleration; } -void FastEntityStatePdu::setXAngularVelocity(float pX) -{ - _xAngularVelocity = pX; -} +void FastEntityStatePdu::setZAcceleration(float pX) { _zAcceleration = pX; } -float FastEntityStatePdu::getYAngularVelocity() const -{ - return _yAngularVelocity; +float FastEntityStatePdu::getXAngularVelocity() const { + return _xAngularVelocity; } -void FastEntityStatePdu::setYAngularVelocity(float pX) -{ - _yAngularVelocity = pX; +void FastEntityStatePdu::setXAngularVelocity(float pX) { + _xAngularVelocity = pX; } -float FastEntityStatePdu::getZAngularVelocity() const -{ - return _zAngularVelocity; +float FastEntityStatePdu::getYAngularVelocity() const { + return _yAngularVelocity; } -void FastEntityStatePdu::setZAngularVelocity(float pX) -{ - _zAngularVelocity = pX; +void FastEntityStatePdu::setYAngularVelocity(float pX) { + _yAngularVelocity = pX; } -char* FastEntityStatePdu::getMarking() -{ - return _marking; +float FastEntityStatePdu::getZAngularVelocity() const { + return _zAngularVelocity; } -const char* FastEntityStatePdu::getMarking() const -{ - return _marking; +void FastEntityStatePdu::setZAngularVelocity(float pX) { + _zAngularVelocity = pX; } -void FastEntityStatePdu::setMarking(const char* x) -{ - for(int i = 0; i < 12; i++) - { - _marking[i] = x[i]; - } -} +char* FastEntityStatePdu::getMarking() { return _marking; } -// An alternate method to set the value if this could be a string. This is not strictly comnpliant with the DIS standard. -void FastEntityStatePdu::setByStringMarking(const char* x) -{ - std::strncpy(_marking, x, 12-1); - _marking[12 -1] = '\0'; -} +const char* FastEntityStatePdu::getMarking() const { return _marking; } -int FastEntityStatePdu::getCapabilities() const -{ - return _capabilities; +void FastEntityStatePdu::setMarking(const char* x) { + for (int i = 0; i < 12; i++) { + _marking[i] = x[i]; + } } -void FastEntityStatePdu::setCapabilities(int pX) -{ - _capabilities = pX; +// An alternate method to set the value if this could be a string. This is not +// strictly comnpliant with the DIS standard. +void FastEntityStatePdu::setByStringMarking(const char* x) { + std::strncpy(_marking, x, 12 - 1); + _marking[12 - 1] = '\0'; } -std::vector& FastEntityStatePdu::getArticulationParameters() -{ - return _articulationParameters; -} +int FastEntityStatePdu::getCapabilities() const { return _capabilities; } -const std::vector& FastEntityStatePdu::getArticulationParameters() const -{ - return _articulationParameters; -} +void FastEntityStatePdu::setCapabilities(int pX) { _capabilities = pX; } -void FastEntityStatePdu::setArticulationParameters(const std::vector& pX) -{ - _articulationParameters = pX; +std::vector& +FastEntityStatePdu::getArticulationParameters() { + return _articulationParameters; } -void FastEntityStatePdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _site; - dataStream << _application; - dataStream << _entity; - dataStream << _forceId; - dataStream << ( char )_articulationParameters.size(); - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; - dataStream << _altEntityKind; - dataStream << _altDomain; - dataStream << _altCountry; - dataStream << _altCategory; - dataStream << _altSubcategory; - dataStream << _altSpecific; - dataStream << _altExtra; - dataStream << _xVelocity; - dataStream << _yVelocity; - dataStream << _zVelocity; - dataStream << _xLocation; - dataStream << _yLocation; - dataStream << _zLocation; - dataStream << _psi; - dataStream << _theta; - dataStream << _phi; - dataStream << _entityAppearance; - dataStream << _deadReckoningAlgorithm; - - for(size_t idx = 0; idx < 15; idx++) - { - dataStream << _otherParameters[idx]; - } - - dataStream << _xAcceleration; - dataStream << _yAcceleration; - dataStream << _zAcceleration; - dataStream << _xAngularVelocity; - dataStream << _yAngularVelocity; - dataStream << _zAngularVelocity; - - for(size_t idx = 0; idx < 12; idx++) - { - dataStream << _marking[idx]; - } - - dataStream << _capabilities; - - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter x = _articulationParameters[idx]; - x.marshal(dataStream); - } - +const std::vector& +FastEntityStatePdu::getArticulationParameters() const { + return _articulationParameters; } -void FastEntityStatePdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _site; - dataStream >> _application; - dataStream >> _entity; - dataStream >> _forceId; - dataStream >> _numberOfArticulationParameters; - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; - dataStream >> _altEntityKind; - dataStream >> _altDomain; - dataStream >> _altCountry; - dataStream >> _altCategory; - dataStream >> _altSubcategory; - dataStream >> _altSpecific; - dataStream >> _altExtra; - dataStream >> _xVelocity; - dataStream >> _yVelocity; - dataStream >> _zVelocity; - dataStream >> _xLocation; - dataStream >> _yLocation; - dataStream >> _zLocation; - dataStream >> _psi; - dataStream >> _theta; - dataStream >> _phi; - dataStream >> _entityAppearance; - dataStream >> _deadReckoningAlgorithm; - - for(size_t idx = 0; idx < 15; idx++) - { - dataStream >> _otherParameters[idx]; - } - - dataStream >> _xAcceleration; - dataStream >> _yAcceleration; - dataStream >> _zAcceleration; - dataStream >> _xAngularVelocity; - dataStream >> _yAngularVelocity; - dataStream >> _zAngularVelocity; - - for(size_t idx = 0; idx < 12; idx++) - { - dataStream >> _marking[idx]; - } - - dataStream >> _capabilities; - - _articulationParameters.clear(); - for(unsigned char idx = 0; idx < _numberOfArticulationParameters; idx++) - { - ArticulationParameter x; - x.unmarshal(dataStream); - _articulationParameters.push_back(x); - } +void FastEntityStatePdu::setArticulationParameters( + const std::vector& pX) { + _articulationParameters = pX; } - -bool FastEntityStatePdu::operator ==(const FastEntityStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_site == rhs._site) ) ivarsEqual = false; - if( ! (_application == rhs._application) ) ivarsEqual = false; - if( ! (_entity == rhs._entity) ) ivarsEqual = false; - if( ! (_forceId == rhs._forceId) ) ivarsEqual = false; - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - if( ! (_altEntityKind == rhs._altEntityKind) ) ivarsEqual = false; - if( ! (_altDomain == rhs._altDomain) ) ivarsEqual = false; - if( ! (_altCountry == rhs._altCountry) ) ivarsEqual = false; - if( ! (_altCategory == rhs._altCategory) ) ivarsEqual = false; - if( ! (_altSubcategory == rhs._altSubcategory) ) ivarsEqual = false; - if( ! (_altSpecific == rhs._altSpecific) ) ivarsEqual = false; - if( ! (_altExtra == rhs._altExtra) ) ivarsEqual = false; - if( ! (_xVelocity == rhs._xVelocity) ) ivarsEqual = false; - if( ! (_yVelocity == rhs._yVelocity) ) ivarsEqual = false; - if( ! (_zVelocity == rhs._zVelocity) ) ivarsEqual = false; - if( ! (_xLocation == rhs._xLocation) ) ivarsEqual = false; - if( ! (_yLocation == rhs._yLocation) ) ivarsEqual = false; - if( ! (_zLocation == rhs._zLocation) ) ivarsEqual = false; - if( ! (_psi == rhs._psi) ) ivarsEqual = false; - if( ! (_theta == rhs._theta) ) ivarsEqual = false; - if( ! (_phi == rhs._phi) ) ivarsEqual = false; - if( ! (_entityAppearance == rhs._entityAppearance) ) ivarsEqual = false; - if( ! (_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm) ) ivarsEqual = false; - - for(unsigned char idx = 0; idx < 15; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - if( ! (_xAcceleration == rhs._xAcceleration) ) ivarsEqual = false; - if( ! (_yAcceleration == rhs._yAcceleration) ) ivarsEqual = false; - if( ! (_zAcceleration == rhs._zAcceleration) ) ivarsEqual = false; - if( ! (_xAngularVelocity == rhs._xAngularVelocity) ) ivarsEqual = false; - if( ! (_yAngularVelocity == rhs._yAngularVelocity) ) ivarsEqual = false; - if( ! (_zAngularVelocity == rhs._zAngularVelocity) ) ivarsEqual = false; - - for(unsigned char idx = 0; idx < 12; idx++) - { - if(!(_marking[idx] == rhs._marking[idx]) ) ivarsEqual = false; - } - - if( ! (_capabilities == rhs._capabilities) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _articulationParameters.size(); idx++) - { - if( ! ( _articulationParameters[idx] == rhs._articulationParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int FastEntityStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _entity - marshalSize = marshalSize + 1; // _forceId - marshalSize = marshalSize + 1; // _numberOfArticulationParameters - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - marshalSize = marshalSize + 1; // _altEntityKind - marshalSize = marshalSize + 1; // _altDomain - marshalSize = marshalSize + 2; // _altCountry - marshalSize = marshalSize + 1; // _altCategory - marshalSize = marshalSize + 1; // _altSubcategory - marshalSize = marshalSize + 1; // _altSpecific - marshalSize = marshalSize + 1; // _altExtra - marshalSize = marshalSize + 4; // _xVelocity - marshalSize = marshalSize + 4; // _yVelocity - marshalSize = marshalSize + 4; // _zVelocity - marshalSize = marshalSize + 8; // _xLocation - marshalSize = marshalSize + 8; // _yLocation - marshalSize = marshalSize + 8; // _zLocation - marshalSize = marshalSize + 4; // _psi - marshalSize = marshalSize + 4; // _theta - marshalSize = marshalSize + 4; // _phi - marshalSize = marshalSize + 4; // _entityAppearance - marshalSize = marshalSize + 1; // _deadReckoningAlgorithm - marshalSize = marshalSize + 15 * 1; // _otherParameters - marshalSize = marshalSize + 4; // _xAcceleration - marshalSize = marshalSize + 4; // _yAcceleration - marshalSize = marshalSize + 4; // _zAcceleration - marshalSize = marshalSize + 4; // _xAngularVelocity - marshalSize = marshalSize + 4; // _yAngularVelocity - marshalSize = marshalSize + 4; // _zAngularVelocity - marshalSize = marshalSize + 12 * 1; // _marking - marshalSize = marshalSize + 4; // _capabilities - - for(unsigned long long idx=0; idx < _articulationParameters.size(); idx++) - { - ArticulationParameter listElement = _articulationParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; +void FastEntityStatePdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _site; + dataStream << _application; + dataStream << _entity; + dataStream << _forceId; + dataStream << (char)_articulationParameters.size(); + dataStream << _entityKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; + dataStream << _altEntityKind; + dataStream << _altDomain; + dataStream << _altCountry; + dataStream << _altCategory; + dataStream << _altSubcategory; + dataStream << _altSpecific; + dataStream << _altExtra; + dataStream << _xVelocity; + dataStream << _yVelocity; + dataStream << _zVelocity; + dataStream << _xLocation; + dataStream << _yLocation; + dataStream << _zLocation; + dataStream << _psi; + dataStream << _theta; + dataStream << _phi; + dataStream << _entityAppearance; + dataStream << _deadReckoningAlgorithm; + + for (size_t idx = 0; idx < 15; idx++) { + dataStream << _otherParameters[idx]; + } + + dataStream << _xAcceleration; + dataStream << _yAcceleration; + dataStream << _zAcceleration; + dataStream << _xAngularVelocity; + dataStream << _yAngularVelocity; + dataStream << _zAngularVelocity; + + for (size_t idx = 0; idx < 12; idx++) { + dataStream << _marking[idx]; + } + + dataStream << _capabilities; + + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + ArticulationParameter x = _articulationParameters[idx]; + x.marshal(dataStream); + } +} + +void FastEntityStatePdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _site; + dataStream >> _application; + dataStream >> _entity; + dataStream >> _forceId; + dataStream >> _numberOfArticulationParameters; + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; + dataStream >> _altEntityKind; + dataStream >> _altDomain; + dataStream >> _altCountry; + dataStream >> _altCategory; + dataStream >> _altSubcategory; + dataStream >> _altSpecific; + dataStream >> _altExtra; + dataStream >> _xVelocity; + dataStream >> _yVelocity; + dataStream >> _zVelocity; + dataStream >> _xLocation; + dataStream >> _yLocation; + dataStream >> _zLocation; + dataStream >> _psi; + dataStream >> _theta; + dataStream >> _phi; + dataStream >> _entityAppearance; + dataStream >> _deadReckoningAlgorithm; + + for (size_t idx = 0; idx < 15; idx++) { + dataStream >> _otherParameters[idx]; + } + + dataStream >> _xAcceleration; + dataStream >> _yAcceleration; + dataStream >> _zAcceleration; + dataStream >> _xAngularVelocity; + dataStream >> _yAngularVelocity; + dataStream >> _zAngularVelocity; + + for (size_t idx = 0; idx < 12; idx++) { + dataStream >> _marking[idx]; + } + + dataStream >> _capabilities; + + _articulationParameters.clear(); + for (unsigned char idx = 0; idx < _numberOfArticulationParameters; idx++) { + ArticulationParameter x; + x.unmarshal(dataStream); + _articulationParameters.push_back(x); + } +} + +bool FastEntityStatePdu::operator==(const FastEntityStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + + if (!(_site == rhs._site)) ivarsEqual = false; + if (!(_application == rhs._application)) ivarsEqual = false; + if (!(_entity == rhs._entity)) ivarsEqual = false; + if (!(_forceId == rhs._forceId)) ivarsEqual = false; + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + if (!(_altEntityKind == rhs._altEntityKind)) ivarsEqual = false; + if (!(_altDomain == rhs._altDomain)) ivarsEqual = false; + if (!(_altCountry == rhs._altCountry)) ivarsEqual = false; + if (!(_altCategory == rhs._altCategory)) ivarsEqual = false; + if (!(_altSubcategory == rhs._altSubcategory)) ivarsEqual = false; + if (!(_altSpecific == rhs._altSpecific)) ivarsEqual = false; + if (!(_altExtra == rhs._altExtra)) ivarsEqual = false; + if (!(_xVelocity == rhs._xVelocity)) ivarsEqual = false; + if (!(_yVelocity == rhs._yVelocity)) ivarsEqual = false; + if (!(_zVelocity == rhs._zVelocity)) ivarsEqual = false; + if (!(_xLocation == rhs._xLocation)) ivarsEqual = false; + if (!(_yLocation == rhs._yLocation)) ivarsEqual = false; + if (!(_zLocation == rhs._zLocation)) ivarsEqual = false; + if (!(_psi == rhs._psi)) ivarsEqual = false; + if (!(_theta == rhs._theta)) ivarsEqual = false; + if (!(_phi == rhs._phi)) ivarsEqual = false; + if (!(_entityAppearance == rhs._entityAppearance)) ivarsEqual = false; + if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) + ivarsEqual = false; + + for (unsigned char idx = 0; idx < 15; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } + + if (!(_xAcceleration == rhs._xAcceleration)) ivarsEqual = false; + if (!(_yAcceleration == rhs._yAcceleration)) ivarsEqual = false; + if (!(_zAcceleration == rhs._zAcceleration)) ivarsEqual = false; + if (!(_xAngularVelocity == rhs._xAngularVelocity)) ivarsEqual = false; + if (!(_yAngularVelocity == rhs._yAngularVelocity)) ivarsEqual = false; + if (!(_zAngularVelocity == rhs._zAngularVelocity)) ivarsEqual = false; + + for (unsigned char idx = 0; idx < 12; idx++) { + if (!(_marking[idx] == rhs._marking[idx])) ivarsEqual = false; + } + + if (!(_capabilities == rhs._capabilities)) ivarsEqual = false; + + for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { + if (!(_articulationParameters[idx] == rhs._articulationParameters[idx])) + ivarsEqual = false; + } + + return ivarsEqual; +} + +int FastEntityStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _site + marshalSize = marshalSize + 2; // _application + marshalSize = marshalSize + 2; // _entity + marshalSize = marshalSize + 1; // _forceId + marshalSize = marshalSize + 1; // _numberOfArticulationParameters + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + marshalSize = marshalSize + 1; // _altEntityKind + marshalSize = marshalSize + 1; // _altDomain + marshalSize = marshalSize + 2; // _altCountry + marshalSize = marshalSize + 1; // _altCategory + marshalSize = marshalSize + 1; // _altSubcategory + marshalSize = marshalSize + 1; // _altSpecific + marshalSize = marshalSize + 1; // _altExtra + marshalSize = marshalSize + 4; // _xVelocity + marshalSize = marshalSize + 4; // _yVelocity + marshalSize = marshalSize + 4; // _zVelocity + marshalSize = marshalSize + 8; // _xLocation + marshalSize = marshalSize + 8; // _yLocation + marshalSize = marshalSize + 8; // _zLocation + marshalSize = marshalSize + 4; // _psi + marshalSize = marshalSize + 4; // _theta + marshalSize = marshalSize + 4; // _phi + marshalSize = marshalSize + 4; // _entityAppearance + marshalSize = marshalSize + 1; // _deadReckoningAlgorithm + marshalSize = marshalSize + 15 * 1; // _otherParameters + marshalSize = marshalSize + 4; // _xAcceleration + marshalSize = marshalSize + 4; // _yAcceleration + marshalSize = marshalSize + 4; // _zAcceleration + marshalSize = marshalSize + 4; // _xAngularVelocity + marshalSize = marshalSize + 4; // _yAngularVelocity + marshalSize = marshalSize + 4; // _zAngularVelocity + marshalSize = marshalSize + 12 * 1; // _marking + marshalSize = marshalSize + 4; // _capabilities + + for (unsigned long long idx = 0; idx < _articulationParameters.size(); + idx++) { + ArticulationParameter listElement = _articulationParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -745,7 +534,7 @@ int FastEntityStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FastEntityStatePdu.h b/src/dis6/FastEntityStatePdu.h index f1094477..2b899b19 100644 --- a/src/dis6/FastEntityStatePdu.h +++ b/src/dis6/FastEntityStatePdu.h @@ -1,281 +1,282 @@ #pragma once -#include #include + +#include #include -#include #include +#include +namespace DIS { +// Section 5.3.3.1. Represents the postion and state of one entity in the world. +// This is identical in function to entity state pdu, but generates less garbage +// to collect in the Java world. COMPLETE -namespace DIS -{ -// Section 5.3.3.1. Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu -{ -protected: +class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { + protected: /** The site ID */ - unsigned short _site; + unsigned short _site; /** The application ID */ - unsigned short _application; + unsigned short _application; /** the entity ID */ - unsigned short _entity; + unsigned short _entity; /** what force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + unsigned char _forceId; /** How many articulation parameters are in the variable length list */ unsigned char _numberOfArticulationParameters; /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; + unsigned char _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + unsigned char _specific; - unsigned char _extra; + unsigned char _extra; /** Kind of entity */ - unsigned char _altEntityKind; + unsigned char _altEntityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _altDomain; + unsigned char _altDomain; /** country to which the design of the entity is attributed */ - unsigned short _altCountry; + unsigned short _altCountry; /** category of entity */ - unsigned char _altCategory; + unsigned char _altCategory; /** subcategory of entity */ - unsigned char _altSubcategory; + unsigned char _altSubcategory; /** specific info based on subcategory field */ - unsigned char _altSpecific; + unsigned char _altSpecific; - unsigned char _altExtra; + unsigned char _altExtra; /** X velo */ - float _xVelocity; + float _xVelocity; /** y Value */ - float _yVelocity; + float _yVelocity; /** Z value */ - float _zVelocity; + float _zVelocity; /** X value */ - double _xLocation; + double _xLocation; /** y Value */ - double _yLocation; + double _yLocation; /** Z value */ - double _zLocation; + double _zLocation; - float _psi; + float _psi; - float _theta; + float _theta; - float _phi; + float _phi; - /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */ - int _entityAppearance; + /** a series of bit flags that are used to help draw the entity, such as + * smoking, on fire, etc. */ + int _entityAppearance; /** enumeration of what dead reckoning algorighm to use */ - unsigned char _deadReckoningAlgorithm; + unsigned char _deadReckoningAlgorithm; /** other parameters to use in the dead reckoning algorithm */ - char _otherParameters[15]; + char _otherParameters[15]; /** X value */ - float _xAcceleration; + float _xAcceleration; /** y Value */ - float _yAcceleration; + float _yAcceleration; /** Z value */ - float _zAcceleration; + float _zAcceleration; /** X value */ - float _xAngularVelocity; + float _xAngularVelocity; /** y Value */ - float _yAngularVelocity; + float _yAngularVelocity; /** Z value */ - float _zAngularVelocity; + float _zAngularVelocity; - /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */ - char _marking[12]; + /** characters that can be used for debugging, or to draw unique strings on + * the side of entities in the world */ + char _marking[12]; /** a series of bit flags */ - int _capabilities; + int _capabilities; /** variable length list of articulation parameters */ - std::vector _articulationParameters; - + std::vector _articulationParameters; public: - FastEntityStatePdu(); - virtual ~FastEntityStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + FastEntityStatePdu(); + virtual ~FastEntityStatePdu(); - unsigned short getSite() const; - void setSite(unsigned short pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + unsigned short getSite() const; + void setSite(unsigned short pX); - unsigned short getEntity() const; - void setEntity(unsigned short pX); + unsigned short getApplication() const; + void setApplication(unsigned short pX); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + unsigned short getEntity() const; + void setEntity(unsigned short pX); - unsigned char getNumberOfArticulationParameters() const; + unsigned char getForceId() const; + void setForceId(unsigned char pX); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + unsigned char getNumberOfArticulationParameters() const; - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getAltEntityKind() const; - void setAltEntityKind(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); - unsigned char getAltDomain() const; - void setAltDomain(unsigned char pX); + unsigned char getAltEntityKind() const; + void setAltEntityKind(unsigned char pX); - unsigned short getAltCountry() const; - void setAltCountry(unsigned short pX); + unsigned char getAltDomain() const; + void setAltDomain(unsigned char pX); - unsigned char getAltCategory() const; - void setAltCategory(unsigned char pX); + unsigned short getAltCountry() const; + void setAltCountry(unsigned short pX); - unsigned char getAltSubcategory() const; - void setAltSubcategory(unsigned char pX); + unsigned char getAltCategory() const; + void setAltCategory(unsigned char pX); - unsigned char getAltSpecific() const; - void setAltSpecific(unsigned char pX); + unsigned char getAltSubcategory() const; + void setAltSubcategory(unsigned char pX); - unsigned char getAltExtra() const; - void setAltExtra(unsigned char pX); + unsigned char getAltSpecific() const; + void setAltSpecific(unsigned char pX); - float getXVelocity() const; - void setXVelocity(float pX); + unsigned char getAltExtra() const; + void setAltExtra(unsigned char pX); - float getYVelocity() const; - void setYVelocity(float pX); + float getXVelocity() const; + void setXVelocity(float pX); - float getZVelocity() const; - void setZVelocity(float pX); + float getYVelocity() const; + void setYVelocity(float pX); - double getXLocation() const; - void setXLocation(double pX); + float getZVelocity() const; + void setZVelocity(float pX); - double getYLocation() const; - void setYLocation(double pX); + double getXLocation() const; + void setXLocation(double pX); - double getZLocation() const; - void setZLocation(double pX); + double getYLocation() const; + void setYLocation(double pX); - float getPsi() const; - void setPsi(float pX); + double getZLocation() const; + void setZLocation(double pX); - float getTheta() const; - void setTheta(float pX); + float getPsi() const; + void setPsi(float pX); - float getPhi() const; - void setPhi(float pX); + float getTheta() const; + void setTheta(float pX); - int getEntityAppearance() const; - void setEntityAppearance(int pX); + float getPhi() const; + void setPhi(float pX); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + int getEntityAppearance() const; + void setEntityAppearance(int pX); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + unsigned char getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(unsigned char pX); - float getXAcceleration() const; - void setXAcceleration(float pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); - float getYAcceleration() const; - void setYAcceleration(float pX); + float getXAcceleration() const; + void setXAcceleration(float pX); - float getZAcceleration() const; - void setZAcceleration(float pX); + float getYAcceleration() const; + void setYAcceleration(float pX); - float getXAngularVelocity() const; - void setXAngularVelocity(float pX); + float getZAcceleration() const; + void setZAcceleration(float pX); - float getYAngularVelocity() const; - void setYAngularVelocity(float pX); + float getXAngularVelocity() const; + void setXAngularVelocity(float pX); - float getZAngularVelocity() const; - void setZAngularVelocity(float pX); + float getYAngularVelocity() const; + void setYAngularVelocity(float pX); - char* getMarking(); - const char* getMarking() const; - void setMarking( const char* pX); - void setByStringMarking(const char* pX); + float getZAngularVelocity() const; + void setZAngularVelocity(float pX); - int getCapabilities() const; - void setCapabilities(int pX); + char* getMarking(); + const char* getMarking() const; + void setMarking(const char* pX); + void setByStringMarking(const char* pX); - std::vector& getArticulationParameters(); - const std::vector& getArticulationParameters() const; - void setArticulationParameters(const std::vector& pX); + int getCapabilities() const; + void setCapabilities(int pX); + std::vector& getArticulationParameters(); + const std::vector& getArticulationParameters() const; + void setArticulationParameters(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const FastEntityStatePdu& rhs) const; + bool operator==(const FastEntityStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -288,7 +289,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FirePdu.cpp b/src/dis6/FirePdu.cpp index 0780c3d0..edaf013a 100644 --- a/src/dis6/FirePdu.cpp +++ b/src/dis6/FirePdu.cpp @@ -2,180 +2,131 @@ using namespace DIS; - -FirePdu::FirePdu() : WarfareFamilyPdu(), - _munitionID(), - _eventID(), - _fireMissionIndex(0), - _locationInWorldCoordinates(), - _burstDescriptor(), - _velocity(), - _range(0.0) -{ - setPduType( 2 ); +FirePdu::FirePdu() + : WarfareFamilyPdu(), + _munitionID(), + _eventID(), + _fireMissionIndex(0), + _locationInWorldCoordinates(), + _burstDescriptor(), + _velocity(), + _range(0.0) { + setPduType(2); } -FirePdu::~FirePdu() -{ -} +FirePdu::~FirePdu() {} -EntityID& FirePdu::getMunitionID() -{ - return _munitionID; -} +EntityID& FirePdu::getMunitionID() { return _munitionID; } -const EntityID& FirePdu::getMunitionID() const -{ - return _munitionID; -} +const EntityID& FirePdu::getMunitionID() const { return _munitionID; } -void FirePdu::setMunitionID(const EntityID &pX) -{ - _munitionID = pX; -} +void FirePdu::setMunitionID(const EntityID& pX) { _munitionID = pX; } -EventID& FirePdu::getEventID() -{ - return _eventID; -} +EventID& FirePdu::getEventID() { return _eventID; } -const EventID& FirePdu::getEventID() const -{ - return _eventID; -} +const EventID& FirePdu::getEventID() const { return _eventID; } -void FirePdu::setEventID(const EventID &pX) -{ - _eventID = pX; -} +void FirePdu::setEventID(const EventID& pX) { _eventID = pX; } -int FirePdu::getFireMissionIndex() const -{ - return _fireMissionIndex; -} +int FirePdu::getFireMissionIndex() const { return _fireMissionIndex; } -void FirePdu::setFireMissionIndex(int pX) -{ - _fireMissionIndex = pX; -} +void FirePdu::setFireMissionIndex(int pX) { _fireMissionIndex = pX; } -Vector3Double& FirePdu::getLocationInWorldCoordinates() -{ - return _locationInWorldCoordinates; +Vector3Double& FirePdu::getLocationInWorldCoordinates() { + return _locationInWorldCoordinates; } -const Vector3Double& FirePdu::getLocationInWorldCoordinates() const -{ - return _locationInWorldCoordinates; +const Vector3Double& FirePdu::getLocationInWorldCoordinates() const { + return _locationInWorldCoordinates; } -void FirePdu::setLocationInWorldCoordinates(const Vector3Double &pX) -{ - _locationInWorldCoordinates = pX; +void FirePdu::setLocationInWorldCoordinates(const Vector3Double& pX) { + _locationInWorldCoordinates = pX; } -BurstDescriptor& FirePdu::getBurstDescriptor() -{ - return _burstDescriptor; -} +BurstDescriptor& FirePdu::getBurstDescriptor() { return _burstDescriptor; } -const BurstDescriptor& FirePdu::getBurstDescriptor() const -{ - return _burstDescriptor; +const BurstDescriptor& FirePdu::getBurstDescriptor() const { + return _burstDescriptor; } -void FirePdu::setBurstDescriptor(const BurstDescriptor &pX) -{ - _burstDescriptor = pX; +void FirePdu::setBurstDescriptor(const BurstDescriptor& pX) { + _burstDescriptor = pX; } -Vector3Float& FirePdu::getVelocity() -{ - return _velocity; -} +Vector3Float& FirePdu::getVelocity() { return _velocity; } -const Vector3Float& FirePdu::getVelocity() const -{ - return _velocity; -} +const Vector3Float& FirePdu::getVelocity() const { return _velocity; } -void FirePdu::setVelocity(const Vector3Float &pX) -{ - _velocity = pX; -} +void FirePdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -float FirePdu::getRange() const -{ - return _range; -} +float FirePdu::getRange() const { return _range; } -void FirePdu::setRange(float pX) -{ - _range = pX; +void FirePdu::setRange(float pX) { _range = pX; } + +void FirePdu::marshal(DataStream& dataStream) const { + WarfareFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _munitionID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _fireMissionIndex; + _locationInWorldCoordinates.marshal(dataStream); + _burstDescriptor.marshal(dataStream); + _velocity.marshal(dataStream); + dataStream << _range; } -void FirePdu::marshal(DataStream& dataStream) const -{ - WarfareFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _munitionID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _fireMissionIndex; - _locationInWorldCoordinates.marshal(dataStream); - _burstDescriptor.marshal(dataStream); - _velocity.marshal(dataStream); - dataStream << _range; +void FirePdu::unmarshal(DataStream& dataStream) { + WarfareFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _munitionID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _fireMissionIndex; + _locationInWorldCoordinates.unmarshal(dataStream); + _burstDescriptor.unmarshal(dataStream); + _velocity.unmarshal(dataStream); + dataStream >> _range; } -void FirePdu::unmarshal(DataStream& dataStream) -{ - WarfareFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _munitionID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _fireMissionIndex; - _locationInWorldCoordinates.unmarshal(dataStream); - _burstDescriptor.unmarshal(dataStream); - _velocity.unmarshal(dataStream); - dataStream >> _range; +bool FirePdu::operator==(const FirePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = WarfareFamilyPdu::operator==(rhs); + + if (!(_munitionID == rhs._munitionID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_fireMissionIndex == rhs._fireMissionIndex)) ivarsEqual = false; + if (!(_locationInWorldCoordinates == rhs._locationInWorldCoordinates)) + ivarsEqual = false; + if (!(_burstDescriptor == rhs._burstDescriptor)) ivarsEqual = false; + if (!(_velocity == rhs._velocity)) ivarsEqual = false; + if (!(_range == rhs._range)) ivarsEqual = false; + + return ivarsEqual; } +int FirePdu::getMarshalledSize() const { + int marshalSize = 0; -bool FirePdu::operator ==(const FirePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = WarfareFamilyPdu::operator==(rhs); - - if( ! (_munitionID == rhs._munitionID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_fireMissionIndex == rhs._fireMissionIndex) ) ivarsEqual = false; - if( ! (_locationInWorldCoordinates == rhs._locationInWorldCoordinates) ) ivarsEqual = false; - if( ! (_burstDescriptor == rhs._burstDescriptor) ) ivarsEqual = false; - if( ! (_velocity == rhs._velocity) ) ivarsEqual = false; - if( ! (_range == rhs._range) ) ivarsEqual = false; - - return ivarsEqual; - } - -int FirePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = WarfareFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _munitionID.getMarshalledSize(); // _munitionID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 4; // _fireMissionIndex - marshalSize = marshalSize + _locationInWorldCoordinates.getMarshalledSize(); // _locationInWorldCoordinates - marshalSize = marshalSize + _burstDescriptor.getMarshalledSize(); // _burstDescriptor - marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity - marshalSize = marshalSize + 4; // _range - return marshalSize; + marshalSize = WarfareFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _munitionID.getMarshalledSize(); // _munitionID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 4; // _fireMissionIndex + marshalSize = + marshalSize + _locationInWorldCoordinates + .getMarshalledSize(); // _locationInWorldCoordinates + marshalSize = + marshalSize + _burstDescriptor.getMarshalledSize(); // _burstDescriptor + marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity + marshalSize = marshalSize + 4; // _range + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -188,7 +139,7 @@ int FirePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FirePdu.h b/src/dis6/FirePdu.h index f5d28a76..02bf2238 100644 --- a/src/dis6/FirePdu.h +++ b/src/dis6/FirePdu.h @@ -1,92 +1,88 @@ #pragma once +#include #include #include #include -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Sectioin 5.3.4.1. Information about someone firing something. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT FirePdu : public WarfareFamilyPdu -{ -protected: +class OPENDIS6_EXPORT FirePdu : public WarfareFamilyPdu { + protected: /** ID of the munition that is being shot */ - EntityID _munitionID; + EntityID _munitionID; /** ID of event */ - EventID _eventID; + EventID _eventID; - int _fireMissionIndex; + int _fireMissionIndex; /** location of the firing event */ - Vector3Double _locationInWorldCoordinates; + Vector3Double _locationInWorldCoordinates; /** Describes munitions used in the firing event */ - BurstDescriptor _burstDescriptor; + BurstDescriptor _burstDescriptor; /** Velocity of the ammunition */ - Vector3Float _velocity; + Vector3Float _velocity; /** range to the target */ - float _range; - + float _range; public: - FirePdu(); - virtual ~FirePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + FirePdu(); + virtual ~FirePdu(); - EntityID& getMunitionID(); - const EntityID& getMunitionID() const; - void setMunitionID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EventID& getEventID(); - const EventID& getEventID() const; - void setEventID(const EventID &pX); + EntityID& getMunitionID(); + const EntityID& getMunitionID() const; + void setMunitionID(const EntityID& pX); - int getFireMissionIndex() const; - void setFireMissionIndex(int pX); + EventID& getEventID(); + const EventID& getEventID() const; + void setEventID(const EventID& pX); - Vector3Double& getLocationInWorldCoordinates(); - const Vector3Double& getLocationInWorldCoordinates() const; - void setLocationInWorldCoordinates(const Vector3Double &pX); + int getFireMissionIndex() const; + void setFireMissionIndex(int pX); - BurstDescriptor& getBurstDescriptor(); - const BurstDescriptor& getBurstDescriptor() const; - void setBurstDescriptor(const BurstDescriptor &pX); + Vector3Double& getLocationInWorldCoordinates(); + const Vector3Double& getLocationInWorldCoordinates() const; + void setLocationInWorldCoordinates(const Vector3Double& pX); - Vector3Float& getVelocity(); - const Vector3Float& getVelocity() const; - void setVelocity(const Vector3Float &pX); + BurstDescriptor& getBurstDescriptor(); + const BurstDescriptor& getBurstDescriptor() const; + void setBurstDescriptor(const BurstDescriptor& pX); - float getRange() const; - void setRange(float pX); + Vector3Float& getVelocity(); + const Vector3Float& getVelocity() const; + void setVelocity(const Vector3Float& pX); + float getRange() const; + void setRange(float pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const FirePdu& rhs) const; + bool operator==(const FirePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -99,7 +95,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FixedDatum.cpp b/src/dis6/FixedDatum.cpp index b285dbaf..195429d8 100644 --- a/src/dis6/FixedDatum.cpp +++ b/src/dis6/FixedDatum.cpp @@ -2,74 +2,50 @@ using namespace DIS; +FixedDatum::FixedDatum() : _fixedDatumID(0), _fixedDatumValue(0) {} -FixedDatum::FixedDatum(): - _fixedDatumID(0), - _fixedDatumValue(0) -{ -} +FixedDatum::~FixedDatum() {} -FixedDatum::~FixedDatum() -{ -} +unsigned int FixedDatum::getFixedDatumID() const { return _fixedDatumID; } -unsigned int FixedDatum::getFixedDatumID() const -{ - return _fixedDatumID; -} +void FixedDatum::setFixedDatumID(unsigned int pX) { _fixedDatumID = pX; } -void FixedDatum::setFixedDatumID(unsigned int pX) -{ - _fixedDatumID = pX; -} +unsigned int FixedDatum::getFixedDatumValue() const { return _fixedDatumValue; } -unsigned int FixedDatum::getFixedDatumValue() const -{ - return _fixedDatumValue; -} +void FixedDatum::setFixedDatumValue(unsigned int pX) { _fixedDatumValue = pX; } -void FixedDatum::setFixedDatumValue(unsigned int pX) -{ - _fixedDatumValue = pX; +void FixedDatum::marshal(DataStream& dataStream) const { + dataStream << _fixedDatumID; + dataStream << _fixedDatumValue; } -void FixedDatum::marshal(DataStream& dataStream) const -{ - dataStream << _fixedDatumID; - dataStream << _fixedDatumValue; -} - -void FixedDatum::unmarshal(DataStream& dataStream) -{ - dataStream >> _fixedDatumID; - dataStream >> _fixedDatumValue; +void FixedDatum::unmarshal(DataStream& dataStream) { + dataStream >> _fixedDatumID; + dataStream >> _fixedDatumValue; } +bool FixedDatum::operator==(const FixedDatum& rhs) const { + bool ivarsEqual = true; -bool FixedDatum::operator ==(const FixedDatum& rhs) const - { - bool ivarsEqual = true; + if (!(_fixedDatumID == rhs._fixedDatumID)) ivarsEqual = false; + if (!(_fixedDatumValue == rhs._fixedDatumValue)) ivarsEqual = false; - if( ! (_fixedDatumID == rhs._fixedDatumID) ) ivarsEqual = false; - if( ! (_fixedDatumValue == rhs._fixedDatumValue) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int FixedDatum::getMarshalledSize() const -{ - int marshalSize = 0; +int FixedDatum::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _fixedDatumID - marshalSize = marshalSize + 4; // _fixedDatumValue - return marshalSize; + marshalSize = marshalSize + 4; // _fixedDatumID + marshalSize = marshalSize + 4; // _fixedDatumValue + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int FixedDatum::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FixedDatum.h b/src/dis6/FixedDatum.h index 2bbe751b..f6a89210 100644 --- a/src/dis6/FixedDatum.h +++ b/src/dis6/FixedDatum.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.18. Fixed Datum Record -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT FixedDatum -{ -protected: +class OPENDIS6_EXPORT FixedDatum { + protected: /** ID of the fixed datum */ - unsigned int _fixedDatumID; + unsigned int _fixedDatumID; /** Value for the fixed datum */ - unsigned int _fixedDatumValue; - + unsigned int _fixedDatumValue; public: - FixedDatum(); - virtual ~FixedDatum(); + FixedDatum(); + virtual ~FixedDatum(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getFixedDatumID() const; - void setFixedDatumID(unsigned int pX); + unsigned int getFixedDatumID() const; + void setFixedDatumID(unsigned int pX); - unsigned int getFixedDatumValue() const; - void setFixedDatumValue(unsigned int pX); + unsigned int getFixedDatumValue() const; + void setFixedDatumValue(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FixedDatum& rhs) const; + bool operator==(const FixedDatum& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FourByteChunk.cpp b/src/dis6/FourByteChunk.cpp index 91d94d12..41afa438 100644 --- a/src/dis6/FourByteChunk.cpp +++ b/src/dis6/FourByteChunk.cpp @@ -2,87 +2,63 @@ using namespace DIS; - -FourByteChunk::FourByteChunk() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 4; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +FourByteChunk::FourByteChunk() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 4; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -FourByteChunk::~FourByteChunk() -{ -} +FourByteChunk::~FourByteChunk() {} -char* FourByteChunk::getOtherParameters() -{ - return _otherParameters; -} +char* FourByteChunk::getOtherParameters() { return _otherParameters; } -const char* FourByteChunk::getOtherParameters() const -{ - return _otherParameters; +const char* FourByteChunk::getOtherParameters() const { + return _otherParameters; } -void FourByteChunk::setOtherParameters(const char* x) -{ - for(int i = 0; i < 4; i++) - { - _otherParameters[i] = x[i]; - } +void FourByteChunk::setOtherParameters(const char* x) { + for (int i = 0; i < 4; i++) { + _otherParameters[i] = x[i]; + } } -void FourByteChunk::marshal(DataStream& dataStream) const -{ - - for(size_t idx = 0; idx < 4; idx++) - { - dataStream << _otherParameters[idx]; - } - +void FourByteChunk::marshal(DataStream& dataStream) const { + for (size_t idx = 0; idx < 4; idx++) { + dataStream << _otherParameters[idx]; + } } -void FourByteChunk::unmarshal(DataStream& dataStream) -{ - - for(size_t idx = 0; idx < 4; idx++) - { - dataStream >> _otherParameters[idx]; - } - +void FourByteChunk::unmarshal(DataStream& dataStream) { + for (size_t idx = 0; idx < 4; idx++) { + dataStream >> _otherParameters[idx]; + } } +bool FourByteChunk::operator==(const FourByteChunk& rhs) const { + bool ivarsEqual = true; -bool FourByteChunk::operator ==(const FourByteChunk& rhs) const - { - bool ivarsEqual = true; - + for (unsigned char idx = 0; idx < 4; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - for(unsigned char idx = 0; idx < 4; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int FourByteChunk::getMarshalledSize() const -{ - int marshalSize = 0; +int FourByteChunk::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4 * 1; // _otherParameters - return marshalSize; + marshalSize = marshalSize + 4 * 1; // _otherParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +71,7 @@ int FourByteChunk::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FourByteChunk.h b/src/dis6/FourByteChunk.h index 03ba046c..ff7fb27b 100644 --- a/src/dis6/FourByteChunk.h +++ b/src/dis6/FourByteChunk.h @@ -1,47 +1,43 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 32 bit piece of data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT FourByteChunk -{ -protected: +class OPENDIS6_EXPORT FourByteChunk { + protected: /** four bytes of arbitrary data */ - char _otherParameters[4]; - + char _otherParameters[4]; public: - FourByteChunk(); - virtual ~FourByteChunk(); + FourByteChunk(); + virtual ~FourByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FourByteChunk& rhs) const; + bool operator==(const FourByteChunk& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FundamentalParameterData.cpp b/src/dis6/FundamentalParameterData.cpp index 864c7999..b40b0249 100644 --- a/src/dis6/FundamentalParameterData.cpp +++ b/src/dis6/FundamentalParameterData.cpp @@ -2,194 +2,159 @@ using namespace DIS; +FundamentalParameterData::FundamentalParameterData() + : _frequency(0.0), + _frequencyRange(0.0), + _effectiveRadiatedPower(0.0), + _pulseRepetitionFrequency(0.0), + _pulseWidth(0.0), + _beamAzimuthCenter(0.0), + _beamAzimuthSweep(0.0), + _beamElevationCenter(0.0), + _beamElevationSweep(0.0), + _beamSweepSync(0.0) {} -FundamentalParameterData::FundamentalParameterData(): - _frequency(0.0), - _frequencyRange(0.0), - _effectiveRadiatedPower(0.0), - _pulseRepetitionFrequency(0.0), - _pulseWidth(0.0), - _beamAzimuthCenter(0.0), - _beamAzimuthSweep(0.0), - _beamElevationCenter(0.0), - _beamElevationSweep(0.0), - _beamSweepSync(0.0) -{ -} +FundamentalParameterData::~FundamentalParameterData() {} -FundamentalParameterData::~FundamentalParameterData() -{ -} +float FundamentalParameterData::getFrequency() const { return _frequency; } -float FundamentalParameterData::getFrequency() const -{ - return _frequency; -} +void FundamentalParameterData::setFrequency(float pX) { _frequency = pX; } -void FundamentalParameterData::setFrequency(float pX) -{ - _frequency = pX; +float FundamentalParameterData::getFrequencyRange() const { + return _frequencyRange; } -float FundamentalParameterData::getFrequencyRange() const -{ - return _frequencyRange; +void FundamentalParameterData::setFrequencyRange(float pX) { + _frequencyRange = pX; } -void FundamentalParameterData::setFrequencyRange(float pX) -{ - _frequencyRange = pX; +float FundamentalParameterData::getEffectiveRadiatedPower() const { + return _effectiveRadiatedPower; } -float FundamentalParameterData::getEffectiveRadiatedPower() const -{ - return _effectiveRadiatedPower; +void FundamentalParameterData::setEffectiveRadiatedPower(float pX) { + _effectiveRadiatedPower = pX; } -void FundamentalParameterData::setEffectiveRadiatedPower(float pX) -{ - _effectiveRadiatedPower = pX; +float FundamentalParameterData::getPulseRepetitionFrequency() const { + return _pulseRepetitionFrequency; } -float FundamentalParameterData::getPulseRepetitionFrequency() const -{ - return _pulseRepetitionFrequency; +void FundamentalParameterData::setPulseRepetitionFrequency(float pX) { + _pulseRepetitionFrequency = pX; } -void FundamentalParameterData::setPulseRepetitionFrequency(float pX) -{ - _pulseRepetitionFrequency = pX; -} +float FundamentalParameterData::getPulseWidth() const { return _pulseWidth; } -float FundamentalParameterData::getPulseWidth() const -{ - return _pulseWidth; -} +void FundamentalParameterData::setPulseWidth(float pX) { _pulseWidth = pX; } -void FundamentalParameterData::setPulseWidth(float pX) -{ - _pulseWidth = pX; +float FundamentalParameterData::getBeamAzimuthCenter() const { + return _beamAzimuthCenter; } -float FundamentalParameterData::getBeamAzimuthCenter() const -{ - return _beamAzimuthCenter; +void FundamentalParameterData::setBeamAzimuthCenter(float pX) { + _beamAzimuthCenter = pX; } -void FundamentalParameterData::setBeamAzimuthCenter(float pX) -{ - _beamAzimuthCenter = pX; +float FundamentalParameterData::getBeamAzimuthSweep() const { + return _beamAzimuthSweep; } -float FundamentalParameterData::getBeamAzimuthSweep() const -{ - return _beamAzimuthSweep; +void FundamentalParameterData::setBeamAzimuthSweep(float pX) { + _beamAzimuthSweep = pX; } -void FundamentalParameterData::setBeamAzimuthSweep(float pX) -{ - _beamAzimuthSweep = pX; +float FundamentalParameterData::getBeamElevationCenter() const { + return _beamElevationCenter; } -float FundamentalParameterData::getBeamElevationCenter() const -{ - return _beamElevationCenter; +void FundamentalParameterData::setBeamElevationCenter(float pX) { + _beamElevationCenter = pX; } -void FundamentalParameterData::setBeamElevationCenter(float pX) -{ - _beamElevationCenter = pX; +float FundamentalParameterData::getBeamElevationSweep() const { + return _beamElevationSweep; } -float FundamentalParameterData::getBeamElevationSweep() const -{ - return _beamElevationSweep; +void FundamentalParameterData::setBeamElevationSweep(float pX) { + _beamElevationSweep = pX; } -void FundamentalParameterData::setBeamElevationSweep(float pX) -{ - _beamElevationSweep = pX; +float FundamentalParameterData::getBeamSweepSync() const { + return _beamSweepSync; } -float FundamentalParameterData::getBeamSweepSync() const -{ - return _beamSweepSync; +void FundamentalParameterData::setBeamSweepSync(float pX) { + _beamSweepSync = pX; } -void FundamentalParameterData::setBeamSweepSync(float pX) -{ - _beamSweepSync = pX; +void FundamentalParameterData::marshal(DataStream& dataStream) const { + dataStream << _frequency; + dataStream << _frequencyRange; + dataStream << _effectiveRadiatedPower; + dataStream << _pulseRepetitionFrequency; + dataStream << _pulseWidth; + dataStream << _beamAzimuthCenter; + dataStream << _beamAzimuthSweep; + dataStream << _beamElevationCenter; + dataStream << _beamElevationSweep; + dataStream << _beamSweepSync; } -void FundamentalParameterData::marshal(DataStream& dataStream) const -{ - dataStream << _frequency; - dataStream << _frequencyRange; - dataStream << _effectiveRadiatedPower; - dataStream << _pulseRepetitionFrequency; - dataStream << _pulseWidth; - dataStream << _beamAzimuthCenter; - dataStream << _beamAzimuthSweep; - dataStream << _beamElevationCenter; - dataStream << _beamElevationSweep; - dataStream << _beamSweepSync; -} - -void FundamentalParameterData::unmarshal(DataStream& dataStream) -{ - dataStream >> _frequency; - dataStream >> _frequencyRange; - dataStream >> _effectiveRadiatedPower; - dataStream >> _pulseRepetitionFrequency; - dataStream >> _pulseWidth; - dataStream >> _beamAzimuthCenter; - dataStream >> _beamAzimuthSweep; - dataStream >> _beamElevationCenter; - dataStream >> _beamElevationSweep; - dataStream >> _beamSweepSync; +void FundamentalParameterData::unmarshal(DataStream& dataStream) { + dataStream >> _frequency; + dataStream >> _frequencyRange; + dataStream >> _effectiveRadiatedPower; + dataStream >> _pulseRepetitionFrequency; + dataStream >> _pulseWidth; + dataStream >> _beamAzimuthCenter; + dataStream >> _beamAzimuthSweep; + dataStream >> _beamElevationCenter; + dataStream >> _beamElevationSweep; + dataStream >> _beamSweepSync; } +bool FundamentalParameterData::operator==( + const FundamentalParameterData& rhs) const { + bool ivarsEqual = true; -bool FundamentalParameterData::operator ==(const FundamentalParameterData& rhs) const - { - bool ivarsEqual = true; + if (!(_frequency == rhs._frequency)) ivarsEqual = false; + if (!(_frequencyRange == rhs._frequencyRange)) ivarsEqual = false; + if (!(_effectiveRadiatedPower == rhs._effectiveRadiatedPower)) + ivarsEqual = false; + if (!(_pulseRepetitionFrequency == rhs._pulseRepetitionFrequency)) + ivarsEqual = false; + if (!(_pulseWidth == rhs._pulseWidth)) ivarsEqual = false; + if (!(_beamAzimuthCenter == rhs._beamAzimuthCenter)) ivarsEqual = false; + if (!(_beamAzimuthSweep == rhs._beamAzimuthSweep)) ivarsEqual = false; + if (!(_beamElevationCenter == rhs._beamElevationCenter)) ivarsEqual = false; + if (!(_beamElevationSweep == rhs._beamElevationSweep)) ivarsEqual = false; + if (!(_beamSweepSync == rhs._beamSweepSync)) ivarsEqual = false; - if( ! (_frequency == rhs._frequency) ) ivarsEqual = false; - if( ! (_frequencyRange == rhs._frequencyRange) ) ivarsEqual = false; - if( ! (_effectiveRadiatedPower == rhs._effectiveRadiatedPower) ) ivarsEqual = false; - if( ! (_pulseRepetitionFrequency == rhs._pulseRepetitionFrequency) ) ivarsEqual = false; - if( ! (_pulseWidth == rhs._pulseWidth) ) ivarsEqual = false; - if( ! (_beamAzimuthCenter == rhs._beamAzimuthCenter) ) ivarsEqual = false; - if( ! (_beamAzimuthSweep == rhs._beamAzimuthSweep) ) ivarsEqual = false; - if( ! (_beamElevationCenter == rhs._beamElevationCenter) ) ivarsEqual = false; - if( ! (_beamElevationSweep == rhs._beamElevationSweep) ) ivarsEqual = false; - if( ! (_beamSweepSync == rhs._beamSweepSync) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int FundamentalParameterData::getMarshalledSize() const -{ - int marshalSize = 0; +int FundamentalParameterData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _frequency - marshalSize = marshalSize + 4; // _frequencyRange - marshalSize = marshalSize + 4; // _effectiveRadiatedPower - marshalSize = marshalSize + 4; // _pulseRepetitionFrequency - marshalSize = marshalSize + 4; // _pulseWidth - marshalSize = marshalSize + 4; // _beamAzimuthCenter - marshalSize = marshalSize + 4; // _beamAzimuthSweep - marshalSize = marshalSize + 4; // _beamElevationCenter - marshalSize = marshalSize + 4; // _beamElevationSweep - marshalSize = marshalSize + 4; // _beamSweepSync - return marshalSize; + marshalSize = marshalSize + 4; // _frequency + marshalSize = marshalSize + 4; // _frequencyRange + marshalSize = marshalSize + 4; // _effectiveRadiatedPower + marshalSize = marshalSize + 4; // _pulseRepetitionFrequency + marshalSize = marshalSize + 4; // _pulseWidth + marshalSize = marshalSize + 4; // _beamAzimuthCenter + marshalSize = marshalSize + 4; // _beamAzimuthSweep + marshalSize = marshalSize + 4; // _beamElevationCenter + marshalSize = marshalSize + 4; // _beamElevationSweep + marshalSize = marshalSize + 4; // _beamSweepSync + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -202,7 +167,7 @@ int FundamentalParameterData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FundamentalParameterData.h b/src/dis6/FundamentalParameterData.h index 81d9f0ae..16bab4f9 100644 --- a/src/dis6/FundamentalParameterData.h +++ b/src/dis6/FundamentalParameterData.h @@ -1,100 +1,103 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.22. Contains electromagnetic emmision regineratin parameters that +// are variable throughout a scenario dependent on the actions of the +// participants in the simulation. Also provides basic parametric data that may +// be used to support low-fidelity simulations. -namespace DIS -{ -// Section 5.2.22. Contains electromagnetic emmision regineratin parameters that are variable throughout a scenario dependent on the actions of the participants in the simulation. Also provides basic parametric data that may be used to support low-fidelity simulations. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT FundamentalParameterData -{ -protected: +class OPENDIS6_EXPORT FundamentalParameterData { + protected: /** center frequency of the emission in hertz. */ - float _frequency; + float _frequency; /** Bandwidth of the frequencies corresponding to the fequency field. */ - float _frequencyRange; + float _frequencyRange; - /** Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power. */ - float _effectiveRadiatedPower; + /** Effective radiated power for the emission in DdBm. For a radar noise + * jammer, indicates the peak of the transmitted power. */ + float _effectiveRadiatedPower; /** Average repetition frequency of the emission in hertz. */ - float _pulseRepetitionFrequency; + float _pulseRepetitionFrequency; /** Average pulse width of the emission in microseconds. */ - float _pulseWidth; + float _pulseWidth; - /** Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume */ - float _beamAzimuthCenter; + /** Specifies the beam azimuth an elevation centers and corresponding + * half-angles to describe the scan volume */ + float _beamAzimuthCenter; /** Specifies the beam azimuth sweep to determine scan volume */ - float _beamAzimuthSweep; + float _beamAzimuthSweep; /** Specifies the beam elevation center to determine scan volume */ - float _beamElevationCenter; + float _beamElevationCenter; /** Specifies the beam elevation sweep to determine scan volume */ - float _beamElevationSweep; - - /** allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion. */ - float _beamSweepSync; + float _beamElevationSweep; + /** allows receiver to synchronize its regenerated scan pattern to that of + * the emmitter. Specifies the percentage of time a scan is through its + * pattern from its origion. */ + float _beamSweepSync; public: - FundamentalParameterData(); - virtual ~FundamentalParameterData(); + FundamentalParameterData(); + virtual ~FundamentalParameterData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getFrequency() const; - void setFrequency(float pX); + float getFrequency() const; + void setFrequency(float pX); - float getFrequencyRange() const; - void setFrequencyRange(float pX); + float getFrequencyRange() const; + void setFrequencyRange(float pX); - float getEffectiveRadiatedPower() const; - void setEffectiveRadiatedPower(float pX); + float getEffectiveRadiatedPower() const; + void setEffectiveRadiatedPower(float pX); - float getPulseRepetitionFrequency() const; - void setPulseRepetitionFrequency(float pX); + float getPulseRepetitionFrequency() const; + void setPulseRepetitionFrequency(float pX); - float getPulseWidth() const; - void setPulseWidth(float pX); + float getPulseWidth() const; + void setPulseWidth(float pX); - float getBeamAzimuthCenter() const; - void setBeamAzimuthCenter(float pX); + float getBeamAzimuthCenter() const; + void setBeamAzimuthCenter(float pX); - float getBeamAzimuthSweep() const; - void setBeamAzimuthSweep(float pX); + float getBeamAzimuthSweep() const; + void setBeamAzimuthSweep(float pX); - float getBeamElevationCenter() const; - void setBeamElevationCenter(float pX); + float getBeamElevationCenter() const; + void setBeamElevationCenter(float pX); - float getBeamElevationSweep() const; - void setBeamElevationSweep(float pX); + float getBeamElevationSweep() const; + void setBeamElevationSweep(float pX); - float getBeamSweepSync() const; - void setBeamSweepSync(float pX); + float getBeamSweepSync() const; + void setBeamSweepSync(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FundamentalParameterData& rhs) const; + bool operator==(const FundamentalParameterData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -107,7 +110,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FundamentalParameterDataIff.cpp b/src/dis6/FundamentalParameterDataIff.cpp index 7684f3fd..da06a941 100644 --- a/src/dis6/FundamentalParameterDataIff.cpp +++ b/src/dis6/FundamentalParameterDataIff.cpp @@ -2,164 +2,115 @@ using namespace DIS; +FundamentalParameterDataIff::FundamentalParameterDataIff() + : _erp(0.0), + _frequency(0.0), + _pgrf(0.0), + _pulseWidth(0.0), + _burstLength(0), + _applicableModes(0), + _pad2(0), + _pad3(0) {} -FundamentalParameterDataIff::FundamentalParameterDataIff(): - _erp(0.0), - _frequency(0.0), - _pgrf(0.0), - _pulseWidth(0.0), - _burstLength(0), - _applicableModes(0), - _pad2(0), - _pad3(0) -{ -} +FundamentalParameterDataIff::~FundamentalParameterDataIff() {} -FundamentalParameterDataIff::~FundamentalParameterDataIff() -{ -} +float FundamentalParameterDataIff::getErp() const { return _erp; } -float FundamentalParameterDataIff::getErp() const -{ - return _erp; -} +void FundamentalParameterDataIff::setErp(float pX) { _erp = pX; } -void FundamentalParameterDataIff::setErp(float pX) -{ - _erp = pX; -} +float FundamentalParameterDataIff::getFrequency() const { return _frequency; } -float FundamentalParameterDataIff::getFrequency() const -{ - return _frequency; -} +void FundamentalParameterDataIff::setFrequency(float pX) { _frequency = pX; } -void FundamentalParameterDataIff::setFrequency(float pX) -{ - _frequency = pX; -} +float FundamentalParameterDataIff::getPgrf() const { return _pgrf; } -float FundamentalParameterDataIff::getPgrf() const -{ - return _pgrf; -} +void FundamentalParameterDataIff::setPgrf(float pX) { _pgrf = pX; } -void FundamentalParameterDataIff::setPgrf(float pX) -{ - _pgrf = pX; -} +float FundamentalParameterDataIff::getPulseWidth() const { return _pulseWidth; } -float FundamentalParameterDataIff::getPulseWidth() const -{ - return _pulseWidth; -} +void FundamentalParameterDataIff::setPulseWidth(float pX) { _pulseWidth = pX; } -void FundamentalParameterDataIff::setPulseWidth(float pX) -{ - _pulseWidth = pX; +unsigned int FundamentalParameterDataIff::getBurstLength() const { + return _burstLength; } -unsigned int FundamentalParameterDataIff::getBurstLength() const -{ - return _burstLength; +void FundamentalParameterDataIff::setBurstLength(unsigned int pX) { + _burstLength = pX; } -void FundamentalParameterDataIff::setBurstLength(unsigned int pX) -{ - _burstLength = pX; +unsigned char FundamentalParameterDataIff::getApplicableModes() const { + return _applicableModes; } -unsigned char FundamentalParameterDataIff::getApplicableModes() const -{ - return _applicableModes; +void FundamentalParameterDataIff::setApplicableModes(unsigned char pX) { + _applicableModes = pX; } -void FundamentalParameterDataIff::setApplicableModes(unsigned char pX) -{ - _applicableModes = pX; -} +unsigned short FundamentalParameterDataIff::getPad2() const { return _pad2; } -unsigned short FundamentalParameterDataIff::getPad2() const -{ - return _pad2; -} +void FundamentalParameterDataIff::setPad2(unsigned short pX) { _pad2 = pX; } -void FundamentalParameterDataIff::setPad2(unsigned short pX) -{ - _pad2 = pX; -} +unsigned char FundamentalParameterDataIff::getPad3() const { return _pad3; } -unsigned char FundamentalParameterDataIff::getPad3() const -{ - return _pad3; -} +void FundamentalParameterDataIff::setPad3(unsigned char pX) { _pad3 = pX; } -void FundamentalParameterDataIff::setPad3(unsigned char pX) -{ - _pad3 = pX; +void FundamentalParameterDataIff::marshal(DataStream& dataStream) const { + dataStream << _erp; + dataStream << _frequency; + dataStream << _pgrf; + dataStream << _pulseWidth; + dataStream << _burstLength; + dataStream << _applicableModes; + dataStream << _pad2; + dataStream << _pad3; } -void FundamentalParameterDataIff::marshal(DataStream& dataStream) const -{ - dataStream << _erp; - dataStream << _frequency; - dataStream << _pgrf; - dataStream << _pulseWidth; - dataStream << _burstLength; - dataStream << _applicableModes; - dataStream << _pad2; - dataStream << _pad3; +void FundamentalParameterDataIff::unmarshal(DataStream& dataStream) { + dataStream >> _erp; + dataStream >> _frequency; + dataStream >> _pgrf; + dataStream >> _pulseWidth; + dataStream >> _burstLength; + dataStream >> _applicableModes; + dataStream >> _pad2; + dataStream >> _pad3; } -void FundamentalParameterDataIff::unmarshal(DataStream& dataStream) -{ - dataStream >> _erp; - dataStream >> _frequency; - dataStream >> _pgrf; - dataStream >> _pulseWidth; - dataStream >> _burstLength; - dataStream >> _applicableModes; - dataStream >> _pad2; - dataStream >> _pad3; +bool FundamentalParameterDataIff::operator==( + const FundamentalParameterDataIff& rhs) const { + bool ivarsEqual = true; + + if (!(_erp == rhs._erp)) ivarsEqual = false; + if (!(_frequency == rhs._frequency)) ivarsEqual = false; + if (!(_pgrf == rhs._pgrf)) ivarsEqual = false; + if (!(_pulseWidth == rhs._pulseWidth)) ivarsEqual = false; + if (!(_burstLength == rhs._burstLength)) ivarsEqual = false; + if (!(_applicableModes == rhs._applicableModes)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_pad3 == rhs._pad3)) ivarsEqual = false; + + return ivarsEqual; } +int FundamentalParameterDataIff::getMarshalledSize() const { + int marshalSize = 0; -bool FundamentalParameterDataIff::operator ==(const FundamentalParameterDataIff& rhs) const - { - bool ivarsEqual = true; - - if( ! (_erp == rhs._erp) ) ivarsEqual = false; - if( ! (_frequency == rhs._frequency) ) ivarsEqual = false; - if( ! (_pgrf == rhs._pgrf) ) ivarsEqual = false; - if( ! (_pulseWidth == rhs._pulseWidth) ) ivarsEqual = false; - if( ! (_burstLength == rhs._burstLength) ) ivarsEqual = false; - if( ! (_applicableModes == rhs._applicableModes) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_pad3 == rhs._pad3) ) ivarsEqual = false; - - return ivarsEqual; - } - -int FundamentalParameterDataIff::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _erp - marshalSize = marshalSize + 4; // _frequency - marshalSize = marshalSize + 4; // _pgrf - marshalSize = marshalSize + 4; // _pulseWidth - marshalSize = marshalSize + 4; // _burstLength - marshalSize = marshalSize + 1; // _applicableModes - marshalSize = marshalSize + 2; // _pad2 - marshalSize = marshalSize + 1; // _pad3 - return marshalSize; + marshalSize = marshalSize + 4; // _erp + marshalSize = marshalSize + 4; // _frequency + marshalSize = marshalSize + 4; // _pgrf + marshalSize = marshalSize + 4; // _pulseWidth + marshalSize = marshalSize + 4; // _burstLength + marshalSize = marshalSize + 1; // _applicableModes + marshalSize = marshalSize + 2; // _pad2 + marshalSize = marshalSize + 1; // _pad3 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -172,7 +123,7 @@ int FundamentalParameterDataIff::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/FundamentalParameterDataIff.h b/src/dis6/FundamentalParameterDataIff.h index 66fde019..f3229c50 100644 --- a/src/dis6/FundamentalParameterDataIff.h +++ b/src/dis6/FundamentalParameterDataIff.h @@ -1,88 +1,84 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.45. Fundamental IFF atc data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT FundamentalParameterDataIff -{ -protected: +class OPENDIS6_EXPORT FundamentalParameterDataIff { + protected: /** ERP */ - float _erp; + float _erp; /** frequency */ - float _frequency; + float _frequency; /** pgrf */ - float _pgrf; + float _pgrf; /** Pulse width */ - float _pulseWidth; + float _pulseWidth; /** Burst length */ - unsigned int _burstLength; + unsigned int _burstLength; /** Applicable modes enumeration */ - unsigned char _applicableModes; + unsigned char _applicableModes; /** padding */ - unsigned short _pad2; + unsigned short _pad2; /** padding */ - unsigned char _pad3; - + unsigned char _pad3; public: - FundamentalParameterDataIff(); - virtual ~FundamentalParameterDataIff(); + FundamentalParameterDataIff(); + virtual ~FundamentalParameterDataIff(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getErp() const; - void setErp(float pX); + float getErp() const; + void setErp(float pX); - float getFrequency() const; - void setFrequency(float pX); + float getFrequency() const; + void setFrequency(float pX); - float getPgrf() const; - void setPgrf(float pX); + float getPgrf() const; + void setPgrf(float pX); - float getPulseWidth() const; - void setPulseWidth(float pX); + float getPulseWidth() const; + void setPulseWidth(float pX); - unsigned int getBurstLength() const; - void setBurstLength(unsigned int pX); + unsigned int getBurstLength() const; + void setBurstLength(unsigned int pX); - unsigned char getApplicableModes() const; - void setApplicableModes(unsigned char pX); + unsigned char getApplicableModes() const; + void setApplicableModes(unsigned char pX); - unsigned short getPad2() const; - void setPad2(unsigned short pX); + unsigned short getPad2() const; + void setPad2(unsigned short pX); - unsigned char getPad3() const; - void setPad3(unsigned char pX); + unsigned char getPad3() const; + void setPad3(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FundamentalParameterDataIff& rhs) const; + bool operator==(const FundamentalParameterDataIff& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +91,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GridAxisRecord.cpp b/src/dis6/GridAxisRecord.cpp index 52dc7ca9..4598855c 100644 --- a/src/dis6/GridAxisRecord.cpp +++ b/src/dis6/GridAxisRecord.cpp @@ -2,74 +2,54 @@ using namespace DIS; +GridAxisRecord::GridAxisRecord() : _sampleType(0), _dataRepresentation(0) {} -GridAxisRecord::GridAxisRecord(): - _sampleType(0), - _dataRepresentation(0) -{ -} +GridAxisRecord::~GridAxisRecord() {} -GridAxisRecord::~GridAxisRecord() -{ -} +unsigned short GridAxisRecord::getSampleType() const { return _sampleType; } -unsigned short GridAxisRecord::getSampleType() const -{ - return _sampleType; -} +void GridAxisRecord::setSampleType(unsigned short pX) { _sampleType = pX; } -void GridAxisRecord::setSampleType(unsigned short pX) -{ - _sampleType = pX; +unsigned short GridAxisRecord::getDataRepresentation() const { + return _dataRepresentation; } -unsigned short GridAxisRecord::getDataRepresentation() const -{ - return _dataRepresentation; +void GridAxisRecord::setDataRepresentation(unsigned short pX) { + _dataRepresentation = pX; } -void GridAxisRecord::setDataRepresentation(unsigned short pX) -{ - _dataRepresentation = pX; +void GridAxisRecord::marshal(DataStream& dataStream) const { + dataStream << _sampleType; + dataStream << _dataRepresentation; } -void GridAxisRecord::marshal(DataStream& dataStream) const -{ - dataStream << _sampleType; - dataStream << _dataRepresentation; +void GridAxisRecord::unmarshal(DataStream& dataStream) { + dataStream >> _sampleType; + dataStream >> _dataRepresentation; } -void GridAxisRecord::unmarshal(DataStream& dataStream) -{ - dataStream >> _sampleType; - dataStream >> _dataRepresentation; -} +bool GridAxisRecord::operator==(const GridAxisRecord& rhs) const { + bool ivarsEqual = true; + if (!(_sampleType == rhs._sampleType)) ivarsEqual = false; + if (!(_dataRepresentation == rhs._dataRepresentation)) ivarsEqual = false; -bool GridAxisRecord::operator ==(const GridAxisRecord& rhs) const - { - bool ivarsEqual = true; - - if( ! (_sampleType == rhs._sampleType) ) ivarsEqual = false; - if( ! (_dataRepresentation == rhs._dataRepresentation) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int GridAxisRecord::getMarshalledSize() const -{ - int marshalSize = 0; +int GridAxisRecord::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _sampleType - marshalSize = marshalSize + 2; // _dataRepresentation - return marshalSize; + marshalSize = marshalSize + 2; // _sampleType + marshalSize = marshalSize + 2; // _dataRepresentation + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +62,7 @@ int GridAxisRecord::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GridAxisRecord.h b/src/dis6/GridAxisRecord.h index 814342a6..768d8b09 100644 --- a/src/dis6/GridAxisRecord.h +++ b/src/dis6/GridAxisRecord.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include +namespace DIS { +// 5.2.44: Grid data record, a common abstract superclass for several subtypes -namespace DIS -{ -// 5.2.44: Grid data record, a common abstract superclass for several subtypes - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT GridAxisRecord -{ -protected: +class OPENDIS6_EXPORT GridAxisRecord { + protected: /** type of environmental sample */ - unsigned short _sampleType; + unsigned short _sampleType; /** value that describes data representation */ - unsigned short _dataRepresentation; - + unsigned short _dataRepresentation; public: - GridAxisRecord(); - virtual ~GridAxisRecord(); + GridAxisRecord(); + virtual ~GridAxisRecord(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSampleType() const; - void setSampleType(unsigned short pX); + unsigned short getSampleType() const; + void setSampleType(unsigned short pX); - unsigned short getDataRepresentation() const; - void setDataRepresentation(unsigned short pX); + unsigned short getDataRepresentation() const; + void setDataRepresentation(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const GridAxisRecord& rhs) const; + bool operator==(const GridAxisRecord& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GridAxisRecordRepresentation0.cpp b/src/dis6/GridAxisRecordRepresentation0.cpp index e5d532a8..874304d2 100644 --- a/src/dis6/GridAxisRecordRepresentation0.cpp +++ b/src/dis6/GridAxisRecordRepresentation0.cpp @@ -13,33 +13,33 @@ unsigned short GridAxisRecordRepresentation0::getNumberOfBytes() const { return _dataValues.size(); } -std::vector &GridAxisRecordRepresentation0::getDataValues() { +std::vector& GridAxisRecordRepresentation0::getDataValues() { return _dataValues; } -const std::vector & -GridAxisRecordRepresentation0::getDataValues() const { +const std::vector& GridAxisRecordRepresentation0::getDataValues() + const { return _dataValues; } void GridAxisRecordRepresentation0::setDataValues( - const std::vector &pX) { + const std::vector& pX) { _dataValues = pX; } -void GridAxisRecordRepresentation0::marshal(DataStream &dataStream) const { +void GridAxisRecordRepresentation0::marshal(DataStream& dataStream) const { GridAxisRecord::marshal( - dataStream); // Marshal information in superclass first + dataStream); // Marshal information in superclass first dataStream << (unsigned short)_dataValues.size(); - for (auto &byte : _dataValues) { + for (auto& byte : _dataValues) { dataStream << byte; } } -void GridAxisRecordRepresentation0::unmarshal(DataStream &dataStream) { +void GridAxisRecordRepresentation0::unmarshal(DataStream& dataStream) { GridAxisRecord::unmarshal( - dataStream); // unmarshal information in superclass first + dataStream); // unmarshal information in superclass first dataStream >> _numberOfBytes; _dataValues.clear(); @@ -51,7 +51,7 @@ void GridAxisRecordRepresentation0::unmarshal(DataStream &dataStream) { } bool GridAxisRecordRepresentation0::operator==( - const GridAxisRecordRepresentation0 &rhs) const { + const GridAxisRecordRepresentation0& rhs) const { auto ivarsEqual = true; ivarsEqual = @@ -64,7 +64,7 @@ int GridAxisRecordRepresentation0::getMarshalledSize() const { auto marshalSize = 0; marshalSize = GridAxisRecord::getMarshalledSize(); - marshalSize += 2; // _numberOfBytes + marshalSize += 2; // _numberOfBytes marshalSize += _dataValues.size(); return marshalSize; diff --git a/src/dis6/GridAxisRecordRepresentation0.h b/src/dis6/GridAxisRecordRepresentation0.h index 4faf2ee5..9b674267 100644 --- a/src/dis6/GridAxisRecordRepresentation0.h +++ b/src/dis6/GridAxisRecordRepresentation0.h @@ -1,10 +1,11 @@ #pragma once +#include +#include + #include "dis6/GridAxisRecord.h" #include "dis6/opendis6_export.h" #include "dis6/utils/DataStream.h" -#include -#include namespace DIS { // 5.2.44: Grid data record, representation 0 @@ -15,7 +16,7 @@ namespace DIS { // @author DMcG, jkg class OPENDIS6_EXPORT GridAxisRecordRepresentation0 : public GridAxisRecord { -protected: + protected: /** number of bytes of environmental state data */ unsigned short _numberOfBytes; @@ -23,24 +24,24 @@ class OPENDIS6_EXPORT GridAxisRecordRepresentation0 : public GridAxisRecord { * well */ std::vector _dataValues; -public: + public: GridAxisRecordRepresentation0(); virtual ~GridAxisRecordRepresentation0(); - virtual void marshal(DataStream &dataStream) const; - virtual void unmarshal(DataStream &dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); unsigned short getNumberOfBytes() const; - std::vector &getDataValues(); - const std::vector &getDataValues() const; - void setDataValues(const std::vector &pX); + std::vector& getDataValues(); + const std::vector& getDataValues() const; + void setDataValues(const std::vector& pX); virtual int getMarshalledSize() const; - bool operator==(const GridAxisRecordRepresentation0 &rhs) const; + bool operator==(const GridAxisRecordRepresentation0& rhs) const; }; -} // namespace DIS +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/GridAxisRecordRepresentation1.cpp b/src/dis6/GridAxisRecordRepresentation1.cpp index 34ce8465..03fce267 100644 --- a/src/dis6/GridAxisRecordRepresentation1.cpp +++ b/src/dis6/GridAxisRecordRepresentation1.cpp @@ -2,132 +2,115 @@ using namespace DIS; - -GridAxisRecordRepresentation1::GridAxisRecordRepresentation1() : GridAxisRecord(), - _fieldScale(0.0), - _fieldOffset(0.0), - _numberOfValues(0) -{ -} - -GridAxisRecordRepresentation1::~GridAxisRecordRepresentation1() -{ - _dataValues.clear(); +GridAxisRecordRepresentation1::GridAxisRecordRepresentation1() + : GridAxisRecord(), + _fieldScale(0.0), + _fieldOffset(0.0), + _numberOfValues(0) {} + +GridAxisRecordRepresentation1::~GridAxisRecordRepresentation1() { + _dataValues.clear(); } -float GridAxisRecordRepresentation1::getFieldScale() const -{ - return _fieldScale; +float GridAxisRecordRepresentation1::getFieldScale() const { + return _fieldScale; } -void GridAxisRecordRepresentation1::setFieldScale(float pX) -{ - _fieldScale = pX; +void GridAxisRecordRepresentation1::setFieldScale(float pX) { + _fieldScale = pX; } -float GridAxisRecordRepresentation1::getFieldOffset() const -{ - return _fieldOffset; +float GridAxisRecordRepresentation1::getFieldOffset() const { + return _fieldOffset; } -void GridAxisRecordRepresentation1::setFieldOffset(float pX) -{ - _fieldOffset = pX; +void GridAxisRecordRepresentation1::setFieldOffset(float pX) { + _fieldOffset = pX; } -unsigned short GridAxisRecordRepresentation1::getNumberOfValues() const -{ - return _dataValues.size(); +unsigned short GridAxisRecordRepresentation1::getNumberOfValues() const { + return _dataValues.size(); } -std::vector& GridAxisRecordRepresentation1::getDataValues() -{ - return _dataValues; +std::vector& GridAxisRecordRepresentation1::getDataValues() { + return _dataValues; } -const std::vector& GridAxisRecordRepresentation1::getDataValues() const -{ - return _dataValues; +const std::vector& GridAxisRecordRepresentation1::getDataValues() + const { + return _dataValues; } -void GridAxisRecordRepresentation1::setDataValues(const std::vector& pX) -{ - _dataValues = pX; +void GridAxisRecordRepresentation1::setDataValues( + const std::vector& pX) { + _dataValues = pX; } -void GridAxisRecordRepresentation1::marshal(DataStream& dataStream) const -{ - GridAxisRecord::marshal(dataStream); // Marshal information in superclass first - dataStream << _fieldScale; - dataStream << _fieldOffset; - dataStream << ( unsigned short )_dataValues.size(); - - for(size_t idx = 0; idx < _dataValues.size(); idx++) - { - TwoByteChunk x = _dataValues[idx]; - x.marshal(dataStream); - } - +void GridAxisRecordRepresentation1::marshal(DataStream& dataStream) const { + GridAxisRecord::marshal( + dataStream); // Marshal information in superclass first + dataStream << _fieldScale; + dataStream << _fieldOffset; + dataStream << (unsigned short)_dataValues.size(); + + for (size_t idx = 0; idx < _dataValues.size(); idx++) { + TwoByteChunk x = _dataValues[idx]; + x.marshal(dataStream); + } } -void GridAxisRecordRepresentation1::unmarshal(DataStream& dataStream) -{ - GridAxisRecord::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _fieldScale; - dataStream >> _fieldOffset; - dataStream >> _numberOfValues; - - _dataValues.clear(); - for(size_t idx = 0; idx < _numberOfValues; idx++) - { - TwoByteChunk x; - x.unmarshal(dataStream); - _dataValues.push_back(x); - } +void GridAxisRecordRepresentation1::unmarshal(DataStream& dataStream) { + GridAxisRecord::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _fieldScale; + dataStream >> _fieldOffset; + dataStream >> _numberOfValues; + + _dataValues.clear(); + for (size_t idx = 0; idx < _numberOfValues; idx++) { + TwoByteChunk x; + x.unmarshal(dataStream); + _dataValues.push_back(x); + } } +bool GridAxisRecordRepresentation1::operator==( + const GridAxisRecordRepresentation1& rhs) const { + bool ivarsEqual = true; -bool GridAxisRecordRepresentation1::operator ==(const GridAxisRecordRepresentation1& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = GridAxisRecord::operator==(rhs); + ivarsEqual = GridAxisRecord::operator==(rhs); - if( ! (_fieldScale == rhs._fieldScale) ) ivarsEqual = false; - if( ! (_fieldOffset == rhs._fieldOffset) ) ivarsEqual = false; + if (!(_fieldScale == rhs._fieldScale)) ivarsEqual = false; + if (!(_fieldOffset == rhs._fieldOffset)) ivarsEqual = false; - for(size_t idx = 0; idx < _dataValues.size(); idx++) - { - if( ! ( _dataValues[idx] == rhs._dataValues[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _dataValues.size(); idx++) { + if (!(_dataValues[idx] == rhs._dataValues[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int GridAxisRecordRepresentation1::getMarshalledSize() const -{ - int marshalSize = 0; +int GridAxisRecordRepresentation1::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = GridAxisRecord::getMarshalledSize(); - marshalSize = marshalSize + 4; // _fieldScale - marshalSize = marshalSize + 4; // _fieldOffset - marshalSize = marshalSize + 2; // _numberOfValues + marshalSize = GridAxisRecord::getMarshalledSize(); + marshalSize = marshalSize + 4; // _fieldScale + marshalSize = marshalSize + 4; // _fieldOffset + marshalSize = marshalSize + 2; // _numberOfValues - for(unsigned long long idx=0; idx < _dataValues.size(); idx++) - { - TwoByteChunk listElement = _dataValues[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _dataValues.size(); idx++) { + TwoByteChunk listElement = _dataValues[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -140,7 +123,7 @@ int GridAxisRecordRepresentation1::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GridAxisRecordRepresentation1.h b/src/dis6/GridAxisRecordRepresentation1.h index dd6061a3..7f67fefa 100644 --- a/src/dis6/GridAxisRecordRepresentation1.h +++ b/src/dis6/GridAxisRecordRepresentation1.h @@ -1,67 +1,65 @@ #pragma once -#include #include + #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.44: Grid data record, representation 1 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT GridAxisRecordRepresentation1 : public GridAxisRecord -{ -protected: +class OPENDIS6_EXPORT GridAxisRecordRepresentation1 : public GridAxisRecord { + protected: /** constant scale factor */ - float _fieldScale; + float _fieldScale; /** constant offset used to scale grid data */ - float _fieldOffset; + float _fieldOffset; /** Number of data values */ - unsigned short _numberOfValues; - - /** variable length list of data parameters ^^^this is wrong--need padding as well */ - std::vector _dataValues; + unsigned short _numberOfValues; + /** variable length list of data parameters ^^^this is wrong--need padding as + * well */ + std::vector _dataValues; public: - GridAxisRecordRepresentation1(); - virtual ~GridAxisRecordRepresentation1(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + GridAxisRecordRepresentation1(); + virtual ~GridAxisRecordRepresentation1(); - float getFieldScale() const; - void setFieldScale(float pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getFieldOffset() const; - void setFieldOffset(float pX); + float getFieldScale() const; + void setFieldScale(float pX); - unsigned short getNumberOfValues() const; + float getFieldOffset() const; + void setFieldOffset(float pX); - std::vector& getDataValues(); - const std::vector& getDataValues() const; - void setDataValues(const std::vector& pX); + unsigned short getNumberOfValues() const; + std::vector& getDataValues(); + const std::vector& getDataValues() const; + void setDataValues(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const GridAxisRecordRepresentation1& rhs) const; + bool operator==(const GridAxisRecordRepresentation1& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -74,7 +72,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GridAxisRecordRepresentation2.cpp b/src/dis6/GridAxisRecordRepresentation2.cpp index cea24f09..8bbffafc 100644 --- a/src/dis6/GridAxisRecordRepresentation2.cpp +++ b/src/dis6/GridAxisRecordRepresentation2.cpp @@ -2,102 +2,87 @@ using namespace DIS; +GridAxisRecordRepresentation2::GridAxisRecordRepresentation2() + : GridAxisRecord(), _numberOfValues(0) {} -GridAxisRecordRepresentation2::GridAxisRecordRepresentation2() : GridAxisRecord(), - _numberOfValues(0) -{ +GridAxisRecordRepresentation2::~GridAxisRecordRepresentation2() { + _dataValues.clear(); } -GridAxisRecordRepresentation2::~GridAxisRecordRepresentation2() -{ - _dataValues.clear(); +unsigned short GridAxisRecordRepresentation2::getNumberOfValues() const { + return _dataValues.size(); } -unsigned short GridAxisRecordRepresentation2::getNumberOfValues() const -{ - return _dataValues.size(); +std::vector& GridAxisRecordRepresentation2::getDataValues() { + return _dataValues; } -std::vector& GridAxisRecordRepresentation2::getDataValues() -{ - return _dataValues; +const std::vector& GridAxisRecordRepresentation2::getDataValues() + const { + return _dataValues; } -const std::vector& GridAxisRecordRepresentation2::getDataValues() const -{ - return _dataValues; +void GridAxisRecordRepresentation2::setDataValues( + const std::vector& pX) { + _dataValues = pX; } -void GridAxisRecordRepresentation2::setDataValues(const std::vector& pX) -{ - _dataValues = pX; -} - -void GridAxisRecordRepresentation2::marshal(DataStream& dataStream) const -{ - GridAxisRecord::marshal(dataStream); // Marshal information in superclass first - dataStream << ( unsigned short )_dataValues.size(); - - for(size_t idx = 0; idx < _dataValues.size(); idx++) - { - FourByteChunk x = _dataValues[idx]; - x.marshal(dataStream); - } +void GridAxisRecordRepresentation2::marshal(DataStream& dataStream) const { + GridAxisRecord::marshal( + dataStream); // Marshal information in superclass first + dataStream << (unsigned short)_dataValues.size(); + for (size_t idx = 0; idx < _dataValues.size(); idx++) { + FourByteChunk x = _dataValues[idx]; + x.marshal(dataStream); + } } -void GridAxisRecordRepresentation2::unmarshal(DataStream& dataStream) -{ - GridAxisRecord::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _numberOfValues; - - _dataValues.clear(); - for(size_t idx = 0; idx < _numberOfValues; idx++) - { - FourByteChunk x; - x.unmarshal(dataStream); - _dataValues.push_back(x); - } +void GridAxisRecordRepresentation2::unmarshal(DataStream& dataStream) { + GridAxisRecord::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _numberOfValues; + + _dataValues.clear(); + for (size_t idx = 0; idx < _numberOfValues; idx++) { + FourByteChunk x; + x.unmarshal(dataStream); + _dataValues.push_back(x); + } } +bool GridAxisRecordRepresentation2::operator==( + const GridAxisRecordRepresentation2& rhs) const { + bool ivarsEqual = true; -bool GridAxisRecordRepresentation2::operator ==(const GridAxisRecordRepresentation2& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = GridAxisRecord::operator==(rhs); + ivarsEqual = GridAxisRecord::operator==(rhs); + for (size_t idx = 0; idx < _dataValues.size(); idx++) { + if (!(_dataValues[idx] == rhs._dataValues[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _dataValues.size(); idx++) - { - if( ! ( _dataValues[idx] == rhs._dataValues[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int GridAxisRecordRepresentation2::getMarshalledSize() const -{ - int marshalSize = 0; +int GridAxisRecordRepresentation2::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = GridAxisRecord::getMarshalledSize(); - marshalSize = marshalSize + 2; // _numberOfValues + marshalSize = GridAxisRecord::getMarshalledSize(); + marshalSize = marshalSize + 2; // _numberOfValues - for(unsigned long long idx=0; idx < _dataValues.size(); idx++) - { - FourByteChunk listElement = _dataValues[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _dataValues.size(); idx++) { + FourByteChunk listElement = _dataValues[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -110,7 +95,7 @@ int GridAxisRecordRepresentation2::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GridAxisRecordRepresentation2.h b/src/dis6/GridAxisRecordRepresentation2.h index 9adbc9dd..eb4bb2d7 100644 --- a/src/dis6/GridAxisRecordRepresentation2.h +++ b/src/dis6/GridAxisRecordRepresentation2.h @@ -1,55 +1,53 @@ #pragma once -#include #include + +#include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.44: Grid data record, representation 1 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT GridAxisRecordRepresentation2 : public GridAxisRecord -{ -protected: +class OPENDIS6_EXPORT GridAxisRecordRepresentation2 : public GridAxisRecord { + protected: /** number of values */ - unsigned short _numberOfValues; - - /** variable length list of data parameters ^^^this is wrong--need padding as well */ - std::vector _dataValues; + unsigned short _numberOfValues; + /** variable length list of data parameters ^^^this is wrong--need padding as + * well */ + std::vector _dataValues; public: - GridAxisRecordRepresentation2(); - virtual ~GridAxisRecordRepresentation2(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + GridAxisRecordRepresentation2(); + virtual ~GridAxisRecordRepresentation2(); - unsigned short getNumberOfValues() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - std::vector& getDataValues(); - const std::vector& getDataValues() const; - void setDataValues(const std::vector& pX); + unsigned short getNumberOfValues() const; + std::vector& getDataValues(); + const std::vector& getDataValues() const; + void setDataValues(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const GridAxisRecordRepresentation2& rhs) const; + bool operator==(const GridAxisRecordRepresentation2& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -62,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GriddedDataPdu.cpp b/src/dis6/GriddedDataPdu.cpp index ebc97370..441cdfa4 100644 --- a/src/dis6/GriddedDataPdu.cpp +++ b/src/dis6/GriddedDataPdu.cpp @@ -2,313 +2,239 @@ using namespace DIS; - -GriddedDataPdu::GriddedDataPdu() : SyntheticEnvironmentFamilyPdu(), - _environmentalSimulationApplicationID(), - _fieldNumber(0), - _pduNumber(0), - _pduTotal(0), - _coordinateSystem(0), - _numberOfGridAxes(0), - _constantGrid(0), - _environmentType(), - _orientation(), - _sampleTime(0), - _totalValues(0), - _vectorDimension(0), - _padding1(0), - _padding2(0) -{ - setPduType( 42 ); +GriddedDataPdu::GriddedDataPdu() + : SyntheticEnvironmentFamilyPdu(), + _environmentalSimulationApplicationID(), + _fieldNumber(0), + _pduNumber(0), + _pduTotal(0), + _coordinateSystem(0), + _numberOfGridAxes(0), + _constantGrid(0), + _environmentType(), + _orientation(), + _sampleTime(0), + _totalValues(0), + _vectorDimension(0), + _padding1(0), + _padding2(0) { + setPduType(42); } -GriddedDataPdu::~GriddedDataPdu() -{ - _gridDataList.clear(); -} +GriddedDataPdu::~GriddedDataPdu() { _gridDataList.clear(); } -EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() -{ - return _environmentalSimulationApplicationID; +EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() { + return _environmentalSimulationApplicationID; } -const EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() const -{ - return _environmentalSimulationApplicationID; +const EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() + const { + return _environmentalSimulationApplicationID; } -void GriddedDataPdu::setEnvironmentalSimulationApplicationID(const EntityID &pX) -{ - _environmentalSimulationApplicationID = pX; +void GriddedDataPdu::setEnvironmentalSimulationApplicationID( + const EntityID& pX) { + _environmentalSimulationApplicationID = pX; } -unsigned short GriddedDataPdu::getFieldNumber() const -{ - return _fieldNumber; -} +unsigned short GriddedDataPdu::getFieldNumber() const { return _fieldNumber; } -void GriddedDataPdu::setFieldNumber(unsigned short pX) -{ - _fieldNumber = pX; -} +void GriddedDataPdu::setFieldNumber(unsigned short pX) { _fieldNumber = pX; } -unsigned short GriddedDataPdu::getPduNumber() const -{ - return _pduNumber; -} +unsigned short GriddedDataPdu::getPduNumber() const { return _pduNumber; } -void GriddedDataPdu::setPduNumber(unsigned short pX) -{ - _pduNumber = pX; -} +void GriddedDataPdu::setPduNumber(unsigned short pX) { _pduNumber = pX; } -unsigned short GriddedDataPdu::getPduTotal() const -{ - return _pduTotal; -} +unsigned short GriddedDataPdu::getPduTotal() const { return _pduTotal; } -void GriddedDataPdu::setPduTotal(unsigned short pX) -{ - _pduTotal = pX; -} +void GriddedDataPdu::setPduTotal(unsigned short pX) { _pduTotal = pX; } -unsigned short GriddedDataPdu::getCoordinateSystem() const -{ - return _coordinateSystem; +unsigned short GriddedDataPdu::getCoordinateSystem() const { + return _coordinateSystem; } -void GriddedDataPdu::setCoordinateSystem(unsigned short pX) -{ - _coordinateSystem = pX; +void GriddedDataPdu::setCoordinateSystem(unsigned short pX) { + _coordinateSystem = pX; } -unsigned char GriddedDataPdu::getNumberOfGridAxes() const -{ - return _gridDataList.size(); +unsigned char GriddedDataPdu::getNumberOfGridAxes() const { + return _gridDataList.size(); } -unsigned char GriddedDataPdu::getConstantGrid() const -{ - return _constantGrid; -} +unsigned char GriddedDataPdu::getConstantGrid() const { return _constantGrid; } -void GriddedDataPdu::setConstantGrid(unsigned char pX) -{ - _constantGrid = pX; -} +void GriddedDataPdu::setConstantGrid(unsigned char pX) { _constantGrid = pX; } -EntityType& GriddedDataPdu::getEnvironmentType() -{ - return _environmentType; -} +EntityType& GriddedDataPdu::getEnvironmentType() { return _environmentType; } -const EntityType& GriddedDataPdu::getEnvironmentType() const -{ - return _environmentType; +const EntityType& GriddedDataPdu::getEnvironmentType() const { + return _environmentType; } -void GriddedDataPdu::setEnvironmentType(const EntityType &pX) -{ - _environmentType = pX; +void GriddedDataPdu::setEnvironmentType(const EntityType& pX) { + _environmentType = pX; } -Orientation& GriddedDataPdu::getOrientation() -{ - return _orientation; -} +Orientation& GriddedDataPdu::getOrientation() { return _orientation; } -const Orientation& GriddedDataPdu::getOrientation() const -{ - return _orientation; +const Orientation& GriddedDataPdu::getOrientation() const { + return _orientation; } -void GriddedDataPdu::setOrientation(const Orientation &pX) -{ - _orientation = pX; +void GriddedDataPdu::setOrientation(const Orientation& pX) { + _orientation = pX; } -unsigned long long GriddedDataPdu::getSampleTime() const -{ - return _sampleTime; -} +unsigned long long GriddedDataPdu::getSampleTime() const { return _sampleTime; } -void GriddedDataPdu::setSampleTime(unsigned long long pX) -{ - _sampleTime = pX; -} +void GriddedDataPdu::setSampleTime(unsigned long long pX) { _sampleTime = pX; } -unsigned int GriddedDataPdu::getTotalValues() const -{ - return _totalValues; -} +unsigned int GriddedDataPdu::getTotalValues() const { return _totalValues; } -void GriddedDataPdu::setTotalValues(unsigned int pX) -{ - _totalValues = pX; -} +void GriddedDataPdu::setTotalValues(unsigned int pX) { _totalValues = pX; } -unsigned char GriddedDataPdu::getVectorDimension() const -{ - return _vectorDimension; +unsigned char GriddedDataPdu::getVectorDimension() const { + return _vectorDimension; } -void GriddedDataPdu::setVectorDimension(unsigned char pX) -{ - _vectorDimension = pX; +void GriddedDataPdu::setVectorDimension(unsigned char pX) { + _vectorDimension = pX; } -unsigned short GriddedDataPdu::getPadding1() const -{ - return _padding1; -} +unsigned short GriddedDataPdu::getPadding1() const { return _padding1; } -void GriddedDataPdu::setPadding1(unsigned short pX) -{ - _padding1 = pX; -} +void GriddedDataPdu::setPadding1(unsigned short pX) { _padding1 = pX; } -unsigned char GriddedDataPdu::getPadding2() const -{ - return _padding2; -} +unsigned char GriddedDataPdu::getPadding2() const { return _padding2; } -void GriddedDataPdu::setPadding2(unsigned char pX) -{ - _padding2 = pX; -} +void GriddedDataPdu::setPadding2(unsigned char pX) { _padding2 = pX; } -std::vector& GriddedDataPdu::getGridDataList() -{ - return _gridDataList; +std::vector& GriddedDataPdu::getGridDataList() { + return _gridDataList; } -const std::vector& GriddedDataPdu::getGridDataList() const -{ - return _gridDataList; +const std::vector& GriddedDataPdu::getGridDataList() const { + return _gridDataList; } -void GriddedDataPdu::setGridDataList(const std::vector& pX) -{ - _gridDataList = pX; +void GriddedDataPdu::setGridDataList(const std::vector& pX) { + _gridDataList = pX; } -void GriddedDataPdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _environmentalSimulationApplicationID.marshal(dataStream); - dataStream << _fieldNumber; - dataStream << _pduNumber; - dataStream << _pduTotal; - dataStream << _coordinateSystem; - dataStream << ( unsigned char )_gridDataList.size(); - dataStream << _constantGrid; - _environmentType.marshal(dataStream); - _orientation.marshal(dataStream); - dataStream << _sampleTime; - dataStream << _totalValues; - dataStream << _vectorDimension; - dataStream << _padding1; - dataStream << _padding2; - - for(size_t idx = 0; idx < _gridDataList.size(); idx++) - { - GridAxisRecord x = _gridDataList[idx]; - x.marshal(dataStream); - } +void GriddedDataPdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _environmentalSimulationApplicationID.marshal(dataStream); + dataStream << _fieldNumber; + dataStream << _pduNumber; + dataStream << _pduTotal; + dataStream << _coordinateSystem; + dataStream << (unsigned char)_gridDataList.size(); + dataStream << _constantGrid; + _environmentType.marshal(dataStream); + _orientation.marshal(dataStream); + dataStream << _sampleTime; + dataStream << _totalValues; + dataStream << _vectorDimension; + dataStream << _padding1; + dataStream << _padding2; + for (size_t idx = 0; idx < _gridDataList.size(); idx++) { + GridAxisRecord x = _gridDataList[idx]; + x.marshal(dataStream); + } } -void GriddedDataPdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _environmentalSimulationApplicationID.unmarshal(dataStream); - dataStream >> _fieldNumber; - dataStream >> _pduNumber; - dataStream >> _pduTotal; - dataStream >> _coordinateSystem; - dataStream >> _numberOfGridAxes; - dataStream >> _constantGrid; - _environmentType.unmarshal(dataStream); - _orientation.unmarshal(dataStream); - dataStream >> _sampleTime; - dataStream >> _totalValues; - dataStream >> _vectorDimension; - dataStream >> _padding1; - dataStream >> _padding2; - - _gridDataList.clear(); - for(size_t idx = 0; idx < _numberOfGridAxes; idx++) - { - GridAxisRecord x; - x.unmarshal(dataStream); - _gridDataList.push_back(x); - } +void GriddedDataPdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _environmentalSimulationApplicationID.unmarshal(dataStream); + dataStream >> _fieldNumber; + dataStream >> _pduNumber; + dataStream >> _pduTotal; + dataStream >> _coordinateSystem; + dataStream >> _numberOfGridAxes; + dataStream >> _constantGrid; + _environmentType.unmarshal(dataStream); + _orientation.unmarshal(dataStream); + dataStream >> _sampleTime; + dataStream >> _totalValues; + dataStream >> _vectorDimension; + dataStream >> _padding1; + dataStream >> _padding2; + + _gridDataList.clear(); + for (size_t idx = 0; idx < _numberOfGridAxes; idx++) { + GridAxisRecord x; + x.unmarshal(dataStream); + _gridDataList.push_back(x); + } } +bool GriddedDataPdu::operator==(const GriddedDataPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); -bool GriddedDataPdu::operator ==(const GriddedDataPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - - if( ! (_environmentalSimulationApplicationID == rhs._environmentalSimulationApplicationID) ) ivarsEqual = false; - if( ! (_fieldNumber == rhs._fieldNumber) ) ivarsEqual = false; - if( ! (_pduNumber == rhs._pduNumber) ) ivarsEqual = false; - if( ! (_pduTotal == rhs._pduTotal) ) ivarsEqual = false; - if( ! (_coordinateSystem == rhs._coordinateSystem) ) ivarsEqual = false; - if( ! (_constantGrid == rhs._constantGrid) ) ivarsEqual = false; - if( ! (_environmentType == rhs._environmentType) ) ivarsEqual = false; - if( ! (_orientation == rhs._orientation) ) ivarsEqual = false; - if( ! (_sampleTime == rhs._sampleTime) ) ivarsEqual = false; - if( ! (_totalValues == rhs._totalValues) ) ivarsEqual = false; - if( ! (_vectorDimension == rhs._vectorDimension) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _gridDataList.size(); idx++) - { - if( ! ( _gridDataList[idx] == rhs._gridDataList[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int GriddedDataPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _environmentalSimulationApplicationID.getMarshalledSize(); // _environmentalSimulationApplicationID - marshalSize = marshalSize + 2; // _fieldNumber - marshalSize = marshalSize + 2; // _pduNumber - marshalSize = marshalSize + 2; // _pduTotal - marshalSize = marshalSize + 2; // _coordinateSystem - marshalSize = marshalSize + 1; // _numberOfGridAxes - marshalSize = marshalSize + 1; // _constantGrid - marshalSize = marshalSize + _environmentType.getMarshalledSize(); // _environmentType - marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation - marshalSize = marshalSize + 8; // _sampleTime - marshalSize = marshalSize + 4; // _totalValues - marshalSize = marshalSize + 1; // _vectorDimension - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - - for(unsigned long long idx=0; idx < _gridDataList.size(); idx++) - { - GridAxisRecord listElement = _gridDataList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + if (!(_environmentalSimulationApplicationID == + rhs._environmentalSimulationApplicationID)) + ivarsEqual = false; + if (!(_fieldNumber == rhs._fieldNumber)) ivarsEqual = false; + if (!(_pduNumber == rhs._pduNumber)) ivarsEqual = false; + if (!(_pduTotal == rhs._pduTotal)) ivarsEqual = false; + if (!(_coordinateSystem == rhs._coordinateSystem)) ivarsEqual = false; + if (!(_constantGrid == rhs._constantGrid)) ivarsEqual = false; + if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; + if (!(_orientation == rhs._orientation)) ivarsEqual = false; + if (!(_sampleTime == rhs._sampleTime)) ivarsEqual = false; + if (!(_totalValues == rhs._totalValues)) ivarsEqual = false; + if (!(_vectorDimension == rhs._vectorDimension)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + + for (size_t idx = 0; idx < _gridDataList.size(); idx++) { + if (!(_gridDataList[idx] == rhs._gridDataList[idx])) ivarsEqual = false; + } + + return ivarsEqual; +} + +int GriddedDataPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + + _environmentalSimulationApplicationID + .getMarshalledSize(); // _environmentalSimulationApplicationID + marshalSize = marshalSize + 2; // _fieldNumber + marshalSize = marshalSize + 2; // _pduNumber + marshalSize = marshalSize + 2; // _pduTotal + marshalSize = marshalSize + 2; // _coordinateSystem + marshalSize = marshalSize + 1; // _numberOfGridAxes + marshalSize = marshalSize + 1; // _constantGrid + marshalSize = + marshalSize + _environmentType.getMarshalledSize(); // _environmentType + marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation + marshalSize = marshalSize + 8; // _sampleTime + marshalSize = marshalSize + 4; // _totalValues + marshalSize = marshalSize + 1; // _vectorDimension + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 + + for (unsigned long long idx = 0; idx < _gridDataList.size(); idx++) { + GridAxisRecord listElement = _gridDataList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -321,7 +247,7 @@ int GriddedDataPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/GriddedDataPdu.h b/src/dis6/GriddedDataPdu.h index 67c4a2dd..ac43f171 100644 --- a/src/dis6/GriddedDataPdu.h +++ b/src/dis6/GriddedDataPdu.h @@ -1,139 +1,139 @@ #pragma once +#include + #include #include -#include #include -#include +#include #include -#include #include +#include +namespace DIS { +// Section 5.3.11.2: Information about globat, spatially varying enviornmental +// effects. This requires manual cleanup; the grid axis records are +// variable sized. UNFINISHED -namespace DIS -{ -// Section 5.3.11.2: Information about globat, spatially varying enviornmental effects. This requires manual cleanup; the grid axis records are variable sized. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { + protected: /** environmental simulation application ID */ - EntityID _environmentalSimulationApplicationID; + EntityID _environmentalSimulationApplicationID; /** unique identifier for each piece of enviornmental data */ - unsigned short _fieldNumber; + unsigned short _fieldNumber; /** sequence number for the total set of PDUS used to transmit the data */ - unsigned short _pduNumber; + unsigned short _pduNumber; /** Total number of PDUS used to transmit the data */ - unsigned short _pduTotal; + unsigned short _pduTotal; /** coordinate system of the grid */ - unsigned short _coordinateSystem; + unsigned short _coordinateSystem; /** number of grid axes for the environmental data */ - unsigned char _numberOfGridAxes; + unsigned char _numberOfGridAxes; /** are domain grid axes identidal to those of the priveious domain update? */ - unsigned char _constantGrid; + unsigned char _constantGrid; /** type of environment */ - EntityType _environmentType; + EntityType _environmentType; /** orientation of the data grid */ - Orientation _orientation; + Orientation _orientation; /** valid time of the enviormental data sample, 64 bit unsigned int */ unsigned long long _sampleTime; - /** total number of all data values for all pdus for an environmental sample */ - unsigned int _totalValues; + /** total number of all data values for all pdus for an environmental sample + */ + unsigned int _totalValues; /** total number of data values at each grid point. */ - unsigned char _vectorDimension; + unsigned char _vectorDimension; /** padding */ - unsigned short _padding1; + unsigned short _padding1; /** padding */ - unsigned char _padding2; + unsigned char _padding2; /** Grid data ^^^This is wrong */ - std::vector _gridDataList; - + std::vector _gridDataList; public: - GriddedDataPdu(); - virtual ~GriddedDataPdu(); + GriddedDataPdu(); + virtual ~GriddedDataPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEnvironmentalSimulationApplicationID(); - const EntityID& getEnvironmentalSimulationApplicationID() const; - void setEnvironmentalSimulationApplicationID(const EntityID &pX); + EntityID& getEnvironmentalSimulationApplicationID(); + const EntityID& getEnvironmentalSimulationApplicationID() const; + void setEnvironmentalSimulationApplicationID(const EntityID& pX); - unsigned short getFieldNumber() const; - void setFieldNumber(unsigned short pX); + unsigned short getFieldNumber() const; + void setFieldNumber(unsigned short pX); - unsigned short getPduNumber() const; - void setPduNumber(unsigned short pX); + unsigned short getPduNumber() const; + void setPduNumber(unsigned short pX); - unsigned short getPduTotal() const; - void setPduTotal(unsigned short pX); + unsigned short getPduTotal() const; + void setPduTotal(unsigned short pX); - unsigned short getCoordinateSystem() const; - void setCoordinateSystem(unsigned short pX); + unsigned short getCoordinateSystem() const; + void setCoordinateSystem(unsigned short pX); - unsigned char getNumberOfGridAxes() const; + unsigned char getNumberOfGridAxes() const; - unsigned char getConstantGrid() const; - void setConstantGrid(unsigned char pX); + unsigned char getConstantGrid() const; + void setConstantGrid(unsigned char pX); - EntityType& getEnvironmentType(); - const EntityType& getEnvironmentType() const; - void setEnvironmentType(const EntityType &pX); + EntityType& getEnvironmentType(); + const EntityType& getEnvironmentType() const; + void setEnvironmentType(const EntityType& pX); - Orientation& getOrientation(); - const Orientation& getOrientation() const; - void setOrientation(const Orientation &pX); + Orientation& getOrientation(); + const Orientation& getOrientation() const; + void setOrientation(const Orientation& pX); - unsigned long long getSampleTime() const; - void setSampleTime(unsigned long long pX); + unsigned long long getSampleTime() const; + void setSampleTime(unsigned long long pX); - unsigned int getTotalValues() const; - void setTotalValues(unsigned int pX); + unsigned int getTotalValues() const; + void setTotalValues(unsigned int pX); - unsigned char getVectorDimension() const; - void setVectorDimension(unsigned char pX); + unsigned char getVectorDimension() const; + void setVectorDimension(unsigned char pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + unsigned short getPadding1() const; + void setPadding1(unsigned short pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + unsigned char getPadding2() const; + void setPadding2(unsigned char pX); - std::vector& getGridDataList(); - const std::vector& getGridDataList() const; - void setGridDataList(const std::vector& pX); + std::vector& getGridDataList(); + const std::vector& getGridDataList() const; + void setGridDataList(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const GriddedDataPdu& rhs) const; + bool operator==(const GriddedDataPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -146,7 +146,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IffAtcNavAidsLayer1Pdu.cpp b/src/dis6/IffAtcNavAidsLayer1Pdu.cpp index 82bc2ab3..64d24891 100644 --- a/src/dis6/IffAtcNavAidsLayer1Pdu.cpp +++ b/src/dis6/IffAtcNavAidsLayer1Pdu.cpp @@ -2,165 +2,133 @@ using namespace DIS; - -IffAtcNavAidsLayer1Pdu::IffAtcNavAidsLayer1Pdu() : DistributedEmissionsFamilyPdu(), - _emittingEntityId(), - _eventID(), - _location(), - _systemID(), - _pad2(0), - _fundamentalParameters() -{ - setPduType( 28 ); +IffAtcNavAidsLayer1Pdu::IffAtcNavAidsLayer1Pdu() + : DistributedEmissionsFamilyPdu(), + _emittingEntityId(), + _eventID(), + _location(), + _systemID(), + _pad2(0), + _fundamentalParameters() { + setPduType(28); } -IffAtcNavAidsLayer1Pdu::~IffAtcNavAidsLayer1Pdu() -{ -} +IffAtcNavAidsLayer1Pdu::~IffAtcNavAidsLayer1Pdu() {} -EntityID& IffAtcNavAidsLayer1Pdu::getEmittingEntityId() -{ - return _emittingEntityId; +EntityID& IffAtcNavAidsLayer1Pdu::getEmittingEntityId() { + return _emittingEntityId; } -const EntityID& IffAtcNavAidsLayer1Pdu::getEmittingEntityId() const -{ - return _emittingEntityId; +const EntityID& IffAtcNavAidsLayer1Pdu::getEmittingEntityId() const { + return _emittingEntityId; } -void IffAtcNavAidsLayer1Pdu::setEmittingEntityId(const EntityID &pX) -{ - _emittingEntityId = pX; +void IffAtcNavAidsLayer1Pdu::setEmittingEntityId(const EntityID& pX) { + _emittingEntityId = pX; } -EventID& IffAtcNavAidsLayer1Pdu::getEventID() -{ - return _eventID; -} +EventID& IffAtcNavAidsLayer1Pdu::getEventID() { return _eventID; } -const EventID& IffAtcNavAidsLayer1Pdu::getEventID() const -{ - return _eventID; -} +const EventID& IffAtcNavAidsLayer1Pdu::getEventID() const { return _eventID; } -void IffAtcNavAidsLayer1Pdu::setEventID(const EventID &pX) -{ - _eventID = pX; -} +void IffAtcNavAidsLayer1Pdu::setEventID(const EventID& pX) { _eventID = pX; } -Vector3Float& IffAtcNavAidsLayer1Pdu::getLocation() -{ - return _location; -} +Vector3Float& IffAtcNavAidsLayer1Pdu::getLocation() { return _location; } -const Vector3Float& IffAtcNavAidsLayer1Pdu::getLocation() const -{ - return _location; +const Vector3Float& IffAtcNavAidsLayer1Pdu::getLocation() const { + return _location; } -void IffAtcNavAidsLayer1Pdu::setLocation(const Vector3Float &pX) -{ - _location = pX; +void IffAtcNavAidsLayer1Pdu::setLocation(const Vector3Float& pX) { + _location = pX; } -SystemID& IffAtcNavAidsLayer1Pdu::getSystemID() -{ - return _systemID; -} +SystemID& IffAtcNavAidsLayer1Pdu::getSystemID() { return _systemID; } -const SystemID& IffAtcNavAidsLayer1Pdu::getSystemID() const -{ - return _systemID; +const SystemID& IffAtcNavAidsLayer1Pdu::getSystemID() const { + return _systemID; } -void IffAtcNavAidsLayer1Pdu::setSystemID(const SystemID &pX) -{ - _systemID = pX; -} +void IffAtcNavAidsLayer1Pdu::setSystemID(const SystemID& pX) { _systemID = pX; } -unsigned short IffAtcNavAidsLayer1Pdu::getPad2() const -{ - return _pad2; -} +unsigned short IffAtcNavAidsLayer1Pdu::getPad2() const { return _pad2; } -void IffAtcNavAidsLayer1Pdu::setPad2(unsigned short pX) -{ - _pad2 = pX; -} +void IffAtcNavAidsLayer1Pdu::setPad2(unsigned short pX) { _pad2 = pX; } -IffFundamentalData& IffAtcNavAidsLayer1Pdu::getFundamentalParameters() -{ - return _fundamentalParameters; +IffFundamentalData& IffAtcNavAidsLayer1Pdu::getFundamentalParameters() { + return _fundamentalParameters; } -const IffFundamentalData& IffAtcNavAidsLayer1Pdu::getFundamentalParameters() const -{ - return _fundamentalParameters; +const IffFundamentalData& IffAtcNavAidsLayer1Pdu::getFundamentalParameters() + const { + return _fundamentalParameters; } -void IffAtcNavAidsLayer1Pdu::setFundamentalParameters(const IffFundamentalData &pX) -{ - _fundamentalParameters = pX; +void IffAtcNavAidsLayer1Pdu::setFundamentalParameters( + const IffFundamentalData& pX) { + _fundamentalParameters = pX; } -void IffAtcNavAidsLayer1Pdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _emittingEntityId.marshal(dataStream); - _eventID.marshal(dataStream); - _location.marshal(dataStream); - _systemID.marshal(dataStream); - dataStream << _pad2; - _fundamentalParameters.marshal(dataStream); +void IffAtcNavAidsLayer1Pdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _emittingEntityId.marshal(dataStream); + _eventID.marshal(dataStream); + _location.marshal(dataStream); + _systemID.marshal(dataStream); + dataStream << _pad2; + _fundamentalParameters.marshal(dataStream); } -void IffAtcNavAidsLayer1Pdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _emittingEntityId.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - _location.unmarshal(dataStream); - _systemID.unmarshal(dataStream); - dataStream >> _pad2; - _fundamentalParameters.unmarshal(dataStream); +void IffAtcNavAidsLayer1Pdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _emittingEntityId.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + _location.unmarshal(dataStream); + _systemID.unmarshal(dataStream); + dataStream >> _pad2; + _fundamentalParameters.unmarshal(dataStream); } +bool IffAtcNavAidsLayer1Pdu::operator==( + const IffAtcNavAidsLayer1Pdu& rhs) const { + bool ivarsEqual = true; -bool IffAtcNavAidsLayer1Pdu::operator ==(const IffAtcNavAidsLayer1Pdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - if( ! (_emittingEntityId == rhs._emittingEntityId) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_location == rhs._location) ) ivarsEqual = false; - if( ! (_systemID == rhs._systemID) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_fundamentalParameters == rhs._fundamentalParameters) ) ivarsEqual = false; + if (!(_emittingEntityId == rhs._emittingEntityId)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_location == rhs._location)) ivarsEqual = false; + if (!(_systemID == rhs._systemID)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_fundamentalParameters == rhs._fundamentalParameters)) + ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int IffAtcNavAidsLayer1Pdu::getMarshalledSize() const -{ - int marshalSize = 0; +int IffAtcNavAidsLayer1Pdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _emittingEntityId.getMarshalledSize(); // _emittingEntityId - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + _location.getMarshalledSize(); // _location - marshalSize = marshalSize + _systemID.getMarshalledSize(); // _systemID - marshalSize = marshalSize + 2; // _pad2 - marshalSize = marshalSize + _fundamentalParameters.getMarshalledSize(); // _fundamentalParameters - return marshalSize; + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _emittingEntityId.getMarshalledSize(); // _emittingEntityId + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + _location.getMarshalledSize(); // _location + marshalSize = marshalSize + _systemID.getMarshalledSize(); // _systemID + marshalSize = marshalSize + 2; // _pad2 + marshalSize = + marshalSize + + _fundamentalParameters.getMarshalledSize(); // _fundamentalParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -173,7 +141,7 @@ int IffAtcNavAidsLayer1Pdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IffAtcNavAidsLayer1Pdu.h b/src/dis6/IffAtcNavAidsLayer1Pdu.h index f822a743..93d655c9 100644 --- a/src/dis6/IffAtcNavAidsLayer1Pdu.h +++ b/src/dis6/IffAtcNavAidsLayer1Pdu.h @@ -1,87 +1,85 @@ #pragma once +#include #include #include -#include -#include #include -#include -#include +#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.3.7.4.1: Navigational and IFF PDU. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT IffAtcNavAidsLayer1Pdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT IffAtcNavAidsLayer1Pdu + : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity that is the source of the emissions */ - EntityID _emittingEntityId; + EntityID _emittingEntityId; /** Number generated by the issuing simulation to associate realted events. */ - EventID _eventID; + EventID _eventID; - /** Location wrt entity. There is some ambugiuity in the standard here, but this is the order it is listed in the table. */ - Vector3Float _location; + /** Location wrt entity. There is some ambugiuity in the standard here, but + * this is the order it is listed in the table. */ + Vector3Float _location; /** System ID information */ - SystemID _systemID; + SystemID _systemID; /** padding */ - unsigned short _pad2; + unsigned short _pad2; /** fundamental parameters */ - IffFundamentalData _fundamentalParameters; - + IffFundamentalData _fundamentalParameters; public: - IffAtcNavAidsLayer1Pdu(); - virtual ~IffAtcNavAidsLayer1Pdu(); + IffAtcNavAidsLayer1Pdu(); + virtual ~IffAtcNavAidsLayer1Pdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEmittingEntityId(); - const EntityID& getEmittingEntityId() const; - void setEmittingEntityId(const EntityID &pX); + EntityID& getEmittingEntityId(); + const EntityID& getEmittingEntityId() const; + void setEmittingEntityId(const EntityID& pX); - EventID& getEventID(); - const EventID& getEventID() const; - void setEventID(const EventID &pX); + EventID& getEventID(); + const EventID& getEventID() const; + void setEventID(const EventID& pX); - Vector3Float& getLocation(); - const Vector3Float& getLocation() const; - void setLocation(const Vector3Float &pX); + Vector3Float& getLocation(); + const Vector3Float& getLocation() const; + void setLocation(const Vector3Float& pX); - SystemID& getSystemID(); - const SystemID& getSystemID() const; - void setSystemID(const SystemID &pX); + SystemID& getSystemID(); + const SystemID& getSystemID() const; + void setSystemID(const SystemID& pX); - unsigned short getPad2() const; - void setPad2(unsigned short pX); + unsigned short getPad2() const; + void setPad2(unsigned short pX); - IffFundamentalData& getFundamentalParameters(); - const IffFundamentalData& getFundamentalParameters() const; - void setFundamentalParameters(const IffFundamentalData &pX); + IffFundamentalData& getFundamentalParameters(); + const IffFundamentalData& getFundamentalParameters() const; + void setFundamentalParameters(const IffFundamentalData& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IffAtcNavAidsLayer1Pdu& rhs) const; + bool operator==(const IffAtcNavAidsLayer1Pdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -94,7 +92,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IffAtcNavAidsLayer2Pdu.cpp b/src/dis6/IffAtcNavAidsLayer2Pdu.cpp index 1baa855a..0065739b 100644 --- a/src/dis6/IffAtcNavAidsLayer2Pdu.cpp +++ b/src/dis6/IffAtcNavAidsLayer2Pdu.cpp @@ -2,153 +2,132 @@ using namespace DIS; +IffAtcNavAidsLayer2Pdu::IffAtcNavAidsLayer2Pdu() + : IffAtcNavAidsLayer1Pdu(), + _layerHeader(), + _beamData(), + _secondaryOperationalData() {} -IffAtcNavAidsLayer2Pdu::IffAtcNavAidsLayer2Pdu() : IffAtcNavAidsLayer1Pdu(), - _layerHeader(), - _beamData(), - _secondaryOperationalData() -{ +IffAtcNavAidsLayer2Pdu::~IffAtcNavAidsLayer2Pdu() { + _fundamentalIffParameters.clear(); } -IffAtcNavAidsLayer2Pdu::~IffAtcNavAidsLayer2Pdu() -{ - _fundamentalIffParameters.clear(); -} +LayerHeader& IffAtcNavAidsLayer2Pdu::getLayerHeader() { return _layerHeader; } -LayerHeader& IffAtcNavAidsLayer2Pdu::getLayerHeader() -{ - return _layerHeader; +const LayerHeader& IffAtcNavAidsLayer2Pdu::getLayerHeader() const { + return _layerHeader; } -const LayerHeader& IffAtcNavAidsLayer2Pdu::getLayerHeader() const -{ - return _layerHeader; +void IffAtcNavAidsLayer2Pdu::setLayerHeader(const LayerHeader& pX) { + _layerHeader = pX; } -void IffAtcNavAidsLayer2Pdu::setLayerHeader(const LayerHeader &pX) -{ - _layerHeader = pX; -} +BeamData& IffAtcNavAidsLayer2Pdu::getBeamData() { return _beamData; } -BeamData& IffAtcNavAidsLayer2Pdu::getBeamData() -{ - return _beamData; +const BeamData& IffAtcNavAidsLayer2Pdu::getBeamData() const { + return _beamData; } -const BeamData& IffAtcNavAidsLayer2Pdu::getBeamData() const -{ - return _beamData; -} - -void IffAtcNavAidsLayer2Pdu::setBeamData(const BeamData &pX) -{ - _beamData = pX; -} +void IffAtcNavAidsLayer2Pdu::setBeamData(const BeamData& pX) { _beamData = pX; } -BeamData& IffAtcNavAidsLayer2Pdu::getSecondaryOperationalData() -{ - return _secondaryOperationalData; +BeamData& IffAtcNavAidsLayer2Pdu::getSecondaryOperationalData() { + return _secondaryOperationalData; } -const BeamData& IffAtcNavAidsLayer2Pdu::getSecondaryOperationalData() const -{ - return _secondaryOperationalData; +const BeamData& IffAtcNavAidsLayer2Pdu::getSecondaryOperationalData() const { + return _secondaryOperationalData; } -void IffAtcNavAidsLayer2Pdu::setSecondaryOperationalData(const BeamData &pX) -{ - _secondaryOperationalData = pX; +void IffAtcNavAidsLayer2Pdu::setSecondaryOperationalData(const BeamData& pX) { + _secondaryOperationalData = pX; } -std::vector& IffAtcNavAidsLayer2Pdu::getFundamentalIffParameters() -{ - return _fundamentalIffParameters; +std::vector& +IffAtcNavAidsLayer2Pdu::getFundamentalIffParameters() { + return _fundamentalIffParameters; } -const std::vector& IffAtcNavAidsLayer2Pdu::getFundamentalIffParameters() const -{ - return _fundamentalIffParameters; +const std::vector& +IffAtcNavAidsLayer2Pdu::getFundamentalIffParameters() const { + return _fundamentalIffParameters; } -void IffAtcNavAidsLayer2Pdu::setFundamentalIffParameters(const std::vector& pX) -{ - _fundamentalIffParameters = pX; +void IffAtcNavAidsLayer2Pdu::setFundamentalIffParameters( + const std::vector& pX) { + _fundamentalIffParameters = pX; } -void IffAtcNavAidsLayer2Pdu::marshal(DataStream& dataStream) const -{ - IffAtcNavAidsLayer1Pdu::marshal(dataStream); // Marshal information in superclass first - _layerHeader.marshal(dataStream); - _beamData.marshal(dataStream); - _secondaryOperationalData.marshal(dataStream); +void IffAtcNavAidsLayer2Pdu::marshal(DataStream& dataStream) const { + IffAtcNavAidsLayer1Pdu::marshal( + dataStream); // Marshal information in superclass first + _layerHeader.marshal(dataStream); + _beamData.marshal(dataStream); + _secondaryOperationalData.marshal(dataStream); - for(size_t idx = 0; idx < _fundamentalIffParameters.size(); idx++) - { - FundamentalParameterDataIff x = _fundamentalIffParameters[idx]; - x.marshal(dataStream); - } - -} - -void IffAtcNavAidsLayer2Pdu::unmarshal(DataStream& dataStream) -{ - IffAtcNavAidsLayer1Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _layerHeader.unmarshal(dataStream); - _beamData.unmarshal(dataStream); - _secondaryOperationalData.unmarshal(dataStream); - - _fundamentalIffParameters.clear(); - for(size_t idx = 0; idx < _pad2; idx++) - { - FundamentalParameterDataIff x; - x.unmarshal(dataStream); - _fundamentalIffParameters.push_back(x); - } + for (size_t idx = 0; idx < _fundamentalIffParameters.size(); idx++) { + FundamentalParameterDataIff x = _fundamentalIffParameters[idx]; + x.marshal(dataStream); + } } +void IffAtcNavAidsLayer2Pdu::unmarshal(DataStream& dataStream) { + IffAtcNavAidsLayer1Pdu::unmarshal( + dataStream); // unmarshal information in superclass first + _layerHeader.unmarshal(dataStream); + _beamData.unmarshal(dataStream); + _secondaryOperationalData.unmarshal(dataStream); -bool IffAtcNavAidsLayer2Pdu::operator ==(const IffAtcNavAidsLayer2Pdu& rhs) const - { - bool ivarsEqual = true; + _fundamentalIffParameters.clear(); + for (size_t idx = 0; idx < _pad2; idx++) { + FundamentalParameterDataIff x; + x.unmarshal(dataStream); + _fundamentalIffParameters.push_back(x); + } +} - ivarsEqual = IffAtcNavAidsLayer1Pdu::operator==(rhs); +bool IffAtcNavAidsLayer2Pdu::operator==( + const IffAtcNavAidsLayer2Pdu& rhs) const { + bool ivarsEqual = true; - if( ! (_layerHeader == rhs._layerHeader) ) ivarsEqual = false; - if( ! (_beamData == rhs._beamData) ) ivarsEqual = false; - if( ! (_secondaryOperationalData == rhs._secondaryOperationalData) ) ivarsEqual = false; + ivarsEqual = IffAtcNavAidsLayer1Pdu::operator==(rhs); - for(size_t idx = 0; idx < _fundamentalIffParameters.size(); idx++) - { - if( ! ( _fundamentalIffParameters[idx] == rhs._fundamentalIffParameters[idx]) ) ivarsEqual = false; - } + if (!(_layerHeader == rhs._layerHeader)) ivarsEqual = false; + if (!(_beamData == rhs._beamData)) ivarsEqual = false; + if (!(_secondaryOperationalData == rhs._secondaryOperationalData)) + ivarsEqual = false; + for (size_t idx = 0; idx < _fundamentalIffParameters.size(); idx++) { + if (!(_fundamentalIffParameters[idx] == rhs._fundamentalIffParameters[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int IffAtcNavAidsLayer2Pdu::getMarshalledSize() const -{ - int marshalSize = 0; +int IffAtcNavAidsLayer2Pdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = IffAtcNavAidsLayer1Pdu::getMarshalledSize(); - marshalSize = marshalSize + _layerHeader.getMarshalledSize(); // _layerHeader - marshalSize = marshalSize + _beamData.getMarshalledSize(); // _beamData - marshalSize = marshalSize + _secondaryOperationalData.getMarshalledSize(); // _secondaryOperationalData + marshalSize = IffAtcNavAidsLayer1Pdu::getMarshalledSize(); + marshalSize = marshalSize + _layerHeader.getMarshalledSize(); // _layerHeader + marshalSize = marshalSize + _beamData.getMarshalledSize(); // _beamData + marshalSize = + marshalSize + _secondaryOperationalData + .getMarshalledSize(); // _secondaryOperationalData - for(unsigned long long idx=0; idx < _fundamentalIffParameters.size(); idx++) - { - FundamentalParameterDataIff listElement = _fundamentalIffParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _fundamentalIffParameters.size(); + idx++) { + FundamentalParameterDataIff listElement = _fundamentalIffParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -161,7 +140,7 @@ int IffAtcNavAidsLayer2Pdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IffAtcNavAidsLayer2Pdu.h b/src/dis6/IffAtcNavAidsLayer2Pdu.h index cccb6995..82f76422 100644 --- a/src/dis6/IffAtcNavAidsLayer2Pdu.h +++ b/src/dis6/IffAtcNavAidsLayer2Pdu.h @@ -1,74 +1,74 @@ #pragma once -#include -#include +#include + #include #include -#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the +// following fields. This requires manual cleanup. the beamData attribute +// semantics are used in multiple ways. UNFINSISHED -namespace DIS -{ -// Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the following fields. This requires manual cleanup. the beamData attribute semantics are used in multiple ways. UNFINSISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT IffAtcNavAidsLayer2Pdu : public IffAtcNavAidsLayer1Pdu -{ -protected: +class OPENDIS6_EXPORT IffAtcNavAidsLayer2Pdu : public IffAtcNavAidsLayer1Pdu { + protected: /** layer header */ - LayerHeader _layerHeader; + LayerHeader _layerHeader; /** beam data */ - BeamData _beamData; + BeamData _beamData; /** Secondary operational data, 5.2.57 */ - BeamData _secondaryOperationalData; + BeamData _secondaryOperationalData; /** variable length list of fundamental parameters. ^^^This is wrong */ - std::vector _fundamentalIffParameters; - + std::vector _fundamentalIffParameters; public: - IffAtcNavAidsLayer2Pdu(); - virtual ~IffAtcNavAidsLayer2Pdu(); + IffAtcNavAidsLayer2Pdu(); + virtual ~IffAtcNavAidsLayer2Pdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - LayerHeader& getLayerHeader(); - const LayerHeader& getLayerHeader() const; - void setLayerHeader(const LayerHeader &pX); + LayerHeader& getLayerHeader(); + const LayerHeader& getLayerHeader() const; + void setLayerHeader(const LayerHeader& pX); - BeamData& getBeamData(); - const BeamData& getBeamData() const; - void setBeamData(const BeamData &pX); + BeamData& getBeamData(); + const BeamData& getBeamData() const; + void setBeamData(const BeamData& pX); - BeamData& getSecondaryOperationalData(); - const BeamData& getSecondaryOperationalData() const; - void setSecondaryOperationalData(const BeamData &pX); + BeamData& getSecondaryOperationalData(); + const BeamData& getSecondaryOperationalData() const; + void setSecondaryOperationalData(const BeamData& pX); - std::vector& getFundamentalIffParameters(); - const std::vector& getFundamentalIffParameters() const; - void setFundamentalIffParameters(const std::vector& pX); + std::vector& getFundamentalIffParameters(); + const std::vector& getFundamentalIffParameters() + const; + void setFundamentalIffParameters( + const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IffAtcNavAidsLayer2Pdu& rhs) const; + bool operator==(const IffAtcNavAidsLayer2Pdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -81,7 +81,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IffFundamentalData.cpp b/src/dis6/IffFundamentalData.cpp index 1affc6d1..b8b14589 100644 --- a/src/dis6/IffFundamentalData.cpp +++ b/src/dis6/IffFundamentalData.cpp @@ -2,194 +2,136 @@ using namespace DIS; +IffFundamentalData::IffFundamentalData() + : _systemStatus(0), + _alternateParameter4(0), + _informationLayers(0), + _modifier(0), + _parameter1(0), + _parameter2(0), + _parameter3(0), + _parameter4(0), + _parameter5(0), + _parameter6(0) {} -IffFundamentalData::IffFundamentalData(): - _systemStatus(0), - _alternateParameter4(0), - _informationLayers(0), - _modifier(0), - _parameter1(0), - _parameter2(0), - _parameter3(0), - _parameter4(0), - _parameter5(0), - _parameter6(0) -{ -} +IffFundamentalData::~IffFundamentalData() {} -IffFundamentalData::~IffFundamentalData() -{ +unsigned char IffFundamentalData::getSystemStatus() const { + return _systemStatus; } -unsigned char IffFundamentalData::getSystemStatus() const -{ - return _systemStatus; +void IffFundamentalData::setSystemStatus(unsigned char pX) { + _systemStatus = pX; } -void IffFundamentalData::setSystemStatus(unsigned char pX) -{ - _systemStatus = pX; +unsigned char IffFundamentalData::getAlternateParameter4() const { + return _alternateParameter4; } -unsigned char IffFundamentalData::getAlternateParameter4() const -{ - return _alternateParameter4; +void IffFundamentalData::setAlternateParameter4(unsigned char pX) { + _alternateParameter4 = pX; } -void IffFundamentalData::setAlternateParameter4(unsigned char pX) -{ - _alternateParameter4 = pX; +unsigned char IffFundamentalData::getInformationLayers() const { + return _informationLayers; } -unsigned char IffFundamentalData::getInformationLayers() const -{ - return _informationLayers; +void IffFundamentalData::setInformationLayers(unsigned char pX) { + _informationLayers = pX; } -void IffFundamentalData::setInformationLayers(unsigned char pX) -{ - _informationLayers = pX; -} +unsigned char IffFundamentalData::getModifier() const { return _modifier; } -unsigned char IffFundamentalData::getModifier() const -{ - return _modifier; -} +void IffFundamentalData::setModifier(unsigned char pX) { _modifier = pX; } -void IffFundamentalData::setModifier(unsigned char pX) -{ - _modifier = pX; -} +unsigned short IffFundamentalData::getParameter1() const { return _parameter1; } -unsigned short IffFundamentalData::getParameter1() const -{ - return _parameter1; -} +void IffFundamentalData::setParameter1(unsigned short pX) { _parameter1 = pX; } -void IffFundamentalData::setParameter1(unsigned short pX) -{ - _parameter1 = pX; -} +unsigned short IffFundamentalData::getParameter2() const { return _parameter2; } -unsigned short IffFundamentalData::getParameter2() const -{ - return _parameter2; -} +void IffFundamentalData::setParameter2(unsigned short pX) { _parameter2 = pX; } -void IffFundamentalData::setParameter2(unsigned short pX) -{ - _parameter2 = pX; -} +unsigned short IffFundamentalData::getParameter3() const { return _parameter3; } -unsigned short IffFundamentalData::getParameter3() const -{ - return _parameter3; -} +void IffFundamentalData::setParameter3(unsigned short pX) { _parameter3 = pX; } -void IffFundamentalData::setParameter3(unsigned short pX) -{ - _parameter3 = pX; -} +unsigned short IffFundamentalData::getParameter4() const { return _parameter4; } -unsigned short IffFundamentalData::getParameter4() const -{ - return _parameter4; -} +void IffFundamentalData::setParameter4(unsigned short pX) { _parameter4 = pX; } -void IffFundamentalData::setParameter4(unsigned short pX) -{ - _parameter4 = pX; -} +unsigned short IffFundamentalData::getParameter5() const { return _parameter5; } -unsigned short IffFundamentalData::getParameter5() const -{ - return _parameter5; -} +void IffFundamentalData::setParameter5(unsigned short pX) { _parameter5 = pX; } -void IffFundamentalData::setParameter5(unsigned short pX) -{ - _parameter5 = pX; -} +unsigned short IffFundamentalData::getParameter6() const { return _parameter6; } -unsigned short IffFundamentalData::getParameter6() const -{ - return _parameter6; -} +void IffFundamentalData::setParameter6(unsigned short pX) { _parameter6 = pX; } -void IffFundamentalData::setParameter6(unsigned short pX) -{ - _parameter6 = pX; +void IffFundamentalData::marshal(DataStream& dataStream) const { + dataStream << _systemStatus; + dataStream << _alternateParameter4; + dataStream << _informationLayers; + dataStream << _modifier; + dataStream << _parameter1; + dataStream << _parameter2; + dataStream << _parameter3; + dataStream << _parameter4; + dataStream << _parameter5; + dataStream << _parameter6; } -void IffFundamentalData::marshal(DataStream& dataStream) const -{ - dataStream << _systemStatus; - dataStream << _alternateParameter4; - dataStream << _informationLayers; - dataStream << _modifier; - dataStream << _parameter1; - dataStream << _parameter2; - dataStream << _parameter3; - dataStream << _parameter4; - dataStream << _parameter5; - dataStream << _parameter6; +void IffFundamentalData::unmarshal(DataStream& dataStream) { + dataStream >> _systemStatus; + dataStream >> _alternateParameter4; + dataStream >> _informationLayers; + dataStream >> _modifier; + dataStream >> _parameter1; + dataStream >> _parameter2; + dataStream >> _parameter3; + dataStream >> _parameter4; + dataStream >> _parameter5; + dataStream >> _parameter6; } -void IffFundamentalData::unmarshal(DataStream& dataStream) -{ - dataStream >> _systemStatus; - dataStream >> _alternateParameter4; - dataStream >> _informationLayers; - dataStream >> _modifier; - dataStream >> _parameter1; - dataStream >> _parameter2; - dataStream >> _parameter3; - dataStream >> _parameter4; - dataStream >> _parameter5; - dataStream >> _parameter6; +bool IffFundamentalData::operator==(const IffFundamentalData& rhs) const { + bool ivarsEqual = true; + + if (!(_systemStatus == rhs._systemStatus)) ivarsEqual = false; + if (!(_alternateParameter4 == rhs._alternateParameter4)) ivarsEqual = false; + if (!(_informationLayers == rhs._informationLayers)) ivarsEqual = false; + if (!(_modifier == rhs._modifier)) ivarsEqual = false; + if (!(_parameter1 == rhs._parameter1)) ivarsEqual = false; + if (!(_parameter2 == rhs._parameter2)) ivarsEqual = false; + if (!(_parameter3 == rhs._parameter3)) ivarsEqual = false; + if (!(_parameter4 == rhs._parameter4)) ivarsEqual = false; + if (!(_parameter5 == rhs._parameter5)) ivarsEqual = false; + if (!(_parameter6 == rhs._parameter6)) ivarsEqual = false; + + return ivarsEqual; } +int IffFundamentalData::getMarshalledSize() const { + int marshalSize = 0; -bool IffFundamentalData::operator ==(const IffFundamentalData& rhs) const - { - bool ivarsEqual = true; - - if( ! (_systemStatus == rhs._systemStatus) ) ivarsEqual = false; - if( ! (_alternateParameter4 == rhs._alternateParameter4) ) ivarsEqual = false; - if( ! (_informationLayers == rhs._informationLayers) ) ivarsEqual = false; - if( ! (_modifier == rhs._modifier) ) ivarsEqual = false; - if( ! (_parameter1 == rhs._parameter1) ) ivarsEqual = false; - if( ! (_parameter2 == rhs._parameter2) ) ivarsEqual = false; - if( ! (_parameter3 == rhs._parameter3) ) ivarsEqual = false; - if( ! (_parameter4 == rhs._parameter4) ) ivarsEqual = false; - if( ! (_parameter5 == rhs._parameter5) ) ivarsEqual = false; - if( ! (_parameter6 == rhs._parameter6) ) ivarsEqual = false; - - return ivarsEqual; - } - -int IffFundamentalData::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _systemStatus - marshalSize = marshalSize + 1; // _alternateParameter4 - marshalSize = marshalSize + 1; // _informationLayers - marshalSize = marshalSize + 1; // _modifier - marshalSize = marshalSize + 2; // _parameter1 - marshalSize = marshalSize + 2; // _parameter2 - marshalSize = marshalSize + 2; // _parameter3 - marshalSize = marshalSize + 2; // _parameter4 - marshalSize = marshalSize + 2; // _parameter5 - marshalSize = marshalSize + 2; // _parameter6 - return marshalSize; + marshalSize = marshalSize + 1; // _systemStatus + marshalSize = marshalSize + 1; // _alternateParameter4 + marshalSize = marshalSize + 1; // _informationLayers + marshalSize = marshalSize + 1; // _modifier + marshalSize = marshalSize + 2; // _parameter1 + marshalSize = marshalSize + 2; // _parameter2 + marshalSize = marshalSize + 2; // _parameter3 + marshalSize = marshalSize + 2; // _parameter4 + marshalSize = marshalSize + 2; // _parameter5 + marshalSize = marshalSize + 2; // _parameter6 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -202,7 +144,7 @@ int IffFundamentalData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IffFundamentalData.h b/src/dis6/IffFundamentalData.h index 5cb9c0a6..9c370309 100644 --- a/src/dis6/IffFundamentalData.h +++ b/src/dis6/IffFundamentalData.h @@ -1,100 +1,96 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.42. Basic operational data ofr IFF ATC NAVAIDS -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT IffFundamentalData -{ -protected: +class OPENDIS6_EXPORT IffFundamentalData { + protected: /** system status */ - unsigned char _systemStatus; + unsigned char _systemStatus; /** Alternate parameter 4 */ - unsigned char _alternateParameter4; + unsigned char _alternateParameter4; /** eight boolean fields */ - unsigned char _informationLayers; + unsigned char _informationLayers; /** enumeration */ - unsigned char _modifier; + unsigned char _modifier; /** parameter, enumeration */ - unsigned short _parameter1; + unsigned short _parameter1; /** parameter, enumeration */ - unsigned short _parameter2; + unsigned short _parameter2; /** parameter, enumeration */ - unsigned short _parameter3; + unsigned short _parameter3; /** parameter, enumeration */ - unsigned short _parameter4; + unsigned short _parameter4; /** parameter, enumeration */ - unsigned short _parameter5; + unsigned short _parameter5; /** parameter, enumeration */ - unsigned short _parameter6; - + unsigned short _parameter6; public: - IffFundamentalData(); - virtual ~IffFundamentalData(); + IffFundamentalData(); + virtual ~IffFundamentalData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getSystemStatus() const; - void setSystemStatus(unsigned char pX); + unsigned char getSystemStatus() const; + void setSystemStatus(unsigned char pX); - unsigned char getAlternateParameter4() const; - void setAlternateParameter4(unsigned char pX); + unsigned char getAlternateParameter4() const; + void setAlternateParameter4(unsigned char pX); - unsigned char getInformationLayers() const; - void setInformationLayers(unsigned char pX); + unsigned char getInformationLayers() const; + void setInformationLayers(unsigned char pX); - unsigned char getModifier() const; - void setModifier(unsigned char pX); + unsigned char getModifier() const; + void setModifier(unsigned char pX); - unsigned short getParameter1() const; - void setParameter1(unsigned short pX); + unsigned short getParameter1() const; + void setParameter1(unsigned short pX); - unsigned short getParameter2() const; - void setParameter2(unsigned short pX); + unsigned short getParameter2() const; + void setParameter2(unsigned short pX); - unsigned short getParameter3() const; - void setParameter3(unsigned short pX); + unsigned short getParameter3() const; + void setParameter3(unsigned short pX); - unsigned short getParameter4() const; - void setParameter4(unsigned short pX); + unsigned short getParameter4() const; + void setParameter4(unsigned short pX); - unsigned short getParameter5() const; - void setParameter5(unsigned short pX); + unsigned short getParameter5() const; + void setParameter5(unsigned short pX); - unsigned short getParameter6() const; - void setParameter6(unsigned short pX); + unsigned short getParameter6() const; + void setParameter6(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IffFundamentalData& rhs) const; + bool operator==(const IffFundamentalData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -107,7 +103,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IntercomCommunicationsParameters.cpp b/src/dis6/IntercomCommunicationsParameters.cpp index 475b3b9c..1d0246c7 100644 --- a/src/dis6/IntercomCommunicationsParameters.cpp +++ b/src/dis6/IntercomCommunicationsParameters.cpp @@ -31,28 +31,25 @@ void IntercomCommunicationsParameters::setRecordSpecificField(unsigned int pX) { _recordSpecificField = pX; } -void IntercomCommunicationsParameters::marshal(DataStream &dataStream) const { +void IntercomCommunicationsParameters::marshal(DataStream& dataStream) const { dataStream << _recordType; dataStream << _recordLength; dataStream << _recordSpecificField; } -void IntercomCommunicationsParameters::unmarshal(DataStream &dataStream) { +void IntercomCommunicationsParameters::unmarshal(DataStream& dataStream) { dataStream >> _recordType; dataStream >> _recordLength; dataStream >> _recordSpecificField; } bool IntercomCommunicationsParameters::operator==( - const IntercomCommunicationsParameters &rhs) const { + const IntercomCommunicationsParameters& rhs) const { auto ivarsEqual = true; - if (!(_recordType == rhs._recordType)) - ivarsEqual = false; - if (!(_recordLength == rhs._recordLength)) - ivarsEqual = false; - if (!(_recordSpecificField == rhs._recordSpecificField)) - ivarsEqual = false; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_recordSpecificField == rhs._recordSpecificField)) ivarsEqual = false; return ivarsEqual; } @@ -60,9 +57,9 @@ bool IntercomCommunicationsParameters::operator==( int IntercomCommunicationsParameters::getMarshalledSize() const { auto marshalSize = 0; - marshalSize = marshalSize + 2; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 4; // _recordSpecificField + marshalSize = marshalSize + 2; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 4; // _recordSpecificField return marshalSize; } diff --git a/src/dis6/IntercomCommunicationsParameters.h b/src/dis6/IntercomCommunicationsParameters.h index f32e0d26..05b28ead 100644 --- a/src/dis6/IntercomCommunicationsParameters.h +++ b/src/dis6/IntercomCommunicationsParameters.h @@ -1,58 +1,55 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.46. Intercom communcations parameters -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT IntercomCommunicationsParameters -{ -protected: +class OPENDIS6_EXPORT IntercomCommunicationsParameters { + protected: /** Type of intercom parameters record */ - unsigned short _recordType; + unsigned short _recordType; /** length of record */ - unsigned short _recordLength; - - /** Jerks. Looks like the committee is forcing a lookup of the record type parameter to find out how long the field is. This is a placeholder. */ - unsigned int _recordSpecificField; + unsigned short _recordLength; + /** Jerks. Looks like the committee is forcing a lookup of the record type + * parameter to find out how long the field is. This is a placeholder. */ + unsigned int _recordSpecificField; public: - IntercomCommunicationsParameters(); - virtual ~IntercomCommunicationsParameters(); + IntercomCommunicationsParameters(); + virtual ~IntercomCommunicationsParameters(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getRecordType() const; - void setRecordType(unsigned short pX); + unsigned short getRecordType() const; + void setRecordType(unsigned short pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned int getRecordSpecificField() const; - void setRecordSpecificField(unsigned int pX); + unsigned int getRecordSpecificField() const; + void setRecordSpecificField(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IntercomCommunicationsParameters& rhs) const; + bool operator==(const IntercomCommunicationsParameters& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IntercomControlPdu.cpp b/src/dis6/IntercomControlPdu.cpp index 8c4ec83c..744f753b 100644 --- a/src/dis6/IntercomControlPdu.cpp +++ b/src/dis6/IntercomControlPdu.cpp @@ -2,263 +2,223 @@ using namespace DIS; - -IntercomControlPdu::IntercomControlPdu() : RadioCommunicationsFamilyPdu(), - _controlType(0), - _communicationsChannelType(0), - _sourceEntityID(), - _sourceCommunicationsDeviceID(0), - _sourceLineID(0), - _transmitPriority(0), - _transmitLineState(0), - _command(0), - _masterEntityID(), - _masterCommunicationsDeviceID(0), - _intercomParametersLength(0) -{ - setPduType( 32 ); +IntercomControlPdu::IntercomControlPdu() + : RadioCommunicationsFamilyPdu(), + _controlType(0), + _communicationsChannelType(0), + _sourceEntityID(), + _sourceCommunicationsDeviceID(0), + _sourceLineID(0), + _transmitPriority(0), + _transmitLineState(0), + _command(0), + _masterEntityID(), + _masterCommunicationsDeviceID(0), + _intercomParametersLength(0) { + setPduType(32); } -IntercomControlPdu::~IntercomControlPdu() -{ - _intercomParameters.clear(); -} +IntercomControlPdu::~IntercomControlPdu() { _intercomParameters.clear(); } -unsigned char IntercomControlPdu::getControlType() const -{ - return _controlType; +unsigned char IntercomControlPdu::getControlType() const { + return _controlType; } -void IntercomControlPdu::setControlType(unsigned char pX) -{ - _controlType = pX; -} +void IntercomControlPdu::setControlType(unsigned char pX) { _controlType = pX; } -unsigned char IntercomControlPdu::getCommunicationsChannelType() const -{ - return _communicationsChannelType; +unsigned char IntercomControlPdu::getCommunicationsChannelType() const { + return _communicationsChannelType; } -void IntercomControlPdu::setCommunicationsChannelType(unsigned char pX) -{ - _communicationsChannelType = pX; +void IntercomControlPdu::setCommunicationsChannelType(unsigned char pX) { + _communicationsChannelType = pX; } -EntityID& IntercomControlPdu::getSourceEntityID() -{ - return _sourceEntityID; -} +EntityID& IntercomControlPdu::getSourceEntityID() { return _sourceEntityID; } -const EntityID& IntercomControlPdu::getSourceEntityID() const -{ - return _sourceEntityID; +const EntityID& IntercomControlPdu::getSourceEntityID() const { + return _sourceEntityID; } -void IntercomControlPdu::setSourceEntityID(const EntityID &pX) -{ - _sourceEntityID = pX; +void IntercomControlPdu::setSourceEntityID(const EntityID& pX) { + _sourceEntityID = pX; } -unsigned char IntercomControlPdu::getSourceCommunicationsDeviceID() const -{ - return _sourceCommunicationsDeviceID; +unsigned char IntercomControlPdu::getSourceCommunicationsDeviceID() const { + return _sourceCommunicationsDeviceID; } -void IntercomControlPdu::setSourceCommunicationsDeviceID(unsigned char pX) -{ - _sourceCommunicationsDeviceID = pX; +void IntercomControlPdu::setSourceCommunicationsDeviceID(unsigned char pX) { + _sourceCommunicationsDeviceID = pX; } -unsigned char IntercomControlPdu::getSourceLineID() const -{ - return _sourceLineID; +unsigned char IntercomControlPdu::getSourceLineID() const { + return _sourceLineID; } -void IntercomControlPdu::setSourceLineID(unsigned char pX) -{ - _sourceLineID = pX; +void IntercomControlPdu::setSourceLineID(unsigned char pX) { + _sourceLineID = pX; } -unsigned char IntercomControlPdu::getTransmitPriority() const -{ - return _transmitPriority; +unsigned char IntercomControlPdu::getTransmitPriority() const { + return _transmitPriority; } -void IntercomControlPdu::setTransmitPriority(unsigned char pX) -{ - _transmitPriority = pX; +void IntercomControlPdu::setTransmitPriority(unsigned char pX) { + _transmitPriority = pX; } -unsigned char IntercomControlPdu::getTransmitLineState() const -{ - return _transmitLineState; +unsigned char IntercomControlPdu::getTransmitLineState() const { + return _transmitLineState; } -void IntercomControlPdu::setTransmitLineState(unsigned char pX) -{ - _transmitLineState = pX; +void IntercomControlPdu::setTransmitLineState(unsigned char pX) { + _transmitLineState = pX; } -unsigned char IntercomControlPdu::getCommand() const -{ - return _command; -} +unsigned char IntercomControlPdu::getCommand() const { return _command; } -void IntercomControlPdu::setCommand(unsigned char pX) -{ - _command = pX; -} +void IntercomControlPdu::setCommand(unsigned char pX) { _command = pX; } -EntityID& IntercomControlPdu::getMasterEntityID() -{ - return _masterEntityID; -} +EntityID& IntercomControlPdu::getMasterEntityID() { return _masterEntityID; } -const EntityID& IntercomControlPdu::getMasterEntityID() const -{ - return _masterEntityID; +const EntityID& IntercomControlPdu::getMasterEntityID() const { + return _masterEntityID; } -void IntercomControlPdu::setMasterEntityID(const EntityID &pX) -{ - _masterEntityID = pX; +void IntercomControlPdu::setMasterEntityID(const EntityID& pX) { + _masterEntityID = pX; } -unsigned short IntercomControlPdu::getMasterCommunicationsDeviceID() const -{ - return _masterCommunicationsDeviceID; +unsigned short IntercomControlPdu::getMasterCommunicationsDeviceID() const { + return _masterCommunicationsDeviceID; } -void IntercomControlPdu::setMasterCommunicationsDeviceID(unsigned short pX) -{ - _masterCommunicationsDeviceID = pX; +void IntercomControlPdu::setMasterCommunicationsDeviceID(unsigned short pX) { + _masterCommunicationsDeviceID = pX; } -unsigned int IntercomControlPdu::getIntercomParametersLength() const -{ - return _intercomParameters.size(); +unsigned int IntercomControlPdu::getIntercomParametersLength() const { + return _intercomParameters.size(); } -std::vector& IntercomControlPdu::getIntercomParameters() -{ - return _intercomParameters; +std::vector& +IntercomControlPdu::getIntercomParameters() { + return _intercomParameters; } -const std::vector& IntercomControlPdu::getIntercomParameters() const -{ - return _intercomParameters; +const std::vector& +IntercomControlPdu::getIntercomParameters() const { + return _intercomParameters; } -void IntercomControlPdu::setIntercomParameters(const std::vector& pX) -{ - _intercomParameters = pX; +void IntercomControlPdu::setIntercomParameters( + const std::vector& pX) { + _intercomParameters = pX; } -void IntercomControlPdu::marshal(DataStream& dataStream) const -{ - RadioCommunicationsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _controlType; - dataStream << _communicationsChannelType; - _sourceEntityID.marshal(dataStream); - dataStream << _sourceCommunicationsDeviceID; - dataStream << _sourceLineID; - dataStream << _transmitPriority; - dataStream << _transmitLineState; - dataStream << _command; - _masterEntityID.marshal(dataStream); - dataStream << _masterCommunicationsDeviceID; - dataStream << ( unsigned int )_intercomParameters.size(); - - for(size_t idx = 0; idx < _intercomParameters.size(); idx++) - { - IntercomCommunicationsParameters x = _intercomParameters[idx]; - x.marshal(dataStream); - } +void IntercomControlPdu::marshal(DataStream& dataStream) const { + RadioCommunicationsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _controlType; + dataStream << _communicationsChannelType; + _sourceEntityID.marshal(dataStream); + dataStream << _sourceCommunicationsDeviceID; + dataStream << _sourceLineID; + dataStream << _transmitPriority; + dataStream << _transmitLineState; + dataStream << _command; + _masterEntityID.marshal(dataStream); + dataStream << _masterCommunicationsDeviceID; + dataStream << (unsigned int)_intercomParameters.size(); + for (size_t idx = 0; idx < _intercomParameters.size(); idx++) { + IntercomCommunicationsParameters x = _intercomParameters[idx]; + x.marshal(dataStream); + } } -void IntercomControlPdu::unmarshal(DataStream& dataStream) -{ - RadioCommunicationsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _controlType; - dataStream >> _communicationsChannelType; - _sourceEntityID.unmarshal(dataStream); - dataStream >> _sourceCommunicationsDeviceID; - dataStream >> _sourceLineID; - dataStream >> _transmitPriority; - dataStream >> _transmitLineState; - dataStream >> _command; - _masterEntityID.unmarshal(dataStream); - dataStream >> _masterCommunicationsDeviceID; - dataStream >> _intercomParametersLength; - - _intercomParameters.clear(); - for(size_t idx = 0; idx < _intercomParametersLength; idx++) - { - IntercomCommunicationsParameters x; - x.unmarshal(dataStream); - _intercomParameters.push_back(x); - } +void IntercomControlPdu::unmarshal(DataStream& dataStream) { + RadioCommunicationsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _controlType; + dataStream >> _communicationsChannelType; + _sourceEntityID.unmarshal(dataStream); + dataStream >> _sourceCommunicationsDeviceID; + dataStream >> _sourceLineID; + dataStream >> _transmitPriority; + dataStream >> _transmitLineState; + dataStream >> _command; + _masterEntityID.unmarshal(dataStream); + dataStream >> _masterCommunicationsDeviceID; + dataStream >> _intercomParametersLength; + + _intercomParameters.clear(); + for (size_t idx = 0; idx < _intercomParametersLength; idx++) { + IntercomCommunicationsParameters x; + x.unmarshal(dataStream); + _intercomParameters.push_back(x); + } } +bool IntercomControlPdu::operator==(const IntercomControlPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); + + if (!(_controlType == rhs._controlType)) ivarsEqual = false; + if (!(_communicationsChannelType == rhs._communicationsChannelType)) + ivarsEqual = false; + if (!(_sourceEntityID == rhs._sourceEntityID)) ivarsEqual = false; + if (!(_sourceCommunicationsDeviceID == rhs._sourceCommunicationsDeviceID)) + ivarsEqual = false; + if (!(_sourceLineID == rhs._sourceLineID)) ivarsEqual = false; + if (!(_transmitPriority == rhs._transmitPriority)) ivarsEqual = false; + if (!(_transmitLineState == rhs._transmitLineState)) ivarsEqual = false; + if (!(_command == rhs._command)) ivarsEqual = false; + if (!(_masterEntityID == rhs._masterEntityID)) ivarsEqual = false; + if (!(_masterCommunicationsDeviceID == rhs._masterCommunicationsDeviceID)) + ivarsEqual = false; + + for (size_t idx = 0; idx < _intercomParameters.size(); idx++) { + if (!(_intercomParameters[idx] == rhs._intercomParameters[idx])) + ivarsEqual = false; + } + + return ivarsEqual; +} -bool IntercomControlPdu::operator ==(const IntercomControlPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); - - if( ! (_controlType == rhs._controlType) ) ivarsEqual = false; - if( ! (_communicationsChannelType == rhs._communicationsChannelType) ) ivarsEqual = false; - if( ! (_sourceEntityID == rhs._sourceEntityID) ) ivarsEqual = false; - if( ! (_sourceCommunicationsDeviceID == rhs._sourceCommunicationsDeviceID) ) ivarsEqual = false; - if( ! (_sourceLineID == rhs._sourceLineID) ) ivarsEqual = false; - if( ! (_transmitPriority == rhs._transmitPriority) ) ivarsEqual = false; - if( ! (_transmitLineState == rhs._transmitLineState) ) ivarsEqual = false; - if( ! (_command == rhs._command) ) ivarsEqual = false; - if( ! (_masterEntityID == rhs._masterEntityID) ) ivarsEqual = false; - if( ! (_masterCommunicationsDeviceID == rhs._masterCommunicationsDeviceID) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _intercomParameters.size(); idx++) - { - if( ! ( _intercomParameters[idx] == rhs._intercomParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int IntercomControlPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _controlType - marshalSize = marshalSize + 1; // _communicationsChannelType - marshalSize = marshalSize + _sourceEntityID.getMarshalledSize(); // _sourceEntityID - marshalSize = marshalSize + 1; // _sourceCommunicationsDeviceID - marshalSize = marshalSize + 1; // _sourceLineID - marshalSize = marshalSize + 1; // _transmitPriority - marshalSize = marshalSize + 1; // _transmitLineState - marshalSize = marshalSize + 1; // _command - marshalSize = marshalSize + _masterEntityID.getMarshalledSize(); // _masterEntityID - marshalSize = marshalSize + 2; // _masterCommunicationsDeviceID - marshalSize = marshalSize + 4; // _intercomParametersLength - - for(unsigned long long idx=0; idx < _intercomParameters.size(); idx++) - { - IntercomCommunicationsParameters listElement = _intercomParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; +int IntercomControlPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _controlType + marshalSize = marshalSize + 1; // _communicationsChannelType + marshalSize = + marshalSize + _sourceEntityID.getMarshalledSize(); // _sourceEntityID + marshalSize = marshalSize + 1; // _sourceCommunicationsDeviceID + marshalSize = marshalSize + 1; // _sourceLineID + marshalSize = marshalSize + 1; // _transmitPriority + marshalSize = marshalSize + 1; // _transmitLineState + marshalSize = marshalSize + 1; // _command + marshalSize = + marshalSize + _masterEntityID.getMarshalledSize(); // _masterEntityID + marshalSize = marshalSize + 2; // _masterCommunicationsDeviceID + marshalSize = marshalSize + 4; // _intercomParametersLength + + for (unsigned long long idx = 0; idx < _intercomParameters.size(); idx++) { + IntercomCommunicationsParameters listElement = _intercomParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -271,7 +231,7 @@ int IntercomControlPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IntercomControlPdu.h b/src/dis6/IntercomControlPdu.h index 77c3eb67..4d00fed3 100644 --- a/src/dis6/IntercomControlPdu.h +++ b/src/dis6/IntercomControlPdu.h @@ -1,119 +1,122 @@ #pragma once -#include +#include + #include #include -#include #include -#include #include +#include +namespace DIS { +// Section 5.3.8.5. Detailed inofrmation about the state of an intercom device +// and the actions it is requestion of another intercom device, or the +// response to a requested action. Required manual intervention to fix the +// intercom parameters, which can be of varialbe length. UNFINSISHED -namespace DIS -{ -// Section 5.3.8.5. Detailed inofrmation about the state of an intercom device and the actions it is requestion of another intercom device, or the response to a requested action. Required manual intervention to fix the intercom parameters, which can be of varialbe length. UNFINSISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { + protected: /** control type */ - unsigned char _controlType; + unsigned char _controlType; /** control type */ - unsigned char _communicationsChannelType; + unsigned char _communicationsChannelType; /** Source entity ID */ - EntityID _sourceEntityID; + EntityID _sourceEntityID; /** The specific intercom device being simulated within an entity. */ - unsigned char _sourceCommunicationsDeviceID; + unsigned char _sourceCommunicationsDeviceID; /** Line number to which the intercom control refers */ - unsigned char _sourceLineID; + unsigned char _sourceLineID; - /** priority of this message relative to transmissons from other intercom devices */ - unsigned char _transmitPriority; + /** priority of this message relative to transmissons from other intercom + * devices */ + unsigned char _transmitPriority; /** current transmit state of the line */ - unsigned char _transmitLineState; + unsigned char _transmitLineState; /** detailed type requested. */ - unsigned char _command; + unsigned char _command; /** eid of the entity that has created this intercom channel. */ - EntityID _masterEntityID; + EntityID _masterEntityID; /** specific intercom device that has created this intercom channel */ - unsigned short _masterCommunicationsDeviceID; + unsigned short _masterCommunicationsDeviceID; /** number of intercom parameters */ - unsigned int _intercomParametersLength; - - /** ^^^This is wrong--the length of the data field is variable. Using a long for now. */ - std::vector _intercomParameters; + unsigned int _intercomParametersLength; + /** ^^^This is wrong--the length of the data field is variable. Using a long + * for now. */ + std::vector _intercomParameters; public: - IntercomControlPdu(); - virtual ~IntercomControlPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + IntercomControlPdu(); + virtual ~IntercomControlPdu(); - unsigned char getControlType() const; - void setControlType(unsigned char pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getCommunicationsChannelType() const; - void setCommunicationsChannelType(unsigned char pX); + unsigned char getControlType() const; + void setControlType(unsigned char pX); - EntityID& getSourceEntityID(); - const EntityID& getSourceEntityID() const; - void setSourceEntityID(const EntityID &pX); + unsigned char getCommunicationsChannelType() const; + void setCommunicationsChannelType(unsigned char pX); - unsigned char getSourceCommunicationsDeviceID() const; - void setSourceCommunicationsDeviceID(unsigned char pX); + EntityID& getSourceEntityID(); + const EntityID& getSourceEntityID() const; + void setSourceEntityID(const EntityID& pX); - unsigned char getSourceLineID() const; - void setSourceLineID(unsigned char pX); + unsigned char getSourceCommunicationsDeviceID() const; + void setSourceCommunicationsDeviceID(unsigned char pX); - unsigned char getTransmitPriority() const; - void setTransmitPriority(unsigned char pX); + unsigned char getSourceLineID() const; + void setSourceLineID(unsigned char pX); - unsigned char getTransmitLineState() const; - void setTransmitLineState(unsigned char pX); + unsigned char getTransmitPriority() const; + void setTransmitPriority(unsigned char pX); - unsigned char getCommand() const; - void setCommand(unsigned char pX); + unsigned char getTransmitLineState() const; + void setTransmitLineState(unsigned char pX); - EntityID& getMasterEntityID(); - const EntityID& getMasterEntityID() const; - void setMasterEntityID(const EntityID &pX); + unsigned char getCommand() const; + void setCommand(unsigned char pX); - unsigned short getMasterCommunicationsDeviceID() const; - void setMasterCommunicationsDeviceID(unsigned short pX); + EntityID& getMasterEntityID(); + const EntityID& getMasterEntityID() const; + void setMasterEntityID(const EntityID& pX); - unsigned int getIntercomParametersLength() const; + unsigned short getMasterCommunicationsDeviceID() const; + void setMasterCommunicationsDeviceID(unsigned short pX); - std::vector& getIntercomParameters(); - const std::vector& getIntercomParameters() const; - void setIntercomParameters(const std::vector& pX); + unsigned int getIntercomParametersLength() const; + std::vector& getIntercomParameters(); + const std::vector& getIntercomParameters() + const; + void setIntercomParameters( + const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const IntercomControlPdu& rhs) const; + bool operator==(const IntercomControlPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -126,7 +129,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IntercomSignalPdu.cpp b/src/dis6/IntercomSignalPdu.cpp index fa0277cf..22426a76 100644 --- a/src/dis6/IntercomSignalPdu.cpp +++ b/src/dis6/IntercomSignalPdu.cpp @@ -3,19 +3,24 @@ using namespace DIS; IntercomSignalPdu::IntercomSignalPdu() - : RadioCommunicationsFamilyPdu(), _entityID(), _communicationsDeviceID(0), - _encodingScheme(0), _tdlType(0), _sampleRate(0), _dataLength(0), + : RadioCommunicationsFamilyPdu(), + _entityID(), + _communicationsDeviceID(0), + _encodingScheme(0), + _tdlType(0), + _sampleRate(0), + _dataLength(0), _samples(0) { setPduType(31); } IntercomSignalPdu::~IntercomSignalPdu() { _data.clear(); } -EntityID &IntercomSignalPdu::getEntityID() { return _entityID; } +EntityID& IntercomSignalPdu::getEntityID() { return _entityID; } -const EntityID &IntercomSignalPdu::getEntityID() const { return _entityID; } +const EntityID& IntercomSignalPdu::getEntityID() const { return _entityID; } -void IntercomSignalPdu::setEntityID(const EntityID &pX) { _entityID = pX; } +void IntercomSignalPdu::setEntityID(const EntityID& pX) { _entityID = pX; } unsigned short IntercomSignalPdu::getCommunicationsDeviceID() const { return _communicationsDeviceID; @@ -47,15 +52,15 @@ unsigned short IntercomSignalPdu::getSamples() const { return _samples; } void IntercomSignalPdu::setSamples(unsigned short pX) { _samples = pX; } -std::vector &IntercomSignalPdu::getData() { return _data; } +std::vector& IntercomSignalPdu::getData() { return _data; } -const std::vector &IntercomSignalPdu::getData() const { return _data; } +const std::vector& IntercomSignalPdu::getData() const { return _data; } -void IntercomSignalPdu::setData(const std::vector &pX) { _data = pX; } +void IntercomSignalPdu::setData(const std::vector& pX) { _data = pX; } -void IntercomSignalPdu::marshal(DataStream &dataStream) const { +void IntercomSignalPdu::marshal(DataStream& dataStream) const { RadioCommunicationsFamilyPdu::marshal( - dataStream); // Marshal information in superclass first + dataStream); // Marshal information in superclass first _entityID.marshal(dataStream); dataStream << _communicationsDeviceID; dataStream << _encodingScheme; @@ -64,14 +69,14 @@ void IntercomSignalPdu::marshal(DataStream &dataStream) const { dataStream << (unsigned short)_data.size(); dataStream << _samples; - for (auto &byte : _data) { + for (auto& byte : _data) { dataStream << byte; } } -void IntercomSignalPdu::unmarshal(DataStream &dataStream) { +void IntercomSignalPdu::unmarshal(DataStream& dataStream) { RadioCommunicationsFamilyPdu::unmarshal( - dataStream); // unmarshal information in superclass first + dataStream); // unmarshal information in superclass first _entityID.unmarshal(dataStream); dataStream >> _communicationsDeviceID; dataStream >> _encodingScheme; @@ -88,23 +93,18 @@ void IntercomSignalPdu::unmarshal(DataStream &dataStream) { } } -bool IntercomSignalPdu::operator==(const IntercomSignalPdu &rhs) const { +bool IntercomSignalPdu::operator==(const IntercomSignalPdu& rhs) const { bool ivarsEqual = true; ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); - if (!(_entityID == rhs._entityID)) - ivarsEqual = false; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; if (!(_communicationsDeviceID == rhs._communicationsDeviceID)) ivarsEqual = false; - if (!(_encodingScheme == rhs._encodingScheme)) - ivarsEqual = false; - if (!(_tdlType == rhs._tdlType)) - ivarsEqual = false; - if (!(_sampleRate == rhs._sampleRate)) - ivarsEqual = false; - if (!(_samples == rhs._samples)) - ivarsEqual = false; + if (!(_encodingScheme == rhs._encodingScheme)) ivarsEqual = false; + if (!(_tdlType == rhs._tdlType)) ivarsEqual = false; + if (!(_sampleRate == rhs._sampleRate)) ivarsEqual = false; + if (!(_samples == rhs._samples)) ivarsEqual = false; ivarsEqual = (_data == rhs._data); @@ -115,13 +115,13 @@ int IntercomSignalPdu::getMarshalledSize() const { int marshalSize = 0; marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); - marshalSize += _entityID.getMarshalledSize(); // _entityID - marshalSize += 2; // _communicationsDeviceID - marshalSize += 2; // _encodingScheme - marshalSize += 2; // _tdlType - marshalSize += 4; // _sampleRate - marshalSize += 2; // _dataLength - marshalSize += 2; // _samples + marshalSize += _entityID.getMarshalledSize(); // _entityID + marshalSize += 2; // _communicationsDeviceID + marshalSize += 2; // _encodingScheme + marshalSize += 2; // _tdlType + marshalSize += 4; // _sampleRate + marshalSize += 2; // _dataLength + marshalSize += 2; // _samples marshalSize += _data.size(); return marshalSize; diff --git a/src/dis6/IntercomSignalPdu.h b/src/dis6/IntercomSignalPdu.h index 79a754be..90bd5cb6 100644 --- a/src/dis6/IntercomSignalPdu.h +++ b/src/dis6/IntercomSignalPdu.h @@ -1,11 +1,12 @@ #pragma once +#include +#include + #include "dis6/EntityID.h" #include "dis6/RadioCommunicationsFamilyPdu.h" #include "dis6/opendis6_export.h" #include "dis6/utils/DataStream.h" -#include -#include namespace DIS { // Section 5.3.8.4. Actual transmission of intercome voice data. COMPLETE @@ -16,7 +17,7 @@ namespace DIS { // @author DMcG, jkg class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { -protected: + protected: /** entity ID */ EntityID _entityID; @@ -41,16 +42,16 @@ class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { /** data bytes */ std::vector _data; -public: + public: IntercomSignalPdu(); virtual ~IntercomSignalPdu(); - virtual void marshal(DataStream &dataStream) const; - virtual void unmarshal(DataStream &dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID &getEntityID(); - const EntityID &getEntityID() const; - void setEntityID(const EntityID &pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); unsigned short getCommunicationsDeviceID() const; void setCommunicationsDeviceID(unsigned short pX); @@ -69,15 +70,15 @@ class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { unsigned short getSamples() const; void setSamples(unsigned short pX); - std::vector &getData(); - const std::vector &getData() const; - void setData(const std::vector &pX); + std::vector& getData(); + const std::vector& getData() const; + void setData(const std::vector& pX); virtual int getMarshalledSize() const; - bool operator==(const IntercomSignalPdu &rhs) const; + bool operator==(const IntercomSignalPdu& rhs) const; }; -} // namespace DIS +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/IsGroupOfPdu.cpp b/src/dis6/IsGroupOfPdu.cpp index 8f5f8230..4f4ef34c 100644 --- a/src/dis6/IsGroupOfPdu.cpp +++ b/src/dis6/IsGroupOfPdu.cpp @@ -2,183 +2,146 @@ using namespace DIS; - -IsGroupOfPdu::IsGroupOfPdu() : EntityManagementFamilyPdu(), - _groupEntityID(), - _groupedEntityCategory(0), - _numberOfGroupedEntities(0), - _pad2(0), - _latitude(0.0), - _longitude(0.0) -{ - setPduType( 34 ); +IsGroupOfPdu::IsGroupOfPdu() + : EntityManagementFamilyPdu(), + _groupEntityID(), + _groupedEntityCategory(0), + _numberOfGroupedEntities(0), + _pad2(0), + _latitude(0.0), + _longitude(0.0) { + setPduType(34); } -IsGroupOfPdu::~IsGroupOfPdu() -{ - _groupedEntityDescriptions.clear(); -} +IsGroupOfPdu::~IsGroupOfPdu() { _groupedEntityDescriptions.clear(); } -EntityID& IsGroupOfPdu::getGroupEntityID() -{ - return _groupEntityID; -} +EntityID& IsGroupOfPdu::getGroupEntityID() { return _groupEntityID; } -const EntityID& IsGroupOfPdu::getGroupEntityID() const -{ - return _groupEntityID; +const EntityID& IsGroupOfPdu::getGroupEntityID() const { + return _groupEntityID; } -void IsGroupOfPdu::setGroupEntityID(const EntityID &pX) -{ - _groupEntityID = pX; -} +void IsGroupOfPdu::setGroupEntityID(const EntityID& pX) { _groupEntityID = pX; } -unsigned char IsGroupOfPdu::getGroupedEntityCategory() const -{ - return _groupedEntityCategory; +unsigned char IsGroupOfPdu::getGroupedEntityCategory() const { + return _groupedEntityCategory; } -void IsGroupOfPdu::setGroupedEntityCategory(unsigned char pX) -{ - _groupedEntityCategory = pX; +void IsGroupOfPdu::setGroupedEntityCategory(unsigned char pX) { + _groupedEntityCategory = pX; } -unsigned char IsGroupOfPdu::getNumberOfGroupedEntities() const -{ - return _groupedEntityDescriptions.size(); +unsigned char IsGroupOfPdu::getNumberOfGroupedEntities() const { + return _groupedEntityDescriptions.size(); } -unsigned int IsGroupOfPdu::getPad2() const -{ - return _pad2; -} +unsigned int IsGroupOfPdu::getPad2() const { return _pad2; } -void IsGroupOfPdu::setPad2(unsigned int pX) -{ - _pad2 = pX; -} +void IsGroupOfPdu::setPad2(unsigned int pX) { _pad2 = pX; } -double IsGroupOfPdu::getLatitude() const -{ - return _latitude; -} +double IsGroupOfPdu::getLatitude() const { return _latitude; } -void IsGroupOfPdu::setLatitude(double pX) -{ - _latitude = pX; -} +void IsGroupOfPdu::setLatitude(double pX) { _latitude = pX; } -double IsGroupOfPdu::getLongitude() const -{ - return _longitude; -} +double IsGroupOfPdu::getLongitude() const { return _longitude; } -void IsGroupOfPdu::setLongitude(double pX) -{ - _longitude = pX; -} +void IsGroupOfPdu::setLongitude(double pX) { _longitude = pX; } -std::vector& IsGroupOfPdu::getGroupedEntityDescriptions() -{ - return _groupedEntityDescriptions; +std::vector& IsGroupOfPdu::getGroupedEntityDescriptions() { + return _groupedEntityDescriptions; } -const std::vector& IsGroupOfPdu::getGroupedEntityDescriptions() const -{ - return _groupedEntityDescriptions; +const std::vector& IsGroupOfPdu::getGroupedEntityDescriptions() + const { + return _groupedEntityDescriptions; } -void IsGroupOfPdu::setGroupedEntityDescriptions(const std::vector& pX) -{ - _groupedEntityDescriptions = pX; +void IsGroupOfPdu::setGroupedEntityDescriptions( + const std::vector& pX) { + _groupedEntityDescriptions = pX; } -void IsGroupOfPdu::marshal(DataStream& dataStream) const -{ - EntityManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _groupEntityID.marshal(dataStream); - dataStream << _groupedEntityCategory; - dataStream << ( unsigned char )_groupedEntityDescriptions.size(); - dataStream << _pad2; - dataStream << _latitude; - dataStream << _longitude; - - for(size_t idx = 0; idx < _groupedEntityDescriptions.size(); idx++) - { - VariableDatum x = _groupedEntityDescriptions[idx]; - x.marshal(dataStream); - } +void IsGroupOfPdu::marshal(DataStream& dataStream) const { + EntityManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _groupEntityID.marshal(dataStream); + dataStream << _groupedEntityCategory; + dataStream << (unsigned char)_groupedEntityDescriptions.size(); + dataStream << _pad2; + dataStream << _latitude; + dataStream << _longitude; + for (size_t idx = 0; idx < _groupedEntityDescriptions.size(); idx++) { + VariableDatum x = _groupedEntityDescriptions[idx]; + x.marshal(dataStream); + } } -void IsGroupOfPdu::unmarshal(DataStream& dataStream) -{ - EntityManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _groupEntityID.unmarshal(dataStream); - dataStream >> _groupedEntityCategory; - dataStream >> _numberOfGroupedEntities; - dataStream >> _pad2; - dataStream >> _latitude; - dataStream >> _longitude; - - _groupedEntityDescriptions.clear(); - for(size_t idx = 0; idx < _numberOfGroupedEntities; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _groupedEntityDescriptions.push_back(x); - } -} +void IsGroupOfPdu::unmarshal(DataStream& dataStream) { + EntityManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _groupEntityID.unmarshal(dataStream); + dataStream >> _groupedEntityCategory; + dataStream >> _numberOfGroupedEntities; + dataStream >> _pad2; + dataStream >> _latitude; + dataStream >> _longitude; + _groupedEntityDescriptions.clear(); + for (size_t idx = 0; idx < _numberOfGroupedEntities; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _groupedEntityDescriptions.push_back(x); + } +} -bool IsGroupOfPdu::operator ==(const IsGroupOfPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); +bool IsGroupOfPdu::operator==(const IsGroupOfPdu& rhs) const { + bool ivarsEqual = true; - if( ! (_groupEntityID == rhs._groupEntityID) ) ivarsEqual = false; - if( ! (_groupedEntityCategory == rhs._groupedEntityCategory) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_latitude == rhs._latitude) ) ivarsEqual = false; - if( ! (_longitude == rhs._longitude) ) ivarsEqual = false; + ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _groupedEntityDescriptions.size(); idx++) - { - if( ! ( _groupedEntityDescriptions[idx] == rhs._groupedEntityDescriptions[idx]) ) ivarsEqual = false; - } + if (!(_groupEntityID == rhs._groupEntityID)) ivarsEqual = false; + if (!(_groupedEntityCategory == rhs._groupedEntityCategory)) + ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_latitude == rhs._latitude)) ivarsEqual = false; + if (!(_longitude == rhs._longitude)) ivarsEqual = false; + for (size_t idx = 0; idx < _groupedEntityDescriptions.size(); idx++) { + if (!(_groupedEntityDescriptions[idx] == + rhs._groupedEntityDescriptions[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int IsGroupOfPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int IsGroupOfPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _groupEntityID.getMarshalledSize(); // _groupEntityID - marshalSize = marshalSize + 1; // _groupedEntityCategory - marshalSize = marshalSize + 1; // _numberOfGroupedEntities - marshalSize = marshalSize + 4; // _pad2 - marshalSize = marshalSize + 8; // _latitude - marshalSize = marshalSize + 8; // _longitude + marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _groupEntityID.getMarshalledSize(); // _groupEntityID + marshalSize = marshalSize + 1; // _groupedEntityCategory + marshalSize = marshalSize + 1; // _numberOfGroupedEntities + marshalSize = marshalSize + 4; // _pad2 + marshalSize = marshalSize + 8; // _latitude + marshalSize = marshalSize + 8; // _longitude - for(unsigned long long idx=0; idx < _groupedEntityDescriptions.size(); idx++) - { - VariableDatum listElement = _groupedEntityDescriptions[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _groupedEntityDescriptions.size(); + idx++) { + VariableDatum listElement = _groupedEntityDescriptions[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -191,7 +154,7 @@ int IsGroupOfPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IsGroupOfPdu.h b/src/dis6/IsGroupOfPdu.h index 2d765f89..60e05a24 100644 --- a/src/dis6/IsGroupOfPdu.h +++ b/src/dis6/IsGroupOfPdu.h @@ -1,87 +1,89 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.9.2 Information about a particular group of entities grouped +// together for the purposes of netowrk bandwidth reduction or +// aggregation. Needs manual cleanup. The GED size requires a database lookup. +// UNFINISHED -namespace DIS -{ -// Section 5.3.9.2 Information about a particular group of entities grouped together for the purposes of netowrk bandwidth reduction or aggregation. Needs manual cleanup. The GED size requires a database lookup. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT IsGroupOfPdu : public EntityManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT IsGroupOfPdu : public EntityManagementFamilyPdu { + protected: /** ID of aggregated entities */ - EntityID _groupEntityID; + EntityID _groupEntityID; /** type of entities constituting the group */ - unsigned char _groupedEntityCategory; + unsigned char _groupedEntityCategory; /** Number of individual entities constituting the group */ - unsigned char _numberOfGroupedEntities; + unsigned char _numberOfGroupedEntities; /** padding */ - unsigned int _pad2; + unsigned int _pad2; /** latitude */ - double _latitude; + double _latitude; /** longitude */ - double _longitude; - - /** GED records about each individual entity in the group. ^^^this is wrong--need a database lookup to find the actual size of the list elements */ - std::vector _groupedEntityDescriptions; + double _longitude; + /** GED records about each individual entity in the group. ^^^this is + * wrong--need a database lookup to find the actual size of the list elements + */ + std::vector _groupedEntityDescriptions; public: - IsGroupOfPdu(); - virtual ~IsGroupOfPdu(); + IsGroupOfPdu(); + virtual ~IsGroupOfPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getGroupEntityID(); - const EntityID& getGroupEntityID() const; - void setGroupEntityID(const EntityID &pX); + EntityID& getGroupEntityID(); + const EntityID& getGroupEntityID() const; + void setGroupEntityID(const EntityID& pX); - unsigned char getGroupedEntityCategory() const; - void setGroupedEntityCategory(unsigned char pX); + unsigned char getGroupedEntityCategory() const; + void setGroupedEntityCategory(unsigned char pX); - unsigned char getNumberOfGroupedEntities() const; + unsigned char getNumberOfGroupedEntities() const; - unsigned int getPad2() const; - void setPad2(unsigned int pX); + unsigned int getPad2() const; + void setPad2(unsigned int pX); - double getLatitude() const; - void setLatitude(double pX); + double getLatitude() const; + void setLatitude(double pX); - double getLongitude() const; - void setLongitude(double pX); + double getLongitude() const; + void setLongitude(double pX); - std::vector& getGroupedEntityDescriptions(); - const std::vector& getGroupedEntityDescriptions() const; - void setGroupedEntityDescriptions(const std::vector& pX); + std::vector& getGroupedEntityDescriptions(); + const std::vector& getGroupedEntityDescriptions() const; + void setGroupedEntityDescriptions(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IsGroupOfPdu& rhs) const; + bool operator==(const IsGroupOfPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -94,7 +96,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IsPartOfPdu.cpp b/src/dis6/IsPartOfPdu.cpp index e8111e65..37b84bbd 100644 --- a/src/dis6/IsPartOfPdu.cpp +++ b/src/dis6/IsPartOfPdu.cpp @@ -2,170 +2,140 @@ using namespace DIS; - -IsPartOfPdu::IsPartOfPdu() : EntityManagementFamilyPdu(), - _orginatingEntityID(), - _receivingEntityID(), - _relationship(), - _partLocation(), - _namedLocationID(), - _partEntityType() -{ - setPduType( 36 ); +IsPartOfPdu::IsPartOfPdu() + : EntityManagementFamilyPdu(), + _orginatingEntityID(), + _receivingEntityID(), + _relationship(), + _partLocation(), + _namedLocationID(), + _partEntityType() { + setPduType(36); } -IsPartOfPdu::~IsPartOfPdu() -{ -} +IsPartOfPdu::~IsPartOfPdu() {} -EntityID& IsPartOfPdu::getOrginatingEntityID() -{ - return _orginatingEntityID; -} +EntityID& IsPartOfPdu::getOrginatingEntityID() { return _orginatingEntityID; } -const EntityID& IsPartOfPdu::getOrginatingEntityID() const -{ - return _orginatingEntityID; +const EntityID& IsPartOfPdu::getOrginatingEntityID() const { + return _orginatingEntityID; } -void IsPartOfPdu::setOrginatingEntityID(const EntityID &pX) -{ - _orginatingEntityID = pX; +void IsPartOfPdu::setOrginatingEntityID(const EntityID& pX) { + _orginatingEntityID = pX; } -EntityID& IsPartOfPdu::getReceivingEntityID() -{ - return _receivingEntityID; -} +EntityID& IsPartOfPdu::getReceivingEntityID() { return _receivingEntityID; } -const EntityID& IsPartOfPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& IsPartOfPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void IsPartOfPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void IsPartOfPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -Relationship& IsPartOfPdu::getRelationship() -{ - return _relationship; -} +Relationship& IsPartOfPdu::getRelationship() { return _relationship; } -const Relationship& IsPartOfPdu::getRelationship() const -{ - return _relationship; +const Relationship& IsPartOfPdu::getRelationship() const { + return _relationship; } -void IsPartOfPdu::setRelationship(const Relationship &pX) -{ - _relationship = pX; +void IsPartOfPdu::setRelationship(const Relationship& pX) { + _relationship = pX; } -Vector3Float& IsPartOfPdu::getPartLocation() -{ - return _partLocation; -} +Vector3Float& IsPartOfPdu::getPartLocation() { return _partLocation; } -const Vector3Float& IsPartOfPdu::getPartLocation() const -{ - return _partLocation; +const Vector3Float& IsPartOfPdu::getPartLocation() const { + return _partLocation; } -void IsPartOfPdu::setPartLocation(const Vector3Float &pX) -{ - _partLocation = pX; +void IsPartOfPdu::setPartLocation(const Vector3Float& pX) { + _partLocation = pX; } -NamedLocation& IsPartOfPdu::getNamedLocationID() -{ - return _namedLocationID; -} +NamedLocation& IsPartOfPdu::getNamedLocationID() { return _namedLocationID; } -const NamedLocation& IsPartOfPdu::getNamedLocationID() const -{ - return _namedLocationID; +const NamedLocation& IsPartOfPdu::getNamedLocationID() const { + return _namedLocationID; } -void IsPartOfPdu::setNamedLocationID(const NamedLocation &pX) -{ - _namedLocationID = pX; +void IsPartOfPdu::setNamedLocationID(const NamedLocation& pX) { + _namedLocationID = pX; } -EntityType& IsPartOfPdu::getPartEntityType() -{ - return _partEntityType; -} +EntityType& IsPartOfPdu::getPartEntityType() { return _partEntityType; } -const EntityType& IsPartOfPdu::getPartEntityType() const -{ - return _partEntityType; +const EntityType& IsPartOfPdu::getPartEntityType() const { + return _partEntityType; } -void IsPartOfPdu::setPartEntityType(const EntityType &pX) -{ - _partEntityType = pX; +void IsPartOfPdu::setPartEntityType(const EntityType& pX) { + _partEntityType = pX; } -void IsPartOfPdu::marshal(DataStream& dataStream) const -{ - EntityManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _orginatingEntityID.marshal(dataStream); - _receivingEntityID.marshal(dataStream); - _relationship.marshal(dataStream); - _partLocation.marshal(dataStream); - _namedLocationID.marshal(dataStream); - _partEntityType.marshal(dataStream); +void IsPartOfPdu::marshal(DataStream& dataStream) const { + EntityManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _orginatingEntityID.marshal(dataStream); + _receivingEntityID.marshal(dataStream); + _relationship.marshal(dataStream); + _partLocation.marshal(dataStream); + _namedLocationID.marshal(dataStream); + _partEntityType.marshal(dataStream); } -void IsPartOfPdu::unmarshal(DataStream& dataStream) -{ - EntityManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _orginatingEntityID.unmarshal(dataStream); - _receivingEntityID.unmarshal(dataStream); - _relationship.unmarshal(dataStream); - _partLocation.unmarshal(dataStream); - _namedLocationID.unmarshal(dataStream); - _partEntityType.unmarshal(dataStream); +void IsPartOfPdu::unmarshal(DataStream& dataStream) { + EntityManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _orginatingEntityID.unmarshal(dataStream); + _receivingEntityID.unmarshal(dataStream); + _relationship.unmarshal(dataStream); + _partLocation.unmarshal(dataStream); + _namedLocationID.unmarshal(dataStream); + _partEntityType.unmarshal(dataStream); } +bool IsPartOfPdu::operator==(const IsPartOfPdu& rhs) const { + bool ivarsEqual = true; -bool IsPartOfPdu::operator ==(const IsPartOfPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); - ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); + if (!(_orginatingEntityID == rhs._orginatingEntityID)) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_relationship == rhs._relationship)) ivarsEqual = false; + if (!(_partLocation == rhs._partLocation)) ivarsEqual = false; + if (!(_namedLocationID == rhs._namedLocationID)) ivarsEqual = false; + if (!(_partEntityType == rhs._partEntityType)) ivarsEqual = false; - if( ! (_orginatingEntityID == rhs._orginatingEntityID) ) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_relationship == rhs._relationship) ) ivarsEqual = false; - if( ! (_partLocation == rhs._partLocation) ) ivarsEqual = false; - if( ! (_namedLocationID == rhs._namedLocationID) ) ivarsEqual = false; - if( ! (_partEntityType == rhs._partEntityType) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int IsPartOfPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int IsPartOfPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _relationship.getMarshalledSize(); // _relationship - marshalSize = marshalSize + _partLocation.getMarshalledSize(); // _partLocation - marshalSize = marshalSize + _namedLocationID.getMarshalledSize(); // _namedLocationID - marshalSize = marshalSize + _partEntityType.getMarshalledSize(); // _partEntityType - return marshalSize; + marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = + marshalSize + _relationship.getMarshalledSize(); // _relationship + marshalSize = + marshalSize + _partLocation.getMarshalledSize(); // _partLocation + marshalSize = + marshalSize + _namedLocationID.getMarshalledSize(); // _namedLocationID + marshalSize = + marshalSize + _partEntityType.getMarshalledSize(); // _partEntityType + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -178,7 +148,7 @@ int IsPartOfPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/IsPartOfPdu.h b/src/dis6/IsPartOfPdu.h index c05c1de4..35590e31 100644 --- a/src/dis6/IsPartOfPdu.h +++ b/src/dis6/IsPartOfPdu.h @@ -1,89 +1,86 @@ #pragma once #include -#include +#include +#include +#include #include #include -#include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.9.4 The joining of two or more simulation entities is +// communicated by this PDU. COMPLETE -namespace DIS -{ -// Section 5.3.9.4 The joining of two or more simulation entities is communicated by this PDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT IsPartOfPdu : public EntityManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT IsPartOfPdu : public EntityManagementFamilyPdu { + protected: /** ID of entity originating PDU */ - EntityID _orginatingEntityID; + EntityID _orginatingEntityID; /** ID of entity receiving PDU */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** relationship of joined parts */ - Relationship _relationship; + Relationship _relationship; - /** location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0 */ - Vector3Float _partLocation; + /** location of part; centroid of part in host's coordinate system. x=range, + * y=bearing, z=0 */ + Vector3Float _partLocation; /** named location */ - NamedLocation _namedLocationID; + NamedLocation _namedLocationID; /** entity type */ - EntityType _partEntityType; - + EntityType _partEntityType; public: - IsPartOfPdu(); - virtual ~IsPartOfPdu(); + IsPartOfPdu(); + virtual ~IsPartOfPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOrginatingEntityID(); - const EntityID& getOrginatingEntityID() const; - void setOrginatingEntityID(const EntityID &pX); + EntityID& getOrginatingEntityID(); + const EntityID& getOrginatingEntityID() const; + void setOrginatingEntityID(const EntityID& pX); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - Relationship& getRelationship(); - const Relationship& getRelationship() const; - void setRelationship(const Relationship &pX); + Relationship& getRelationship(); + const Relationship& getRelationship() const; + void setRelationship(const Relationship& pX); - Vector3Float& getPartLocation(); - const Vector3Float& getPartLocation() const; - void setPartLocation(const Vector3Float &pX); + Vector3Float& getPartLocation(); + const Vector3Float& getPartLocation() const; + void setPartLocation(const Vector3Float& pX); - NamedLocation& getNamedLocationID(); - const NamedLocation& getNamedLocationID() const; - void setNamedLocationID(const NamedLocation &pX); + NamedLocation& getNamedLocationID(); + const NamedLocation& getNamedLocationID() const; + void setNamedLocationID(const NamedLocation& pX); - EntityType& getPartEntityType(); - const EntityType& getPartEntityType() const; - void setPartEntityType(const EntityType &pX); + EntityType& getPartEntityType(); + const EntityType& getPartEntityType() const; + void setPartEntityType(const EntityType& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IsPartOfPdu& rhs) const; + bool operator==(const IsPartOfPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -96,7 +93,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LayerHeader.cpp b/src/dis6/LayerHeader.cpp index 5ff69e44..0f52e121 100644 --- a/src/dis6/LayerHeader.cpp +++ b/src/dis6/LayerHeader.cpp @@ -2,89 +2,64 @@ using namespace DIS; +LayerHeader::LayerHeader() + : _layerNumber(0), _layerSpecificInformaiton(0), _length(0) {} -LayerHeader::LayerHeader(): - _layerNumber(0), - _layerSpecificInformaiton(0), - _length(0) -{ -} +LayerHeader::~LayerHeader() {} -LayerHeader::~LayerHeader() -{ -} +unsigned char LayerHeader::getLayerNumber() const { return _layerNumber; } -unsigned char LayerHeader::getLayerNumber() const -{ - return _layerNumber; -} +void LayerHeader::setLayerNumber(unsigned char pX) { _layerNumber = pX; } -void LayerHeader::setLayerNumber(unsigned char pX) -{ - _layerNumber = pX; +unsigned char LayerHeader::getLayerSpecificInformaiton() const { + return _layerSpecificInformaiton; } -unsigned char LayerHeader::getLayerSpecificInformaiton() const -{ - return _layerSpecificInformaiton; +void LayerHeader::setLayerSpecificInformaiton(unsigned char pX) { + _layerSpecificInformaiton = pX; } -void LayerHeader::setLayerSpecificInformaiton(unsigned char pX) -{ - _layerSpecificInformaiton = pX; -} +unsigned short LayerHeader::getLength() const { return _length; } -unsigned short LayerHeader::getLength() const -{ - return _length; -} +void LayerHeader::setLength(unsigned short pX) { _length = pX; } -void LayerHeader::setLength(unsigned short pX) -{ - _length = pX; +void LayerHeader::marshal(DataStream& dataStream) const { + dataStream << _layerNumber; + dataStream << _layerSpecificInformaiton; + dataStream << _length; } -void LayerHeader::marshal(DataStream& dataStream) const -{ - dataStream << _layerNumber; - dataStream << _layerSpecificInformaiton; - dataStream << _length; -} - -void LayerHeader::unmarshal(DataStream& dataStream) -{ - dataStream >> _layerNumber; - dataStream >> _layerSpecificInformaiton; - dataStream >> _length; +void LayerHeader::unmarshal(DataStream& dataStream) { + dataStream >> _layerNumber; + dataStream >> _layerSpecificInformaiton; + dataStream >> _length; } +bool LayerHeader::operator==(const LayerHeader& rhs) const { + bool ivarsEqual = true; -bool LayerHeader::operator ==(const LayerHeader& rhs) const - { - bool ivarsEqual = true; + if (!(_layerNumber == rhs._layerNumber)) ivarsEqual = false; + if (!(_layerSpecificInformaiton == rhs._layerSpecificInformaiton)) + ivarsEqual = false; + if (!(_length == rhs._length)) ivarsEqual = false; - if( ! (_layerNumber == rhs._layerNumber) ) ivarsEqual = false; - if( ! (_layerSpecificInformaiton == rhs._layerSpecificInformaiton) ) ivarsEqual = false; - if( ! (_length == rhs._length) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LayerHeader::getMarshalledSize() const -{ - int marshalSize = 0; +int LayerHeader::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _layerNumber - marshalSize = marshalSize + 1; // _layerSpecificInformaiton - marshalSize = marshalSize + 2; // _length - return marshalSize; + marshalSize = marshalSize + 1; // _layerNumber + marshalSize = marshalSize + 1; // _layerSpecificInformaiton + marshalSize = marshalSize + 2; // _length + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +72,7 @@ int LayerHeader::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LayerHeader.h b/src/dis6/LayerHeader.h index 96f4ee2a..2840df17 100644 --- a/src/dis6/LayerHeader.h +++ b/src/dis6/LayerHeader.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.47. Layer header. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT LayerHeader -{ -protected: +class OPENDIS6_EXPORT LayerHeader { + protected: /** Layer number */ - unsigned char _layerNumber; + unsigned char _layerNumber; /** Layer speccific information enumeration */ - unsigned char _layerSpecificInformaiton; + unsigned char _layerSpecificInformaiton; /** information length */ - unsigned short _length; - + unsigned short _length; public: - LayerHeader(); - virtual ~LayerHeader(); + LayerHeader(); + virtual ~LayerHeader(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getLayerNumber() const; - void setLayerNumber(unsigned char pX); + unsigned char getLayerNumber() const; + void setLayerNumber(unsigned char pX); - unsigned char getLayerSpecificInformaiton() const; - void setLayerSpecificInformaiton(unsigned char pX); + unsigned char getLayerSpecificInformaiton() const; + void setLayerSpecificInformaiton(unsigned char pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + unsigned short getLength() const; + void setLength(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const LayerHeader& rhs) const; + bool operator==(const LayerHeader& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LinearObjectStatePdu.cpp b/src/dis6/LinearObjectStatePdu.cpp index 0a0ab236..08615896 100644 --- a/src/dis6/LinearObjectStatePdu.cpp +++ b/src/dis6/LinearObjectStatePdu.cpp @@ -2,233 +2,193 @@ using namespace DIS; - -LinearObjectStatePdu::LinearObjectStatePdu() : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), - _forceID(0), - _numberOfSegments(0), - _requesterID(), - _receivingID(), - _objectType() -{ - setPduType( 44 ); +LinearObjectStatePdu::LinearObjectStatePdu() + : SyntheticEnvironmentFamilyPdu(), + _objectID(), + _referencedObjectID(), + _updateNumber(0), + _forceID(0), + _numberOfSegments(0), + _requesterID(), + _receivingID(), + _objectType() { + setPduType(44); } -LinearObjectStatePdu::~LinearObjectStatePdu() -{ - _linearSegmentParameters.clear(); +LinearObjectStatePdu::~LinearObjectStatePdu() { + _linearSegmentParameters.clear(); } -EntityID& LinearObjectStatePdu::getObjectID() -{ - return _objectID; -} +EntityID& LinearObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& LinearObjectStatePdu::getObjectID() const -{ - return _objectID; -} +const EntityID& LinearObjectStatePdu::getObjectID() const { return _objectID; } -void LinearObjectStatePdu::setObjectID(const EntityID &pX) -{ - _objectID = pX; -} +void LinearObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } -EntityID& LinearObjectStatePdu::getReferencedObjectID() -{ - return _referencedObjectID; +EntityID& LinearObjectStatePdu::getReferencedObjectID() { + return _referencedObjectID; } -const EntityID& LinearObjectStatePdu::getReferencedObjectID() const -{ - return _referencedObjectID; +const EntityID& LinearObjectStatePdu::getReferencedObjectID() const { + return _referencedObjectID; } -void LinearObjectStatePdu::setReferencedObjectID(const EntityID &pX) -{ - _referencedObjectID = pX; +void LinearObjectStatePdu::setReferencedObjectID(const EntityID& pX) { + _referencedObjectID = pX; } -unsigned short LinearObjectStatePdu::getUpdateNumber() const -{ - return _updateNumber; +unsigned short LinearObjectStatePdu::getUpdateNumber() const { + return _updateNumber; } -void LinearObjectStatePdu::setUpdateNumber(unsigned short pX) -{ - _updateNumber = pX; +void LinearObjectStatePdu::setUpdateNumber(unsigned short pX) { + _updateNumber = pX; } -unsigned char LinearObjectStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char LinearObjectStatePdu::getForceID() const { return _forceID; } -void LinearObjectStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void LinearObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char LinearObjectStatePdu::getNumberOfSegments() const -{ - return _linearSegmentParameters.size(); +unsigned char LinearObjectStatePdu::getNumberOfSegments() const { + return _linearSegmentParameters.size(); } -SimulationAddress& LinearObjectStatePdu::getRequesterID() -{ - return _requesterID; +SimulationAddress& LinearObjectStatePdu::getRequesterID() { + return _requesterID; } -const SimulationAddress& LinearObjectStatePdu::getRequesterID() const -{ - return _requesterID; +const SimulationAddress& LinearObjectStatePdu::getRequesterID() const { + return _requesterID; } -void LinearObjectStatePdu::setRequesterID(const SimulationAddress &pX) -{ - _requesterID = pX; +void LinearObjectStatePdu::setRequesterID(const SimulationAddress& pX) { + _requesterID = pX; } -SimulationAddress& LinearObjectStatePdu::getReceivingID() -{ - return _receivingID; +SimulationAddress& LinearObjectStatePdu::getReceivingID() { + return _receivingID; } -const SimulationAddress& LinearObjectStatePdu::getReceivingID() const -{ - return _receivingID; +const SimulationAddress& LinearObjectStatePdu::getReceivingID() const { + return _receivingID; } -void LinearObjectStatePdu::setReceivingID(const SimulationAddress &pX) -{ - _receivingID = pX; +void LinearObjectStatePdu::setReceivingID(const SimulationAddress& pX) { + _receivingID = pX; } -ObjectType& LinearObjectStatePdu::getObjectType() -{ - return _objectType; -} +ObjectType& LinearObjectStatePdu::getObjectType() { return _objectType; } -const ObjectType& LinearObjectStatePdu::getObjectType() const -{ - return _objectType; +const ObjectType& LinearObjectStatePdu::getObjectType() const { + return _objectType; } -void LinearObjectStatePdu::setObjectType(const ObjectType &pX) -{ - _objectType = pX; +void LinearObjectStatePdu::setObjectType(const ObjectType& pX) { + _objectType = pX; } -std::vector& LinearObjectStatePdu::getLinearSegmentParameters() -{ - return _linearSegmentParameters; +std::vector& +LinearObjectStatePdu::getLinearSegmentParameters() { + return _linearSegmentParameters; } -const std::vector& LinearObjectStatePdu::getLinearSegmentParameters() const -{ - return _linearSegmentParameters; +const std::vector& +LinearObjectStatePdu::getLinearSegmentParameters() const { + return _linearSegmentParameters; } -void LinearObjectStatePdu::setLinearSegmentParameters(const std::vector& pX) -{ - _linearSegmentParameters = pX; +void LinearObjectStatePdu::setLinearSegmentParameters( + const std::vector& pX) { + _linearSegmentParameters = pX; } -void LinearObjectStatePdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _objectID.marshal(dataStream); - _referencedObjectID.marshal(dataStream); - dataStream << _updateNumber; - dataStream << _forceID; - dataStream << ( unsigned char )_linearSegmentParameters.size(); - _requesterID.marshal(dataStream); - _receivingID.marshal(dataStream); - _objectType.marshal(dataStream); - - for(size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) - { - LinearSegmentParameter x = _linearSegmentParameters[idx]; - x.marshal(dataStream); - } - -} +void LinearObjectStatePdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _objectID.marshal(dataStream); + _referencedObjectID.marshal(dataStream); + dataStream << _updateNumber; + dataStream << _forceID; + dataStream << (unsigned char)_linearSegmentParameters.size(); + _requesterID.marshal(dataStream); + _receivingID.marshal(dataStream); + _objectType.marshal(dataStream); -void LinearObjectStatePdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _objectID.unmarshal(dataStream); - _referencedObjectID.unmarshal(dataStream); - dataStream >> _updateNumber; - dataStream >> _forceID; - dataStream >> _numberOfSegments; - _requesterID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - _objectType.unmarshal(dataStream); - - _linearSegmentParameters.clear(); - for(size_t idx = 0; idx < _numberOfSegments; idx++) - { - LinearSegmentParameter x; - x.unmarshal(dataStream); - _linearSegmentParameters.push_back(x); - } + for (size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { + LinearSegmentParameter x = _linearSegmentParameters[idx]; + x.marshal(dataStream); + } } +void LinearObjectStatePdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _objectID.unmarshal(dataStream); + _referencedObjectID.unmarshal(dataStream); + dataStream >> _updateNumber; + dataStream >> _forceID; + dataStream >> _numberOfSegments; + _requesterID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + _objectType.unmarshal(dataStream); -bool LinearObjectStatePdu::operator ==(const LinearObjectStatePdu& rhs) const - { - bool ivarsEqual = true; + _linearSegmentParameters.clear(); + for (size_t idx = 0; idx < _numberOfSegments; idx++) { + LinearSegmentParameter x; + x.unmarshal(dataStream); + _linearSegmentParameters.push_back(x); + } +} - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); +bool LinearObjectStatePdu::operator==(const LinearObjectStatePdu& rhs) const { + bool ivarsEqual = true; - if( ! (_objectID == rhs._objectID) ) ivarsEqual = false; - if( ! (_referencedObjectID == rhs._referencedObjectID) ) ivarsEqual = false; - if( ! (_updateNumber == rhs._updateNumber) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_requesterID == rhs._requesterID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_objectType == rhs._objectType) ) ivarsEqual = false; + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) - { - if( ! ( _linearSegmentParameters[idx] == rhs._linearSegmentParameters[idx]) ) ivarsEqual = false; - } + if (!(_objectID == rhs._objectID)) ivarsEqual = false; + if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; + if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_objectType == rhs._objectType)) ivarsEqual = false; + for (size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { + if (!(_linearSegmentParameters[idx] == rhs._linearSegmentParameters[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int LinearObjectStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int LinearObjectStatePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _numberOfSegments - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID + marshalSize = marshalSize + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshalSize = marshalSize + 2; // _updateNumber + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _numberOfSegments + marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - for(unsigned long long idx=0; idx < _linearSegmentParameters.size(); idx++) - { - LinearSegmentParameter listElement = _linearSegmentParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _linearSegmentParameters.size(); + idx++) { + LinearSegmentParameter listElement = _linearSegmentParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -241,7 +201,7 @@ int LinearObjectStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LinearObjectStatePdu.h b/src/dis6/LinearObjectStatePdu.h index 42b2daa7..434b2c23 100644 --- a/src/dis6/LinearObjectStatePdu.h +++ b/src/dis6/LinearObjectStatePdu.h @@ -1,107 +1,106 @@ #pragma once +#include + #include -#include -#include -#include -#include #include -#include +#include +#include #include -#include #include +#include +namespace DIS { +// Section 5.3.11.4: Information abut the addition or modification of a +// synthecic enviroment object that is anchored to the terrain with a +// single point and has size or orientation. COMPLETE -namespace DIS -{ -// Section 5.3.11.4: Information abut the addition or modification of a synthecic enviroment object that is anchored to the terrain with a single point and has size or orientation. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT LinearObjectStatePdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS6_EXPORT LinearObjectStatePdu + : public SyntheticEnvironmentFamilyPdu { + protected: /** Object in synthetic environment */ - EntityID _objectID; + EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + unsigned short _updateNumber; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** number of linear segment parameters */ - unsigned char _numberOfSegments; + unsigned char _numberOfSegments; /** requesterID */ - SimulationAddress _requesterID; + SimulationAddress _requesterID; /** receiver ID */ - SimulationAddress _receivingID; + SimulationAddress _receivingID; /** Object type */ - ObjectType _objectType; + ObjectType _objectType; /** Linear segment parameters */ - std::vector _linearSegmentParameters; - + std::vector _linearSegmentParameters; public: - LinearObjectStatePdu(); - virtual ~LinearObjectStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + LinearObjectStatePdu(); + virtual ~LinearObjectStatePdu(); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID &pX); + EntityID& getObjectID(); + const EntityID& getObjectID() const; + void setObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + EntityID& getReferencedObjectID(); + const EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const EntityID& pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned short getUpdateNumber() const; + void setUpdateNumber(unsigned short pX); - unsigned char getNumberOfSegments() const; + unsigned char getForceID() const; + void setForceID(unsigned char pX); - SimulationAddress& getRequesterID(); - const SimulationAddress& getRequesterID() const; - void setRequesterID(const SimulationAddress &pX); + unsigned char getNumberOfSegments() const; - SimulationAddress& getReceivingID(); - const SimulationAddress& getReceivingID() const; - void setReceivingID(const SimulationAddress &pX); + SimulationAddress& getRequesterID(); + const SimulationAddress& getRequesterID() const; + void setRequesterID(const SimulationAddress& pX); - ObjectType& getObjectType(); - const ObjectType& getObjectType() const; - void setObjectType(const ObjectType &pX); + SimulationAddress& getReceivingID(); + const SimulationAddress& getReceivingID() const; + void setReceivingID(const SimulationAddress& pX); - std::vector& getLinearSegmentParameters(); - const std::vector& getLinearSegmentParameters() const; - void setLinearSegmentParameters(const std::vector& pX); + ObjectType& getObjectType(); + const ObjectType& getObjectType() const; + void setObjectType(const ObjectType& pX); + std::vector& getLinearSegmentParameters(); + const std::vector& getLinearSegmentParameters() const; + void setLinearSegmentParameters( + const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const LinearObjectStatePdu& rhs) const; + bool operator==(const LinearObjectStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -114,7 +113,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LinearSegmentParameter.cpp b/src/dis6/LinearSegmentParameter.cpp index 6a5c9978..279de0dc 100644 --- a/src/dis6/LinearSegmentParameter.cpp +++ b/src/dis6/LinearSegmentParameter.cpp @@ -2,194 +2,157 @@ using namespace DIS; +LinearSegmentParameter::LinearSegmentParameter() + : _segmentNumber(0), + _segmentAppearance(), + _location(), + _orientation(), + _segmentLength(0), + _segmentWidth(0), + _segmentHeight(0), + _segmentDepth(0), + _pad1(0) {} -LinearSegmentParameter::LinearSegmentParameter(): - _segmentNumber(0), - _segmentAppearance(), - _location(), - _orientation(), - _segmentLength(0), - _segmentWidth(0), - _segmentHeight(0), - _segmentDepth(0), - _pad1(0) -{ -} +LinearSegmentParameter::~LinearSegmentParameter() {} -LinearSegmentParameter::~LinearSegmentParameter() -{ +unsigned char LinearSegmentParameter::getSegmentNumber() const { + return _segmentNumber; } -unsigned char LinearSegmentParameter::getSegmentNumber() const -{ - return _segmentNumber; +void LinearSegmentParameter::setSegmentNumber(unsigned char pX) { + _segmentNumber = pX; } -void LinearSegmentParameter::setSegmentNumber(unsigned char pX) -{ - _segmentNumber = pX; +SixByteChunk& LinearSegmentParameter::getSegmentAppearance() { + return _segmentAppearance; } -SixByteChunk& LinearSegmentParameter::getSegmentAppearance() -{ - return _segmentAppearance; +const SixByteChunk& LinearSegmentParameter::getSegmentAppearance() const { + return _segmentAppearance; } -const SixByteChunk& LinearSegmentParameter::getSegmentAppearance() const -{ - return _segmentAppearance; +void LinearSegmentParameter::setSegmentAppearance(const SixByteChunk& pX) { + _segmentAppearance = pX; } -void LinearSegmentParameter::setSegmentAppearance(const SixByteChunk &pX) -{ - _segmentAppearance = pX; -} +Vector3Double& LinearSegmentParameter::getLocation() { return _location; } -Vector3Double& LinearSegmentParameter::getLocation() -{ - return _location; +const Vector3Double& LinearSegmentParameter::getLocation() const { + return _location; } -const Vector3Double& LinearSegmentParameter::getLocation() const -{ - return _location; +void LinearSegmentParameter::setLocation(const Vector3Double& pX) { + _location = pX; } -void LinearSegmentParameter::setLocation(const Vector3Double &pX) -{ - _location = pX; -} +Orientation& LinearSegmentParameter::getOrientation() { return _orientation; } -Orientation& LinearSegmentParameter::getOrientation() -{ - return _orientation; +const Orientation& LinearSegmentParameter::getOrientation() const { + return _orientation; } -const Orientation& LinearSegmentParameter::getOrientation() const -{ - return _orientation; +void LinearSegmentParameter::setOrientation(const Orientation& pX) { + _orientation = pX; } -void LinearSegmentParameter::setOrientation(const Orientation &pX) -{ - _orientation = pX; +unsigned short LinearSegmentParameter::getSegmentLength() const { + return _segmentLength; } -unsigned short LinearSegmentParameter::getSegmentLength() const -{ - return _segmentLength; +void LinearSegmentParameter::setSegmentLength(unsigned short pX) { + _segmentLength = pX; } -void LinearSegmentParameter::setSegmentLength(unsigned short pX) -{ - _segmentLength = pX; +unsigned short LinearSegmentParameter::getSegmentWidth() const { + return _segmentWidth; } -unsigned short LinearSegmentParameter::getSegmentWidth() const -{ - return _segmentWidth; +void LinearSegmentParameter::setSegmentWidth(unsigned short pX) { + _segmentWidth = pX; } -void LinearSegmentParameter::setSegmentWidth(unsigned short pX) -{ - _segmentWidth = pX; +unsigned short LinearSegmentParameter::getSegmentHeight() const { + return _segmentHeight; } -unsigned short LinearSegmentParameter::getSegmentHeight() const -{ - return _segmentHeight; +void LinearSegmentParameter::setSegmentHeight(unsigned short pX) { + _segmentHeight = pX; } -void LinearSegmentParameter::setSegmentHeight(unsigned short pX) -{ - _segmentHeight = pX; +unsigned short LinearSegmentParameter::getSegmentDepth() const { + return _segmentDepth; } -unsigned short LinearSegmentParameter::getSegmentDepth() const -{ - return _segmentDepth; +void LinearSegmentParameter::setSegmentDepth(unsigned short pX) { + _segmentDepth = pX; } -void LinearSegmentParameter::setSegmentDepth(unsigned short pX) -{ - _segmentDepth = pX; -} +unsigned int LinearSegmentParameter::getPad1() const { return _pad1; } -unsigned int LinearSegmentParameter::getPad1() const -{ - return _pad1; -} +void LinearSegmentParameter::setPad1(unsigned int pX) { _pad1 = pX; } -void LinearSegmentParameter::setPad1(unsigned int pX) -{ - _pad1 = pX; +void LinearSegmentParameter::marshal(DataStream& dataStream) const { + dataStream << _segmentNumber; + _segmentAppearance.marshal(dataStream); + _location.marshal(dataStream); + _orientation.marshal(dataStream); + dataStream << _segmentLength; + dataStream << _segmentWidth; + dataStream << _segmentHeight; + dataStream << _segmentDepth; + dataStream << _pad1; } -void LinearSegmentParameter::marshal(DataStream& dataStream) const -{ - dataStream << _segmentNumber; - _segmentAppearance.marshal(dataStream); - _location.marshal(dataStream); - _orientation.marshal(dataStream); - dataStream << _segmentLength; - dataStream << _segmentWidth; - dataStream << _segmentHeight; - dataStream << _segmentDepth; - dataStream << _pad1; -} - -void LinearSegmentParameter::unmarshal(DataStream& dataStream) -{ - dataStream >> _segmentNumber; - _segmentAppearance.unmarshal(dataStream); - _location.unmarshal(dataStream); - _orientation.unmarshal(dataStream); - dataStream >> _segmentLength; - dataStream >> _segmentWidth; - dataStream >> _segmentHeight; - dataStream >> _segmentDepth; - dataStream >> _pad1; +void LinearSegmentParameter::unmarshal(DataStream& dataStream) { + dataStream >> _segmentNumber; + _segmentAppearance.unmarshal(dataStream); + _location.unmarshal(dataStream); + _orientation.unmarshal(dataStream); + dataStream >> _segmentLength; + dataStream >> _segmentWidth; + dataStream >> _segmentHeight; + dataStream >> _segmentDepth; + dataStream >> _pad1; } +bool LinearSegmentParameter::operator==( + const LinearSegmentParameter& rhs) const { + bool ivarsEqual = true; -bool LinearSegmentParameter::operator ==(const LinearSegmentParameter& rhs) const - { - bool ivarsEqual = true; + if (!(_segmentNumber == rhs._segmentNumber)) ivarsEqual = false; + if (!(_segmentAppearance == rhs._segmentAppearance)) ivarsEqual = false; + if (!(_location == rhs._location)) ivarsEqual = false; + if (!(_orientation == rhs._orientation)) ivarsEqual = false; + if (!(_segmentLength == rhs._segmentLength)) ivarsEqual = false; + if (!(_segmentWidth == rhs._segmentWidth)) ivarsEqual = false; + if (!(_segmentHeight == rhs._segmentHeight)) ivarsEqual = false; + if (!(_segmentDepth == rhs._segmentDepth)) ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; - if( ! (_segmentNumber == rhs._segmentNumber) ) ivarsEqual = false; - if( ! (_segmentAppearance == rhs._segmentAppearance) ) ivarsEqual = false; - if( ! (_location == rhs._location) ) ivarsEqual = false; - if( ! (_orientation == rhs._orientation) ) ivarsEqual = false; - if( ! (_segmentLength == rhs._segmentLength) ) ivarsEqual = false; - if( ! (_segmentWidth == rhs._segmentWidth) ) ivarsEqual = false; - if( ! (_segmentHeight == rhs._segmentHeight) ) ivarsEqual = false; - if( ! (_segmentDepth == rhs._segmentDepth) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LinearSegmentParameter::getMarshalledSize() const -{ - int marshalSize = 0; +int LinearSegmentParameter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _segmentNumber - marshalSize = marshalSize + _segmentAppearance.getMarshalledSize(); // _segmentAppearance - marshalSize = marshalSize + _location.getMarshalledSize(); // _location - marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation - marshalSize = marshalSize + 2; // _segmentLength - marshalSize = marshalSize + 2; // _segmentWidth - marshalSize = marshalSize + 2; // _segmentHeight - marshalSize = marshalSize + 2; // _segmentDepth - marshalSize = marshalSize + 4; // _pad1 - return marshalSize; + marshalSize = marshalSize + 1; // _segmentNumber + marshalSize = marshalSize + + _segmentAppearance.getMarshalledSize(); // _segmentAppearance + marshalSize = marshalSize + _location.getMarshalledSize(); // _location + marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation + marshalSize = marshalSize + 2; // _segmentLength + marshalSize = marshalSize + 2; // _segmentWidth + marshalSize = marshalSize + 2; // _segmentHeight + marshalSize = marshalSize + 2; // _segmentDepth + marshalSize = marshalSize + 4; // _pad1 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -202,7 +165,7 @@ int LinearSegmentParameter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LinearSegmentParameter.h b/src/dis6/LinearSegmentParameter.h index b8884d7d..b92d3cb3 100644 --- a/src/dis6/LinearSegmentParameter.h +++ b/src/dis6/LinearSegmentParameter.h @@ -1,100 +1,96 @@ #pragma once +#include #include #include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.48: Linear segment parameters -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT LinearSegmentParameter -{ -protected: +class OPENDIS6_EXPORT LinearSegmentParameter { + protected: /** number of segments */ - unsigned char _segmentNumber; + unsigned char _segmentNumber; /** segment appearance */ - SixByteChunk _segmentAppearance; + SixByteChunk _segmentAppearance; /** location */ - Vector3Double _location; + Vector3Double _location; /** orientation */ - Orientation _orientation; + Orientation _orientation; /** segmentLength */ - unsigned short _segmentLength; + unsigned short _segmentLength; /** segmentWidth */ - unsigned short _segmentWidth; + unsigned short _segmentWidth; /** segmentHeight */ - unsigned short _segmentHeight; + unsigned short _segmentHeight; /** segment Depth */ - unsigned short _segmentDepth; + unsigned short _segmentDepth; /** segment Depth */ - unsigned int _pad1; - + unsigned int _pad1; public: - LinearSegmentParameter(); - virtual ~LinearSegmentParameter(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + LinearSegmentParameter(); + virtual ~LinearSegmentParameter(); - unsigned char getSegmentNumber() const; - void setSegmentNumber(unsigned char pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SixByteChunk& getSegmentAppearance(); - const SixByteChunk& getSegmentAppearance() const; - void setSegmentAppearance(const SixByteChunk &pX); + unsigned char getSegmentNumber() const; + void setSegmentNumber(unsigned char pX); - Vector3Double& getLocation(); - const Vector3Double& getLocation() const; - void setLocation(const Vector3Double &pX); + SixByteChunk& getSegmentAppearance(); + const SixByteChunk& getSegmentAppearance() const; + void setSegmentAppearance(const SixByteChunk& pX); - Orientation& getOrientation(); - const Orientation& getOrientation() const; - void setOrientation(const Orientation &pX); + Vector3Double& getLocation(); + const Vector3Double& getLocation() const; + void setLocation(const Vector3Double& pX); - unsigned short getSegmentLength() const; - void setSegmentLength(unsigned short pX); + Orientation& getOrientation(); + const Orientation& getOrientation() const; + void setOrientation(const Orientation& pX); - unsigned short getSegmentWidth() const; - void setSegmentWidth(unsigned short pX); + unsigned short getSegmentLength() const; + void setSegmentLength(unsigned short pX); - unsigned short getSegmentHeight() const; - void setSegmentHeight(unsigned short pX); + unsigned short getSegmentWidth() const; + void setSegmentWidth(unsigned short pX); - unsigned short getSegmentDepth() const; - void setSegmentDepth(unsigned short pX); + unsigned short getSegmentHeight() const; + void setSegmentHeight(unsigned short pX); - unsigned int getPad1() const; - void setPad1(unsigned int pX); + unsigned short getSegmentDepth() const; + void setSegmentDepth(unsigned short pX); + unsigned int getPad1() const; + void setPad1(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const LinearSegmentParameter& rhs) const; + bool operator==(const LinearSegmentParameter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -107,7 +103,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LogisticsFamilyPdu.cpp b/src/dis6/LogisticsFamilyPdu.cpp index 721b06dc..4c4d5238 100644 --- a/src/dis6/LogisticsFamilyPdu.cpp +++ b/src/dis6/LogisticsFamilyPdu.cpp @@ -2,51 +2,43 @@ using namespace DIS; - -LogisticsFamilyPdu::LogisticsFamilyPdu() : Pdu() +LogisticsFamilyPdu::LogisticsFamilyPdu() + : Pdu() { - setProtocolFamily( 3 ); + setProtocolFamily(3); } -LogisticsFamilyPdu::~LogisticsFamilyPdu() -{ -} +LogisticsFamilyPdu::~LogisticsFamilyPdu() {} -void LogisticsFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void LogisticsFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void LogisticsFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void LogisticsFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool LogisticsFamilyPdu::operator==(const LogisticsFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool LogisticsFamilyPdu::operator ==(const LogisticsFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int LogisticsFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int LogisticsFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +51,7 @@ int LogisticsFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LogisticsFamilyPdu.h b/src/dis6/LogisticsFamilyPdu.h index 4d0e395e..0f34c86b 100644 --- a/src/dis6/LogisticsFamilyPdu.h +++ b/src/dis6/LogisticsFamilyPdu.h @@ -1,41 +1,37 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.5. Abstract superclass for logistics PDUs. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT LogisticsFamilyPdu : public Pdu -{ -protected: - +class OPENDIS6_EXPORT LogisticsFamilyPdu : public Pdu { + protected: public: - LogisticsFamilyPdu(); - virtual ~LogisticsFamilyPdu(); + LogisticsFamilyPdu(); + virtual ~LogisticsFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const LogisticsFamilyPdu& rhs) const; + bool operator==(const LogisticsFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/LogisticsPdu.cpp b/src/dis6/LogisticsPdu.cpp index 17fb5a0f..42ddead5 100644 --- a/src/dis6/LogisticsPdu.cpp +++ b/src/dis6/LogisticsPdu.cpp @@ -2,43 +2,34 @@ using namespace DIS; - -LogisticsPdu::LogisticsPdu() : Pdu() +LogisticsPdu::LogisticsPdu() + : Pdu() { - setProtocolFamily( 3 ); + setProtocolFamily(3); } -LogisticsPdu::~LogisticsPdu() -{ -} +LogisticsPdu::~LogisticsPdu() {} -void LogisticsPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void LogisticsPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void LogisticsPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void LogisticsPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool LogisticsPdu::operator==(const LogisticsPdu& rhs) const { + bool ivarsEqual = true; -bool LogisticsPdu::operator ==(const LogisticsPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = Pdu::operator==(rhs); + ivarsEqual = Pdu::operator==(rhs); + return ivarsEqual; +} - return ivarsEqual; - } +int LogisticsPdu::getMarshalledSize() const { + int marshalSize = 0; -int LogisticsPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } - diff --git a/src/dis6/LogisticsPdu.h b/src/dis6/LogisticsPdu.h index 57e1078d..6f0d24d6 100644 --- a/src/dis6/LogisticsPdu.h +++ b/src/dis6/LogisticsPdu.h @@ -1,35 +1,31 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.5. Abstract superclass for logistics PDUs. COMPLETE -// Copyright (c) 2007, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007, MOVES Institute, Naval Postgraduate School. All rights +// reserved. // -// This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html +// This work is licensed under the BSD open source license, available at +// https://www.movesinstitute.org/licenses/bsd.html // // @author DMcG, jkg -class OPENDIS6_EXPORT LogisticsPdu : public Pdu -{ -protected: - +class OPENDIS6_EXPORT LogisticsPdu : public Pdu { + protected: public: - LogisticsPdu(); - virtual ~LogisticsPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + LogisticsPdu(); + virtual ~LogisticsPdu(); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const LogisticsPdu& rhs) const; + bool operator==(const LogisticsPdu& rhs) const; }; -} - +} // namespace DIS diff --git a/src/dis6/Marking.cpp b/src/dis6/Marking.cpp index 4c382505..543368db 100644 --- a/src/dis6/Marking.cpp +++ b/src/dis6/Marking.cpp @@ -1,112 +1,80 @@ -#include - #include -using namespace DIS; - +#include -Marking::Marking(): - _characterSet(0) -{ - // Initialize fixed length array - for(int lengthcharacters= 0; lengthcharacters < 11; lengthcharacters++) - { - _characters[lengthcharacters] = 0; - } +using namespace DIS; +Marking::Marking() : _characterSet(0) { + // Initialize fixed length array + for (int lengthcharacters = 0; lengthcharacters < 11; lengthcharacters++) { + _characters[lengthcharacters] = 0; + } } -Marking::~Marking() -{ -} +Marking::~Marking() {} -unsigned char Marking::getCharacterSet() const -{ - return _characterSet; -} +unsigned char Marking::getCharacterSet() const { return _characterSet; } -void Marking::setCharacterSet(unsigned char pX) -{ - _characterSet = pX; -} +void Marking::setCharacterSet(unsigned char pX) { _characterSet = pX; } -char* Marking::getCharacters() -{ - return _characters; -} +char* Marking::getCharacters() { return _characters; } -const char* Marking::getCharacters() const -{ - return _characters; -} +const char* Marking::getCharacters() const { return _characters; } -void Marking::setCharacters(const char* x) -{ - for(int i = 0; i < 11; i++) - { - _characters[i] = x[i]; - } +void Marking::setCharacters(const char* x) { + for (int i = 0; i < 11; i++) { + _characters[i] = x[i]; + } } -// An alternate method to set the value if this could be a string. This is not strictly comnpliant with the DIS standard. -void Marking::setByStringCharacters(const char* x) -{ - std::strncpy(_characters, x, 11-1); - _characters[11 -1] = '\0'; +// An alternate method to set the value if this could be a string. This is not +// strictly comnpliant with the DIS standard. +void Marking::setByStringCharacters(const char* x) { + std::strncpy(_characters, x, 11 - 1); + _characters[11 - 1] = '\0'; } -void Marking::marshal(DataStream& dataStream) const -{ - dataStream << _characterSet; - - for(size_t idx = 0; idx < 11; idx++) - { - dataStream << _characters[idx]; - } +void Marking::marshal(DataStream& dataStream) const { + dataStream << _characterSet; + for (size_t idx = 0; idx < 11; idx++) { + dataStream << _characters[idx]; + } } -void Marking::unmarshal(DataStream& dataStream) -{ - dataStream >> _characterSet; - - for(size_t idx = 0; idx < 11; idx++) - { - dataStream >> _characters[idx]; - } +void Marking::unmarshal(DataStream& dataStream) { + dataStream >> _characterSet; + for (size_t idx = 0; idx < 11; idx++) { + dataStream >> _characters[idx]; + } } +bool Marking::operator==(const Marking& rhs) const { + bool ivarsEqual = true; -bool Marking::operator ==(const Marking& rhs) const - { - bool ivarsEqual = true; - - if( ! (_characterSet == rhs._characterSet) ) ivarsEqual = false; + if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for(unsigned char idx = 0; idx < 11; idx++) - { - if(!(_characters[idx] == rhs._characters[idx]) ) ivarsEqual = false; - } + for (unsigned char idx = 0; idx < 11; idx++) { + if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int Marking::getMarshalledSize() const -{ - int marshalSize = 0; +int Marking::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _characterSet - marshalSize = marshalSize + 11 * 1; // _characters - return marshalSize; + marshalSize = marshalSize + 1; // _characterSet + marshalSize = marshalSize + 11 * 1; // _characters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -119,7 +87,7 @@ int Marking::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Marking.h b/src/dis6/Marking.h index 10cb7862..b52ae043 100644 --- a/src/dis6/Marking.h +++ b/src/dis6/Marking.h @@ -1,54 +1,51 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.15. Specifies the character set used inthe first byte, followed +// by 11 characters of text data. -namespace DIS -{ -// Section 5.2.15. Specifies the character set used inthe first byte, followed by 11 characters of text data. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Marking -{ -protected: +class OPENDIS6_EXPORT Marking { + protected: /** The character set */ - unsigned char _characterSet; + unsigned char _characterSet; /** The characters */ - char _characters[11]; - + char _characters[11]; public: - Marking(); - virtual ~Marking(); + Marking(); + virtual ~Marking(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + unsigned char getCharacterSet() const; + void setCharacterSet(unsigned char pX); - char* getCharacters(); - const char* getCharacters() const; - void setCharacters( const char* pX); - void setByStringCharacters(const char* pX); + char* getCharacters(); + const char* getCharacters() const; + void setCharacters(const char* pX); + void setByStringCharacters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Marking& rhs) const; + bool operator==(const Marking& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldDataPdu.cpp b/src/dis6/MinefieldDataPdu.cpp index d8d4f42e..7720b910 100644 --- a/src/dis6/MinefieldDataPdu.cpp +++ b/src/dis6/MinefieldDataPdu.cpp @@ -2,321 +2,249 @@ using namespace DIS; - -MinefieldDataPdu::MinefieldDataPdu() : MinefieldFamilyPdu(), - _minefieldID(), - _requestingEntityID(), - _minefieldSequenceNumbeer(0), - _requestID(0), - _pduSequenceNumber(0), - _numberOfPdus(0), - _numberOfMinesInThisPdu(0), - _numberOfSensorTypes(0), - _pad2(0), - _dataFilter(0), - _mineType(), - _pad3(0) -{ - setPduType( 39 ); +MinefieldDataPdu::MinefieldDataPdu() + : MinefieldFamilyPdu(), + _minefieldID(), + _requestingEntityID(), + _minefieldSequenceNumbeer(0), + _requestID(0), + _pduSequenceNumber(0), + _numberOfPdus(0), + _numberOfMinesInThisPdu(0), + _numberOfSensorTypes(0), + _pad2(0), + _dataFilter(0), + _mineType(), + _pad3(0) { + setPduType(39); } -MinefieldDataPdu::~MinefieldDataPdu() -{ - _sensorTypes.clear(); - _mineLocation.clear(); +MinefieldDataPdu::~MinefieldDataPdu() { + _sensorTypes.clear(); + _mineLocation.clear(); } -EntityID& MinefieldDataPdu::getMinefieldID() -{ - return _minefieldID; -} +EntityID& MinefieldDataPdu::getMinefieldID() { return _minefieldID; } -const EntityID& MinefieldDataPdu::getMinefieldID() const -{ - return _minefieldID; +const EntityID& MinefieldDataPdu::getMinefieldID() const { + return _minefieldID; } -void MinefieldDataPdu::setMinefieldID(const EntityID &pX) -{ - _minefieldID = pX; -} +void MinefieldDataPdu::setMinefieldID(const EntityID& pX) { _minefieldID = pX; } -EntityID& MinefieldDataPdu::getRequestingEntityID() -{ - return _requestingEntityID; +EntityID& MinefieldDataPdu::getRequestingEntityID() { + return _requestingEntityID; } -const EntityID& MinefieldDataPdu::getRequestingEntityID() const -{ - return _requestingEntityID; +const EntityID& MinefieldDataPdu::getRequestingEntityID() const { + return _requestingEntityID; } -void MinefieldDataPdu::setRequestingEntityID(const EntityID &pX) -{ - _requestingEntityID = pX; +void MinefieldDataPdu::setRequestingEntityID(const EntityID& pX) { + _requestingEntityID = pX; } -unsigned short MinefieldDataPdu::getMinefieldSequenceNumbeer() const -{ - return _minefieldSequenceNumbeer; +unsigned short MinefieldDataPdu::getMinefieldSequenceNumbeer() const { + return _minefieldSequenceNumbeer; } -void MinefieldDataPdu::setMinefieldSequenceNumbeer(unsigned short pX) -{ - _minefieldSequenceNumbeer = pX; +void MinefieldDataPdu::setMinefieldSequenceNumbeer(unsigned short pX) { + _minefieldSequenceNumbeer = pX; } -unsigned char MinefieldDataPdu::getRequestID() const -{ - return _requestID; -} +unsigned char MinefieldDataPdu::getRequestID() const { return _requestID; } -void MinefieldDataPdu::setRequestID(unsigned char pX) -{ - _requestID = pX; -} +void MinefieldDataPdu::setRequestID(unsigned char pX) { _requestID = pX; } -unsigned char MinefieldDataPdu::getPduSequenceNumber() const -{ - return _pduSequenceNumber; +unsigned char MinefieldDataPdu::getPduSequenceNumber() const { + return _pduSequenceNumber; } -void MinefieldDataPdu::setPduSequenceNumber(unsigned char pX) -{ - _pduSequenceNumber = pX; +void MinefieldDataPdu::setPduSequenceNumber(unsigned char pX) { + _pduSequenceNumber = pX; } -unsigned char MinefieldDataPdu::getNumberOfPdus() const -{ - return _numberOfPdus; +unsigned char MinefieldDataPdu::getNumberOfPdus() const { + return _numberOfPdus; } -void MinefieldDataPdu::setNumberOfPdus(unsigned char pX) -{ - _numberOfPdus = pX; -} +void MinefieldDataPdu::setNumberOfPdus(unsigned char pX) { _numberOfPdus = pX; } -unsigned char MinefieldDataPdu::getNumberOfMinesInThisPdu() const -{ - return _mineLocation.size(); +unsigned char MinefieldDataPdu::getNumberOfMinesInThisPdu() const { + return _mineLocation.size(); } -unsigned char MinefieldDataPdu::getNumberOfSensorTypes() const -{ - return _sensorTypes.size(); +unsigned char MinefieldDataPdu::getNumberOfSensorTypes() const { + return _sensorTypes.size(); } -unsigned char MinefieldDataPdu::getPad2() const -{ - return _pad2; -} +unsigned char MinefieldDataPdu::getPad2() const { return _pad2; } -void MinefieldDataPdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void MinefieldDataPdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int MinefieldDataPdu::getDataFilter() const -{ - return _dataFilter; -} +unsigned int MinefieldDataPdu::getDataFilter() const { return _dataFilter; } -void MinefieldDataPdu::setDataFilter(unsigned int pX) -{ - _dataFilter = pX; -} +void MinefieldDataPdu::setDataFilter(unsigned int pX) { _dataFilter = pX; } -EntityType& MinefieldDataPdu::getMineType() -{ - return _mineType; -} +EntityType& MinefieldDataPdu::getMineType() { return _mineType; } -const EntityType& MinefieldDataPdu::getMineType() const -{ - return _mineType; -} +const EntityType& MinefieldDataPdu::getMineType() const { return _mineType; } -void MinefieldDataPdu::setMineType(const EntityType &pX) -{ - _mineType = pX; -} +void MinefieldDataPdu::setMineType(const EntityType& pX) { _mineType = pX; } -std::vector& MinefieldDataPdu::getSensorTypes() -{ - return _sensorTypes; +std::vector& MinefieldDataPdu::getSensorTypes() { + return _sensorTypes; } -const std::vector& MinefieldDataPdu::getSensorTypes() const -{ - return _sensorTypes; +const std::vector& MinefieldDataPdu::getSensorTypes() const { + return _sensorTypes; } -void MinefieldDataPdu::setSensorTypes(const std::vector& pX) -{ - _sensorTypes = pX; +void MinefieldDataPdu::setSensorTypes(const std::vector& pX) { + _sensorTypes = pX; } -unsigned char MinefieldDataPdu::getPad3() const -{ - return _pad3; -} +unsigned char MinefieldDataPdu::getPad3() const { return _pad3; } -void MinefieldDataPdu::setPad3(unsigned char pX) -{ - _pad3 = pX; -} +void MinefieldDataPdu::setPad3(unsigned char pX) { _pad3 = pX; } -std::vector& MinefieldDataPdu::getMineLocation() -{ - return _mineLocation; +std::vector& MinefieldDataPdu::getMineLocation() { + return _mineLocation; } -const std::vector& MinefieldDataPdu::getMineLocation() const -{ - return _mineLocation; +const std::vector& MinefieldDataPdu::getMineLocation() const { + return _mineLocation; } -void MinefieldDataPdu::setMineLocation(const std::vector& pX) -{ - _mineLocation = pX; +void MinefieldDataPdu::setMineLocation(const std::vector& pX) { + _mineLocation = pX; } -void MinefieldDataPdu::marshal(DataStream& dataStream) const -{ - MinefieldFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _minefieldID.marshal(dataStream); - _requestingEntityID.marshal(dataStream); - dataStream << _minefieldSequenceNumbeer; - dataStream << _requestID; - dataStream << _pduSequenceNumber; - dataStream << _numberOfPdus; - dataStream << ( unsigned char )_mineLocation.size(); - dataStream << ( unsigned char )_sensorTypes.size(); - dataStream << _pad2; - dataStream << _dataFilter; - _mineType.marshal(dataStream); - - for(size_t idx = 0; idx < _sensorTypes.size(); idx++) - { - TwoByteChunk x = _sensorTypes[idx]; - x.marshal(dataStream); - } - - dataStream << _pad3; - - for(size_t idx = 0; idx < _mineLocation.size(); idx++) - { - Vector3Float x = _mineLocation[idx]; - x.marshal(dataStream); - } +void MinefieldDataPdu::marshal(DataStream& dataStream) const { + MinefieldFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _minefieldID.marshal(dataStream); + _requestingEntityID.marshal(dataStream); + dataStream << _minefieldSequenceNumbeer; + dataStream << _requestID; + dataStream << _pduSequenceNumber; + dataStream << _numberOfPdus; + dataStream << (unsigned char)_mineLocation.size(); + dataStream << (unsigned char)_sensorTypes.size(); + dataStream << _pad2; + dataStream << _dataFilter; + _mineType.marshal(dataStream); + + for (size_t idx = 0; idx < _sensorTypes.size(); idx++) { + TwoByteChunk x = _sensorTypes[idx]; + x.marshal(dataStream); + } + + dataStream << _pad3; + for (size_t idx = 0; idx < _mineLocation.size(); idx++) { + Vector3Float x = _mineLocation[idx]; + x.marshal(dataStream); + } } -void MinefieldDataPdu::unmarshal(DataStream& dataStream) -{ - MinefieldFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _minefieldID.unmarshal(dataStream); - _requestingEntityID.unmarshal(dataStream); - dataStream >> _minefieldSequenceNumbeer; - dataStream >> _requestID; - dataStream >> _pduSequenceNumber; - dataStream >> _numberOfPdus; - dataStream >> _numberOfMinesInThisPdu; - dataStream >> _numberOfSensorTypes; - dataStream >> _pad2; - dataStream >> _dataFilter; - _mineType.unmarshal(dataStream); - - _sensorTypes.clear(); - for(size_t idx = 0; idx < _numberOfSensorTypes; idx++) - { - TwoByteChunk x; - x.unmarshal(dataStream); - _sensorTypes.push_back(x); - } - dataStream >> _pad3; - - _mineLocation.clear(); - for(size_t idx = 0; idx < _numberOfMinesInThisPdu; idx++) - { - Vector3Float x; - x.unmarshal(dataStream); - _mineLocation.push_back(x); - } +void MinefieldDataPdu::unmarshal(DataStream& dataStream) { + MinefieldFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _minefieldID.unmarshal(dataStream); + _requestingEntityID.unmarshal(dataStream); + dataStream >> _minefieldSequenceNumbeer; + dataStream >> _requestID; + dataStream >> _pduSequenceNumber; + dataStream >> _numberOfPdus; + dataStream >> _numberOfMinesInThisPdu; + dataStream >> _numberOfSensorTypes; + dataStream >> _pad2; + dataStream >> _dataFilter; + _mineType.unmarshal(dataStream); + + _sensorTypes.clear(); + for (size_t idx = 0; idx < _numberOfSensorTypes; idx++) { + TwoByteChunk x; + x.unmarshal(dataStream); + _sensorTypes.push_back(x); + } + dataStream >> _pad3; + + _mineLocation.clear(); + for (size_t idx = 0; idx < _numberOfMinesInThisPdu; idx++) { + Vector3Float x; + x.unmarshal(dataStream); + _mineLocation.push_back(x); + } } +bool MinefieldDataPdu::operator==(const MinefieldDataPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = MinefieldFamilyPdu::operator==(rhs); + + if (!(_minefieldID == rhs._minefieldID)) ivarsEqual = false; + if (!(_requestingEntityID == rhs._requestingEntityID)) ivarsEqual = false; + if (!(_minefieldSequenceNumbeer == rhs._minefieldSequenceNumbeer)) + ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_pduSequenceNumber == rhs._pduSequenceNumber)) ivarsEqual = false; + if (!(_numberOfPdus == rhs._numberOfPdus)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_dataFilter == rhs._dataFilter)) ivarsEqual = false; + if (!(_mineType == rhs._mineType)) ivarsEqual = false; + + for (size_t idx = 0; idx < _sensorTypes.size(); idx++) { + if (!(_sensorTypes[idx] == rhs._sensorTypes[idx])) ivarsEqual = false; + } -bool MinefieldDataPdu::operator ==(const MinefieldDataPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = MinefieldFamilyPdu::operator==(rhs); - - if( ! (_minefieldID == rhs._minefieldID) ) ivarsEqual = false; - if( ! (_requestingEntityID == rhs._requestingEntityID) ) ivarsEqual = false; - if( ! (_minefieldSequenceNumbeer == rhs._minefieldSequenceNumbeer) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_pduSequenceNumber == rhs._pduSequenceNumber) ) ivarsEqual = false; - if( ! (_numberOfPdus == rhs._numberOfPdus) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_dataFilter == rhs._dataFilter) ) ivarsEqual = false; - if( ! (_mineType == rhs._mineType) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _sensorTypes.size(); idx++) - { - if( ! ( _sensorTypes[idx] == rhs._sensorTypes[idx]) ) ivarsEqual = false; - } - - if( ! (_pad3 == rhs._pad3) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _mineLocation.size(); idx++) - { - if( ! ( _mineLocation[idx] == rhs._mineLocation[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int MinefieldDataPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = MinefieldFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID - marshalSize = marshalSize + _requestingEntityID.getMarshalledSize(); // _requestingEntityID - marshalSize = marshalSize + 2; // _minefieldSequenceNumbeer - marshalSize = marshalSize + 1; // _requestID - marshalSize = marshalSize + 1; // _pduSequenceNumber - marshalSize = marshalSize + 1; // _numberOfPdus - marshalSize = marshalSize + 1; // _numberOfMinesInThisPdu - marshalSize = marshalSize + 1; // _numberOfSensorTypes - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _dataFilter - marshalSize = marshalSize + _mineType.getMarshalledSize(); // _mineType - - for(unsigned long long idx=0; idx < _sensorTypes.size(); idx++) - { - TwoByteChunk listElement = _sensorTypes[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - marshalSize = marshalSize + 1; // _pad3 - - for(unsigned long long idx=0; idx < _mineLocation.size(); idx++) - { - Vector3Float listElement = _mineLocation[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + if (!(_pad3 == rhs._pad3)) ivarsEqual = false; + + for (size_t idx = 0; idx < _mineLocation.size(); idx++) { + if (!(_mineLocation[idx] == rhs._mineLocation[idx])) ivarsEqual = false; + } + + return ivarsEqual; +} + +int MinefieldDataPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = MinefieldFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID + marshalSize = marshalSize + + _requestingEntityID.getMarshalledSize(); // _requestingEntityID + marshalSize = marshalSize + 2; // _minefieldSequenceNumbeer + marshalSize = marshalSize + 1; // _requestID + marshalSize = marshalSize + 1; // _pduSequenceNumber + marshalSize = marshalSize + 1; // _numberOfPdus + marshalSize = marshalSize + 1; // _numberOfMinesInThisPdu + marshalSize = marshalSize + 1; // _numberOfSensorTypes + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _dataFilter + marshalSize = marshalSize + _mineType.getMarshalledSize(); // _mineType + + for (unsigned long long idx = 0; idx < _sensorTypes.size(); idx++) { + TwoByteChunk listElement = _sensorTypes[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + marshalSize = marshalSize + 1; // _pad3 + + for (unsigned long long idx = 0; idx < _mineLocation.size(); idx++) { + Vector3Float listElement = _mineLocation[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -329,7 +257,7 @@ int MinefieldDataPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldDataPdu.h b/src/dis6/MinefieldDataPdu.h index 045c9042..8fd139ba 100644 --- a/src/dis6/MinefieldDataPdu.h +++ b/src/dis6/MinefieldDataPdu.h @@ -1,134 +1,132 @@ #pragma once -#include +#include + #include #include +#include #include #include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.10.3 Information about individual mines within a minefield. This +// is very, very wrong. UNFINISHED -namespace DIS -{ -// Section 5.3.10.3 Information about individual mines within a minefield. This is very, very wrong. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu -{ -protected: +class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { + protected: /** Minefield ID */ - EntityID _minefieldID; + EntityID _minefieldID; /** ID of entity making request */ - EntityID _requestingEntityID; + EntityID _requestingEntityID; /** Minefield sequence number */ - unsigned short _minefieldSequenceNumbeer; + unsigned short _minefieldSequenceNumbeer; /** request ID */ - unsigned char _requestID; + unsigned char _requestID; /** pdu sequence number */ - unsigned char _pduSequenceNumber; + unsigned char _pduSequenceNumber; /** number of pdus in response */ - unsigned char _numberOfPdus; + unsigned char _numberOfPdus; /** how many mines are in this PDU */ - unsigned char _numberOfMinesInThisPdu; + unsigned char _numberOfMinesInThisPdu; /** how many sensor type are in this PDU */ - unsigned char _numberOfSensorTypes; + unsigned char _numberOfSensorTypes; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** 32 boolean fields */ - unsigned int _dataFilter; + unsigned int _dataFilter; /** Mine type */ - EntityType _mineType; + EntityType _mineType; /** Sensor types, each 16 bits long */ - std::vector _sensorTypes; + std::vector _sensorTypes; - /** Padding to get things 32-bit aligned. ^^^this is wrong--dyanmically sized padding needed */ - unsigned char _pad3; + /** Padding to get things 32-bit aligned. ^^^this is wrong--dyanmically sized + * padding needed */ + unsigned char _pad3; /** Mine locations */ - std::vector _mineLocation; - + std::vector _mineLocation; public: - MinefieldDataPdu(); - virtual ~MinefieldDataPdu(); + MinefieldDataPdu(); + virtual ~MinefieldDataPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getMinefieldID(); - const EntityID& getMinefieldID() const; - void setMinefieldID(const EntityID &pX); + EntityID& getMinefieldID(); + const EntityID& getMinefieldID() const; + void setMinefieldID(const EntityID& pX); - EntityID& getRequestingEntityID(); - const EntityID& getRequestingEntityID() const; - void setRequestingEntityID(const EntityID &pX); + EntityID& getRequestingEntityID(); + const EntityID& getRequestingEntityID() const; + void setRequestingEntityID(const EntityID& pX); - unsigned short getMinefieldSequenceNumbeer() const; - void setMinefieldSequenceNumbeer(unsigned short pX); + unsigned short getMinefieldSequenceNumbeer() const; + void setMinefieldSequenceNumbeer(unsigned short pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + unsigned char getRequestID() const; + void setRequestID(unsigned char pX); - unsigned char getPduSequenceNumber() const; - void setPduSequenceNumber(unsigned char pX); + unsigned char getPduSequenceNumber() const; + void setPduSequenceNumber(unsigned char pX); - unsigned char getNumberOfPdus() const; - void setNumberOfPdus(unsigned char pX); + unsigned char getNumberOfPdus() const; + void setNumberOfPdus(unsigned char pX); - unsigned char getNumberOfMinesInThisPdu() const; + unsigned char getNumberOfMinesInThisPdu() const; - unsigned char getNumberOfSensorTypes() const; + unsigned char getNumberOfSensorTypes() const; - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getDataFilter() const; - void setDataFilter(unsigned int pX); + unsigned int getDataFilter() const; + void setDataFilter(unsigned int pX); - EntityType& getMineType(); - const EntityType& getMineType() const; - void setMineType(const EntityType &pX); + EntityType& getMineType(); + const EntityType& getMineType() const; + void setMineType(const EntityType& pX); - std::vector& getSensorTypes(); - const std::vector& getSensorTypes() const; - void setSensorTypes(const std::vector& pX); + std::vector& getSensorTypes(); + const std::vector& getSensorTypes() const; + void setSensorTypes(const std::vector& pX); - unsigned char getPad3() const; - void setPad3(unsigned char pX); + unsigned char getPad3() const; + void setPad3(unsigned char pX); - std::vector& getMineLocation(); - const std::vector& getMineLocation() const; - void setMineLocation(const std::vector& pX); + std::vector& getMineLocation(); + const std::vector& getMineLocation() const; + void setMineLocation(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldDataPdu& rhs) const; + bool operator==(const MinefieldDataPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -141,7 +139,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldFamilyPdu.cpp b/src/dis6/MinefieldFamilyPdu.cpp index 5af2e547..d72e022a 100644 --- a/src/dis6/MinefieldFamilyPdu.cpp +++ b/src/dis6/MinefieldFamilyPdu.cpp @@ -2,51 +2,43 @@ using namespace DIS; - -MinefieldFamilyPdu::MinefieldFamilyPdu() : Pdu() +MinefieldFamilyPdu::MinefieldFamilyPdu() + : Pdu() { - setProtocolFamily( 8 ); + setProtocolFamily(8); } -MinefieldFamilyPdu::~MinefieldFamilyPdu() -{ -} +MinefieldFamilyPdu::~MinefieldFamilyPdu() {} -void MinefieldFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void MinefieldFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void MinefieldFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void MinefieldFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool MinefieldFamilyPdu::operator==(const MinefieldFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool MinefieldFamilyPdu::operator ==(const MinefieldFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int MinefieldFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int MinefieldFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +51,7 @@ int MinefieldFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldFamilyPdu.h b/src/dis6/MinefieldFamilyPdu.h index c2a7387f..5fee9502 100644 --- a/src/dis6/MinefieldFamilyPdu.h +++ b/src/dis6/MinefieldFamilyPdu.h @@ -1,41 +1,37 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.10.1 Abstract superclass for PDUs relating to minefields -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldFamilyPdu : public Pdu -{ -protected: - +class OPENDIS6_EXPORT MinefieldFamilyPdu : public Pdu { + protected: public: - MinefieldFamilyPdu(); - virtual ~MinefieldFamilyPdu(); + MinefieldFamilyPdu(); + virtual ~MinefieldFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldFamilyPdu& rhs) const; + bool operator==(const MinefieldFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldPduFamily.cpp b/src/dis6/MinefieldPduFamily.cpp index 9518ec4d..b3cbc874 100644 --- a/src/dis6/MinefieldPduFamily.cpp +++ b/src/dis6/MinefieldPduFamily.cpp @@ -2,43 +2,34 @@ using namespace DIS; - -MinefieldPduFamily::MinefieldPduFamily() : Pdu() +MinefieldPduFamily::MinefieldPduFamily() + : Pdu() { - setProtocolFamily( 8 ); + setProtocolFamily(8); } -MinefieldPduFamily::~MinefieldPduFamily() -{ -} +MinefieldPduFamily::~MinefieldPduFamily() {} -void MinefieldPduFamily::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void MinefieldPduFamily::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void MinefieldPduFamily::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void MinefieldPduFamily::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool MinefieldPduFamily::operator==(const MinefieldPduFamily& rhs) const { + bool ivarsEqual = true; -bool MinefieldPduFamily::operator ==(const MinefieldPduFamily& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = Pdu::operator==(rhs); + ivarsEqual = Pdu::operator==(rhs); + return ivarsEqual; +} - return ivarsEqual; - } +int MinefieldPduFamily::getMarshalledSize() const { + int marshalSize = 0; -int MinefieldPduFamily::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } - diff --git a/src/dis6/MinefieldPduFamily.h b/src/dis6/MinefieldPduFamily.h index be06ed2e..d69a3e86 100644 --- a/src/dis6/MinefieldPduFamily.h +++ b/src/dis6/MinefieldPduFamily.h @@ -1,35 +1,31 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.10.1 Abstract superclass for PDUs relating to minefields -// Copyright (c) 2007, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007, MOVES Institute, Naval Postgraduate School. All rights +// reserved. // -// This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html +// This work is licensed under the BSD open source license, available at +// https://www.movesinstitute.org/licenses/bsd.html // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldPduFamily : public Pdu -{ -protected: - +class OPENDIS6_EXPORT MinefieldPduFamily : public Pdu { + protected: public: - MinefieldPduFamily(); - virtual ~MinefieldPduFamily(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + MinefieldPduFamily(); + virtual ~MinefieldPduFamily(); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const MinefieldPduFamily& rhs) const; + bool operator==(const MinefieldPduFamily& rhs) const; }; -} - +} // namespace DIS diff --git a/src/dis6/MinefieldQueryPdu.cpp b/src/dis6/MinefieldQueryPdu.cpp index 27c00112..fd1e8272 100644 --- a/src/dis6/MinefieldQueryPdu.cpp +++ b/src/dis6/MinefieldQueryPdu.cpp @@ -2,261 +2,212 @@ using namespace DIS; - -MinefieldQueryPdu::MinefieldQueryPdu() : MinefieldFamilyPdu(), - _minefieldID(), - _requestingEntityID(), - _requestID(0), - _numberOfPerimeterPoints(0), - _pad2(0), - _numberOfSensorTypes(0), - _dataFilter(0), - _requestedMineType() -{ - setPduType( 38 ); +MinefieldQueryPdu::MinefieldQueryPdu() + : MinefieldFamilyPdu(), + _minefieldID(), + _requestingEntityID(), + _requestID(0), + _numberOfPerimeterPoints(0), + _pad2(0), + _numberOfSensorTypes(0), + _dataFilter(0), + _requestedMineType() { + setPduType(38); } -MinefieldQueryPdu::~MinefieldQueryPdu() -{ - _requestedPerimeterPoints.clear(); - _sensorTypes.clear(); +MinefieldQueryPdu::~MinefieldQueryPdu() { + _requestedPerimeterPoints.clear(); + _sensorTypes.clear(); } -EntityID& MinefieldQueryPdu::getMinefieldID() -{ - return _minefieldID; -} +EntityID& MinefieldQueryPdu::getMinefieldID() { return _minefieldID; } -const EntityID& MinefieldQueryPdu::getMinefieldID() const -{ - return _minefieldID; +const EntityID& MinefieldQueryPdu::getMinefieldID() const { + return _minefieldID; } -void MinefieldQueryPdu::setMinefieldID(const EntityID &pX) -{ - _minefieldID = pX; +void MinefieldQueryPdu::setMinefieldID(const EntityID& pX) { + _minefieldID = pX; } -EntityID& MinefieldQueryPdu::getRequestingEntityID() -{ - return _requestingEntityID; +EntityID& MinefieldQueryPdu::getRequestingEntityID() { + return _requestingEntityID; } -const EntityID& MinefieldQueryPdu::getRequestingEntityID() const -{ - return _requestingEntityID; +const EntityID& MinefieldQueryPdu::getRequestingEntityID() const { + return _requestingEntityID; } -void MinefieldQueryPdu::setRequestingEntityID(const EntityID &pX) -{ - _requestingEntityID = pX; +void MinefieldQueryPdu::setRequestingEntityID(const EntityID& pX) { + _requestingEntityID = pX; } -unsigned char MinefieldQueryPdu::getRequestID() const -{ - return _requestID; -} +unsigned char MinefieldQueryPdu::getRequestID() const { return _requestID; } -void MinefieldQueryPdu::setRequestID(unsigned char pX) -{ - _requestID = pX; -} +void MinefieldQueryPdu::setRequestID(unsigned char pX) { _requestID = pX; } -unsigned char MinefieldQueryPdu::getNumberOfPerimeterPoints() const -{ - return _requestedPerimeterPoints.size(); +unsigned char MinefieldQueryPdu::getNumberOfPerimeterPoints() const { + return _requestedPerimeterPoints.size(); } -unsigned char MinefieldQueryPdu::getPad2() const -{ - return _pad2; -} +unsigned char MinefieldQueryPdu::getPad2() const { return _pad2; } -void MinefieldQueryPdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void MinefieldQueryPdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned char MinefieldQueryPdu::getNumberOfSensorTypes() const -{ - return _sensorTypes.size(); +unsigned char MinefieldQueryPdu::getNumberOfSensorTypes() const { + return _sensorTypes.size(); } -unsigned int MinefieldQueryPdu::getDataFilter() const -{ - return _dataFilter; -} +unsigned int MinefieldQueryPdu::getDataFilter() const { return _dataFilter; } -void MinefieldQueryPdu::setDataFilter(unsigned int pX) -{ - _dataFilter = pX; -} +void MinefieldQueryPdu::setDataFilter(unsigned int pX) { _dataFilter = pX; } -EntityType& MinefieldQueryPdu::getRequestedMineType() -{ - return _requestedMineType; +EntityType& MinefieldQueryPdu::getRequestedMineType() { + return _requestedMineType; } -const EntityType& MinefieldQueryPdu::getRequestedMineType() const -{ - return _requestedMineType; +const EntityType& MinefieldQueryPdu::getRequestedMineType() const { + return _requestedMineType; } -void MinefieldQueryPdu::setRequestedMineType(const EntityType &pX) -{ - _requestedMineType = pX; +void MinefieldQueryPdu::setRequestedMineType(const EntityType& pX) { + _requestedMineType = pX; } -std::vector& MinefieldQueryPdu::getRequestedPerimeterPoints() -{ - return _requestedPerimeterPoints; +std::vector& MinefieldQueryPdu::getRequestedPerimeterPoints() { + return _requestedPerimeterPoints; } -const std::vector& MinefieldQueryPdu::getRequestedPerimeterPoints() const -{ - return _requestedPerimeterPoints; +const std::vector& MinefieldQueryPdu::getRequestedPerimeterPoints() + const { + return _requestedPerimeterPoints; } -void MinefieldQueryPdu::setRequestedPerimeterPoints(const std::vector& pX) -{ - _requestedPerimeterPoints = pX; +void MinefieldQueryPdu::setRequestedPerimeterPoints( + const std::vector& pX) { + _requestedPerimeterPoints = pX; } -std::vector& MinefieldQueryPdu::getSensorTypes() -{ - return _sensorTypes; +std::vector& MinefieldQueryPdu::getSensorTypes() { + return _sensorTypes; } -const std::vector& MinefieldQueryPdu::getSensorTypes() const -{ - return _sensorTypes; +const std::vector& MinefieldQueryPdu::getSensorTypes() const { + return _sensorTypes; } -void MinefieldQueryPdu::setSensorTypes(const std::vector& pX) -{ - _sensorTypes = pX; +void MinefieldQueryPdu::setSensorTypes(const std::vector& pX) { + _sensorTypes = pX; } -void MinefieldQueryPdu::marshal(DataStream& dataStream) const -{ - MinefieldFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _minefieldID.marshal(dataStream); - _requestingEntityID.marshal(dataStream); - dataStream << _requestID; - dataStream << ( unsigned char )_requestedPerimeterPoints.size(); - dataStream << _pad2; - dataStream << ( unsigned char )_sensorTypes.size(); - dataStream << _dataFilter; - _requestedMineType.marshal(dataStream); - - for(size_t idx = 0; idx < _requestedPerimeterPoints.size(); idx++) - { - Point x = _requestedPerimeterPoints[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _sensorTypes.size(); idx++) - { - TwoByteChunk x = _sensorTypes[idx]; - x.marshal(dataStream); - } +void MinefieldQueryPdu::marshal(DataStream& dataStream) const { + MinefieldFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _minefieldID.marshal(dataStream); + _requestingEntityID.marshal(dataStream); + dataStream << _requestID; + dataStream << (unsigned char)_requestedPerimeterPoints.size(); + dataStream << _pad2; + dataStream << (unsigned char)_sensorTypes.size(); + dataStream << _dataFilter; + _requestedMineType.marshal(dataStream); -} + for (size_t idx = 0; idx < _requestedPerimeterPoints.size(); idx++) { + Point x = _requestedPerimeterPoints[idx]; + x.marshal(dataStream); + } -void MinefieldQueryPdu::unmarshal(DataStream& dataStream) -{ - MinefieldFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _minefieldID.unmarshal(dataStream); - _requestingEntityID.unmarshal(dataStream); - dataStream >> _requestID; - dataStream >> _numberOfPerimeterPoints; - dataStream >> _pad2; - dataStream >> _numberOfSensorTypes; - dataStream >> _dataFilter; - _requestedMineType.unmarshal(dataStream); - - _requestedPerimeterPoints.clear(); - for(size_t idx = 0; idx < _numberOfPerimeterPoints; idx++) - { - Point x; - x.unmarshal(dataStream); - _requestedPerimeterPoints.push_back(x); - } - - _sensorTypes.clear(); - for(size_t idx = 0; idx < _numberOfSensorTypes; idx++) - { - TwoByteChunk x; - x.unmarshal(dataStream); - _sensorTypes.push_back(x); - } + for (size_t idx = 0; idx < _sensorTypes.size(); idx++) { + TwoByteChunk x = _sensorTypes[idx]; + x.marshal(dataStream); + } } +void MinefieldQueryPdu::unmarshal(DataStream& dataStream) { + MinefieldFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _minefieldID.unmarshal(dataStream); + _requestingEntityID.unmarshal(dataStream); + dataStream >> _requestID; + dataStream >> _numberOfPerimeterPoints; + dataStream >> _pad2; + dataStream >> _numberOfSensorTypes; + dataStream >> _dataFilter; + _requestedMineType.unmarshal(dataStream); -bool MinefieldQueryPdu::operator ==(const MinefieldQueryPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = MinefieldFamilyPdu::operator==(rhs); - - if( ! (_minefieldID == rhs._minefieldID) ) ivarsEqual = false; - if( ! (_requestingEntityID == rhs._requestingEntityID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_dataFilter == rhs._dataFilter) ) ivarsEqual = false; - if( ! (_requestedMineType == rhs._requestedMineType) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _requestedPerimeterPoints.size(); idx++) - { - if( ! ( _requestedPerimeterPoints[idx] == rhs._requestedPerimeterPoints[idx]) ) ivarsEqual = false; - } + _requestedPerimeterPoints.clear(); + for (size_t idx = 0; idx < _numberOfPerimeterPoints; idx++) { + Point x; + x.unmarshal(dataStream); + _requestedPerimeterPoints.push_back(x); + } + _sensorTypes.clear(); + for (size_t idx = 0; idx < _numberOfSensorTypes; idx++) { + TwoByteChunk x; + x.unmarshal(dataStream); + _sensorTypes.push_back(x); + } +} - for(size_t idx = 0; idx < _sensorTypes.size(); idx++) - { - if( ! ( _sensorTypes[idx] == rhs._sensorTypes[idx]) ) ivarsEqual = false; - } - +bool MinefieldQueryPdu::operator==(const MinefieldQueryPdu& rhs) const { + bool ivarsEqual = true; - return ivarsEqual; - } + ivarsEqual = MinefieldFamilyPdu::operator==(rhs); -int MinefieldQueryPdu::getMarshalledSize() const -{ - int marshalSize = 0; + if (!(_minefieldID == rhs._minefieldID)) ivarsEqual = false; + if (!(_requestingEntityID == rhs._requestingEntityID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_dataFilter == rhs._dataFilter)) ivarsEqual = false; + if (!(_requestedMineType == rhs._requestedMineType)) ivarsEqual = false; - marshalSize = MinefieldFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID - marshalSize = marshalSize + _requestingEntityID.getMarshalledSize(); // _requestingEntityID - marshalSize = marshalSize + 1; // _requestID - marshalSize = marshalSize + 1; // _numberOfPerimeterPoints - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 1; // _numberOfSensorTypes - marshalSize = marshalSize + 4; // _dataFilter - marshalSize = marshalSize + _requestedMineType.getMarshalledSize(); // _requestedMineType + for (size_t idx = 0; idx < _requestedPerimeterPoints.size(); idx++) { + if (!(_requestedPerimeterPoints[idx] == rhs._requestedPerimeterPoints[idx])) + ivarsEqual = false; + } - for(unsigned long long idx=0; idx < _requestedPerimeterPoints.size(); idx++) - { - Point listElement = _requestedPerimeterPoints[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (size_t idx = 0; idx < _sensorTypes.size(); idx++) { + if (!(_sensorTypes[idx] == rhs._sensorTypes[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _sensorTypes.size(); idx++) - { - TwoByteChunk listElement = _sensorTypes[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int MinefieldQueryPdu::getMarshalledSize() const { + int marshalSize = 0; - return marshalSize; + marshalSize = MinefieldFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID + marshalSize = marshalSize + + _requestingEntityID.getMarshalledSize(); // _requestingEntityID + marshalSize = marshalSize + 1; // _requestID + marshalSize = marshalSize + 1; // _numberOfPerimeterPoints + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 1; // _numberOfSensorTypes + marshalSize = marshalSize + 4; // _dataFilter + marshalSize = marshalSize + + _requestedMineType.getMarshalledSize(); // _requestedMineType + + for (unsigned long long idx = 0; idx < _requestedPerimeterPoints.size(); + idx++) { + Point listElement = _requestedPerimeterPoints[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _sensorTypes.size(); idx++) { + TwoByteChunk listElement = _sensorTypes[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -269,7 +220,7 @@ int MinefieldQueryPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldQueryPdu.h b/src/dis6/MinefieldQueryPdu.h index a2938649..1282e17d 100644 --- a/src/dis6/MinefieldQueryPdu.h +++ b/src/dis6/MinefieldQueryPdu.h @@ -1,110 +1,107 @@ #pragma once -#include +#include + #include #include +#include #include #include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.10.2 Query a minefield for information about individual mines. +// Requires manual clean up to get the padding right. UNFINISHED -namespace DIS -{ -// Section 5.3.10.2 Query a minefield for information about individual mines. Requires manual clean up to get the padding right. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldQueryPdu : public MinefieldFamilyPdu -{ -protected: +class OPENDIS6_EXPORT MinefieldQueryPdu : public MinefieldFamilyPdu { + protected: /** Minefield ID */ - EntityID _minefieldID; + EntityID _minefieldID; /** EID of entity making the request */ - EntityID _requestingEntityID; + EntityID _requestingEntityID; /** request ID */ - unsigned char _requestID; + unsigned char _requestID; /** Number of perimeter points for the minefield */ - unsigned char _numberOfPerimeterPoints; + unsigned char _numberOfPerimeterPoints; /** Padding */ - unsigned char _pad2; + unsigned char _pad2; /** Number of sensor types */ - unsigned char _numberOfSensorTypes; + unsigned char _numberOfSensorTypes; /** data filter, 32 boolean fields */ - unsigned int _dataFilter; + unsigned int _dataFilter; /** Entity type of mine being requested */ - EntityType _requestedMineType; + EntityType _requestedMineType; /** perimeter points of request */ - std::vector _requestedPerimeterPoints; + std::vector _requestedPerimeterPoints; /** Sensor types, each 16 bits long */ - std::vector _sensorTypes; - + std::vector _sensorTypes; public: - MinefieldQueryPdu(); - virtual ~MinefieldQueryPdu(); + MinefieldQueryPdu(); + virtual ~MinefieldQueryPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getMinefieldID(); - const EntityID& getMinefieldID() const; - void setMinefieldID(const EntityID &pX); + EntityID& getMinefieldID(); + const EntityID& getMinefieldID() const; + void setMinefieldID(const EntityID& pX); - EntityID& getRequestingEntityID(); - const EntityID& getRequestingEntityID() const; - void setRequestingEntityID(const EntityID &pX); + EntityID& getRequestingEntityID(); + const EntityID& getRequestingEntityID() const; + void setRequestingEntityID(const EntityID& pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + unsigned char getRequestID() const; + void setRequestID(unsigned char pX); - unsigned char getNumberOfPerimeterPoints() const; + unsigned char getNumberOfPerimeterPoints() const; - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned char getNumberOfSensorTypes() const; + unsigned char getNumberOfSensorTypes() const; - unsigned int getDataFilter() const; - void setDataFilter(unsigned int pX); + unsigned int getDataFilter() const; + void setDataFilter(unsigned int pX); - EntityType& getRequestedMineType(); - const EntityType& getRequestedMineType() const; - void setRequestedMineType(const EntityType &pX); + EntityType& getRequestedMineType(); + const EntityType& getRequestedMineType() const; + void setRequestedMineType(const EntityType& pX); - std::vector& getRequestedPerimeterPoints(); - const std::vector& getRequestedPerimeterPoints() const; - void setRequestedPerimeterPoints(const std::vector& pX); + std::vector& getRequestedPerimeterPoints(); + const std::vector& getRequestedPerimeterPoints() const; + void setRequestedPerimeterPoints(const std::vector& pX); - std::vector& getSensorTypes(); - const std::vector& getSensorTypes() const; - void setSensorTypes(const std::vector& pX); + std::vector& getSensorTypes(); + const std::vector& getSensorTypes() const; + void setSensorTypes(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldQueryPdu& rhs) const; + bool operator==(const MinefieldQueryPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -117,7 +114,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldResponseNackPdu.cpp b/src/dis6/MinefieldResponseNackPdu.cpp index ee795694..17a135c9 100644 --- a/src/dis6/MinefieldResponseNackPdu.cpp +++ b/src/dis6/MinefieldResponseNackPdu.cpp @@ -2,158 +2,141 @@ using namespace DIS; - -MinefieldResponseNackPdu::MinefieldResponseNackPdu() : MinefieldFamilyPdu(), - _minefieldID(), - _requestingEntityID(), - _requestID(0), - _numberOfMissingPdus(0) -{ - setPduType( 40 ); +MinefieldResponseNackPdu::MinefieldResponseNackPdu() + : MinefieldFamilyPdu(), + _minefieldID(), + _requestingEntityID(), + _requestID(0), + _numberOfMissingPdus(0) { + setPduType(40); } -MinefieldResponseNackPdu::~MinefieldResponseNackPdu() -{ - _missingPduSequenceNumbers.clear(); +MinefieldResponseNackPdu::~MinefieldResponseNackPdu() { + _missingPduSequenceNumbers.clear(); } -EntityID& MinefieldResponseNackPdu::getMinefieldID() -{ - return _minefieldID; -} +EntityID& MinefieldResponseNackPdu::getMinefieldID() { return _minefieldID; } -const EntityID& MinefieldResponseNackPdu::getMinefieldID() const -{ - return _minefieldID; +const EntityID& MinefieldResponseNackPdu::getMinefieldID() const { + return _minefieldID; } -void MinefieldResponseNackPdu::setMinefieldID(const EntityID &pX) -{ - _minefieldID = pX; +void MinefieldResponseNackPdu::setMinefieldID(const EntityID& pX) { + _minefieldID = pX; } -EntityID& MinefieldResponseNackPdu::getRequestingEntityID() -{ - return _requestingEntityID; +EntityID& MinefieldResponseNackPdu::getRequestingEntityID() { + return _requestingEntityID; } -const EntityID& MinefieldResponseNackPdu::getRequestingEntityID() const -{ - return _requestingEntityID; +const EntityID& MinefieldResponseNackPdu::getRequestingEntityID() const { + return _requestingEntityID; } -void MinefieldResponseNackPdu::setRequestingEntityID(const EntityID &pX) -{ - _requestingEntityID = pX; +void MinefieldResponseNackPdu::setRequestingEntityID(const EntityID& pX) { + _requestingEntityID = pX; } -unsigned char MinefieldResponseNackPdu::getRequestID() const -{ - return _requestID; +unsigned char MinefieldResponseNackPdu::getRequestID() const { + return _requestID; } -void MinefieldResponseNackPdu::setRequestID(unsigned char pX) -{ - _requestID = pX; +void MinefieldResponseNackPdu::setRequestID(unsigned char pX) { + _requestID = pX; } -unsigned char MinefieldResponseNackPdu::getNumberOfMissingPdus() const -{ - return _missingPduSequenceNumbers.size(); +unsigned char MinefieldResponseNackPdu::getNumberOfMissingPdus() const { + return _missingPduSequenceNumbers.size(); } -std::vector& MinefieldResponseNackPdu::getMissingPduSequenceNumbers() -{ - return _missingPduSequenceNumbers; +std::vector& +MinefieldResponseNackPdu::getMissingPduSequenceNumbers() { + return _missingPduSequenceNumbers; } -const std::vector& MinefieldResponseNackPdu::getMissingPduSequenceNumbers() const -{ - return _missingPduSequenceNumbers; +const std::vector& +MinefieldResponseNackPdu::getMissingPduSequenceNumbers() const { + return _missingPduSequenceNumbers; } -void MinefieldResponseNackPdu::setMissingPduSequenceNumbers(const std::vector& pX) -{ - _missingPduSequenceNumbers = pX; +void MinefieldResponseNackPdu::setMissingPduSequenceNumbers( + const std::vector& pX) { + _missingPduSequenceNumbers = pX; } -void MinefieldResponseNackPdu::marshal(DataStream& dataStream) const -{ - MinefieldFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _minefieldID.marshal(dataStream); - _requestingEntityID.marshal(dataStream); - dataStream << _requestID; - dataStream << ( unsigned char )_missingPduSequenceNumbers.size(); - - for(size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) - { - EightByteChunk x = _missingPduSequenceNumbers[idx]; - x.marshal(dataStream); - } +void MinefieldResponseNackPdu::marshal(DataStream& dataStream) const { + MinefieldFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _minefieldID.marshal(dataStream); + _requestingEntityID.marshal(dataStream); + dataStream << _requestID; + dataStream << (unsigned char)_missingPduSequenceNumbers.size(); + for (size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { + EightByteChunk x = _missingPduSequenceNumbers[idx]; + x.marshal(dataStream); + } } -void MinefieldResponseNackPdu::unmarshal(DataStream& dataStream) -{ - MinefieldFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _minefieldID.unmarshal(dataStream); - _requestingEntityID.unmarshal(dataStream); - dataStream >> _requestID; - dataStream >> _numberOfMissingPdus; +void MinefieldResponseNackPdu::unmarshal(DataStream& dataStream) { + MinefieldFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _minefieldID.unmarshal(dataStream); + _requestingEntityID.unmarshal(dataStream); + dataStream >> _requestID; + dataStream >> _numberOfMissingPdus; - _missingPduSequenceNumbers.clear(); - for(size_t idx = 0; idx < _numberOfMissingPdus; idx++) - { - EightByteChunk x; - x.unmarshal(dataStream); - _missingPduSequenceNumbers.push_back(x); - } + _missingPduSequenceNumbers.clear(); + for (size_t idx = 0; idx < _numberOfMissingPdus; idx++) { + EightByteChunk x; + x.unmarshal(dataStream); + _missingPduSequenceNumbers.push_back(x); + } } +bool MinefieldResponseNackPdu::operator==( + const MinefieldResponseNackPdu& rhs) const { + bool ivarsEqual = true; -bool MinefieldResponseNackPdu::operator ==(const MinefieldResponseNackPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = MinefieldFamilyPdu::operator==(rhs); - ivarsEqual = MinefieldFamilyPdu::operator==(rhs); + if (!(_minefieldID == rhs._minefieldID)) ivarsEqual = false; + if (!(_requestingEntityID == rhs._requestingEntityID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_minefieldID == rhs._minefieldID) ) ivarsEqual = false; - if( ! (_requestingEntityID == rhs._requestingEntityID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + for (size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { + if (!(_missingPduSequenceNumbers[idx] == + rhs._missingPduSequenceNumbers[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) - { - if( ! ( _missingPduSequenceNumbers[idx] == rhs._missingPduSequenceNumbers[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int MinefieldResponseNackPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int MinefieldResponseNackPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = MinefieldFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID - marshalSize = marshalSize + _requestingEntityID.getMarshalledSize(); // _requestingEntityID - marshalSize = marshalSize + 1; // _requestID - marshalSize = marshalSize + 1; // _numberOfMissingPdus + marshalSize = MinefieldFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID + marshalSize = marshalSize + + _requestingEntityID.getMarshalledSize(); // _requestingEntityID + marshalSize = marshalSize + 1; // _requestID + marshalSize = marshalSize + 1; // _numberOfMissingPdus - for(unsigned long long idx=0; idx < _missingPduSequenceNumbers.size(); idx++) - { - EightByteChunk listElement = _missingPduSequenceNumbers[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _missingPduSequenceNumbers.size(); + idx++) { + EightByteChunk listElement = _missingPduSequenceNumbers[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -166,7 +149,7 @@ int MinefieldResponseNackPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldResponseNackPdu.h b/src/dis6/MinefieldResponseNackPdu.h index 269030aa..b8536101 100644 --- a/src/dis6/MinefieldResponseNackPdu.h +++ b/src/dis6/MinefieldResponseNackPdu.h @@ -1,77 +1,74 @@ #pragma once -#include -#include -#include #include + +#include +#include #include -#include #include +#include +namespace DIS { +// Section 5.3.10.4 proivde the means to request a retransmit of a minefield +// data pdu. COMPLETE -namespace DIS -{ -// Section 5.3.10.4 proivde the means to request a retransmit of a minefield data pdu. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu -{ -protected: +class OPENDIS6_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu { + protected: /** Minefield ID */ - EntityID _minefieldID; + EntityID _minefieldID; /** entity ID making the request */ - EntityID _requestingEntityID; + EntityID _requestingEntityID; /** request ID */ - unsigned char _requestID; + unsigned char _requestID; /** how many pdus were missing */ - unsigned char _numberOfMissingPdus; + unsigned char _numberOfMissingPdus; /** PDU sequence numbers that were missing */ - std::vector _missingPduSequenceNumbers; - + std::vector _missingPduSequenceNumbers; public: - MinefieldResponseNackPdu(); - virtual ~MinefieldResponseNackPdu(); + MinefieldResponseNackPdu(); + virtual ~MinefieldResponseNackPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getMinefieldID(); - const EntityID& getMinefieldID() const; - void setMinefieldID(const EntityID &pX); + EntityID& getMinefieldID(); + const EntityID& getMinefieldID() const; + void setMinefieldID(const EntityID& pX); - EntityID& getRequestingEntityID(); - const EntityID& getRequestingEntityID() const; - void setRequestingEntityID(const EntityID &pX); + EntityID& getRequestingEntityID(); + const EntityID& getRequestingEntityID() const; + void setRequestingEntityID(const EntityID& pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + unsigned char getRequestID() const; + void setRequestID(unsigned char pX); - unsigned char getNumberOfMissingPdus() const; + unsigned char getNumberOfMissingPdus() const; - std::vector& getMissingPduSequenceNumbers(); - const std::vector& getMissingPduSequenceNumbers() const; - void setMissingPduSequenceNumbers(const std::vector& pX); + std::vector& getMissingPduSequenceNumbers(); + const std::vector& getMissingPduSequenceNumbers() const; + void setMissingPduSequenceNumbers(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldResponseNackPdu& rhs) const; + bool operator==(const MinefieldResponseNackPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -84,7 +81,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldStatePdu.cpp b/src/dis6/MinefieldStatePdu.cpp index e2657f40..10e33a75 100644 --- a/src/dis6/MinefieldStatePdu.cpp +++ b/src/dis6/MinefieldStatePdu.cpp @@ -2,296 +2,241 @@ using namespace DIS; - -MinefieldStatePdu::MinefieldStatePdu() : MinefieldFamilyPdu(), - _minefieldID(), - _minefieldSequence(0), - _forceID(0), - _numberOfPerimeterPoints(0), - _minefieldType(), - _numberOfMineTypes(0), - _minefieldLocation(), - _minefieldOrientation(), - _appearance(0), - _protocolMode(0) -{ - setPduType( 37 ); +MinefieldStatePdu::MinefieldStatePdu() + : MinefieldFamilyPdu(), + _minefieldID(), + _minefieldSequence(0), + _forceID(0), + _numberOfPerimeterPoints(0), + _minefieldType(), + _numberOfMineTypes(0), + _minefieldLocation(), + _minefieldOrientation(), + _appearance(0), + _protocolMode(0) { + setPduType(37); } -MinefieldStatePdu::~MinefieldStatePdu() -{ - _perimeterPoints.clear(); - _mineType.clear(); +MinefieldStatePdu::~MinefieldStatePdu() { + _perimeterPoints.clear(); + _mineType.clear(); } -EntityID& MinefieldStatePdu::getMinefieldID() -{ - return _minefieldID; -} +EntityID& MinefieldStatePdu::getMinefieldID() { return _minefieldID; } -const EntityID& MinefieldStatePdu::getMinefieldID() const -{ - return _minefieldID; +const EntityID& MinefieldStatePdu::getMinefieldID() const { + return _minefieldID; } -void MinefieldStatePdu::setMinefieldID(const EntityID &pX) -{ - _minefieldID = pX; +void MinefieldStatePdu::setMinefieldID(const EntityID& pX) { + _minefieldID = pX; } -unsigned short MinefieldStatePdu::getMinefieldSequence() const -{ - return _minefieldSequence; +unsigned short MinefieldStatePdu::getMinefieldSequence() const { + return _minefieldSequence; } -void MinefieldStatePdu::setMinefieldSequence(unsigned short pX) -{ - _minefieldSequence = pX; +void MinefieldStatePdu::setMinefieldSequence(unsigned short pX) { + _minefieldSequence = pX; } -unsigned char MinefieldStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char MinefieldStatePdu::getForceID() const { return _forceID; } -void MinefieldStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void MinefieldStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char MinefieldStatePdu::getNumberOfPerimeterPoints() const -{ - return _perimeterPoints.size(); +unsigned char MinefieldStatePdu::getNumberOfPerimeterPoints() const { + return _perimeterPoints.size(); } -EntityType& MinefieldStatePdu::getMinefieldType() -{ - return _minefieldType; -} +EntityType& MinefieldStatePdu::getMinefieldType() { return _minefieldType; } -const EntityType& MinefieldStatePdu::getMinefieldType() const -{ - return _minefieldType; +const EntityType& MinefieldStatePdu::getMinefieldType() const { + return _minefieldType; } -void MinefieldStatePdu::setMinefieldType(const EntityType &pX) -{ - _minefieldType = pX; +void MinefieldStatePdu::setMinefieldType(const EntityType& pX) { + _minefieldType = pX; } -unsigned short MinefieldStatePdu::getNumberOfMineTypes() const -{ - return _mineType.size(); +unsigned short MinefieldStatePdu::getNumberOfMineTypes() const { + return _mineType.size(); } -Vector3Double& MinefieldStatePdu::getMinefieldLocation() -{ - return _minefieldLocation; +Vector3Double& MinefieldStatePdu::getMinefieldLocation() { + return _minefieldLocation; } -const Vector3Double& MinefieldStatePdu::getMinefieldLocation() const -{ - return _minefieldLocation; +const Vector3Double& MinefieldStatePdu::getMinefieldLocation() const { + return _minefieldLocation; } -void MinefieldStatePdu::setMinefieldLocation(const Vector3Double &pX) -{ - _minefieldLocation = pX; +void MinefieldStatePdu::setMinefieldLocation(const Vector3Double& pX) { + _minefieldLocation = pX; } -Orientation& MinefieldStatePdu::getMinefieldOrientation() -{ - return _minefieldOrientation; +Orientation& MinefieldStatePdu::getMinefieldOrientation() { + return _minefieldOrientation; } -const Orientation& MinefieldStatePdu::getMinefieldOrientation() const -{ - return _minefieldOrientation; +const Orientation& MinefieldStatePdu::getMinefieldOrientation() const { + return _minefieldOrientation; } -void MinefieldStatePdu::setMinefieldOrientation(const Orientation &pX) -{ - _minefieldOrientation = pX; +void MinefieldStatePdu::setMinefieldOrientation(const Orientation& pX) { + _minefieldOrientation = pX; } -unsigned short MinefieldStatePdu::getAppearance() const -{ - return _appearance; -} +unsigned short MinefieldStatePdu::getAppearance() const { return _appearance; } -void MinefieldStatePdu::setAppearance(unsigned short pX) -{ - _appearance = pX; -} +void MinefieldStatePdu::setAppearance(unsigned short pX) { _appearance = pX; } -unsigned short MinefieldStatePdu::getProtocolMode() const -{ - return _protocolMode; +unsigned short MinefieldStatePdu::getProtocolMode() const { + return _protocolMode; } -void MinefieldStatePdu::setProtocolMode(unsigned short pX) -{ - _protocolMode = pX; +void MinefieldStatePdu::setProtocolMode(unsigned short pX) { + _protocolMode = pX; } -std::vector& MinefieldStatePdu::getPerimeterPoints() -{ - return _perimeterPoints; +std::vector& MinefieldStatePdu::getPerimeterPoints() { + return _perimeterPoints; } -const std::vector& MinefieldStatePdu::getPerimeterPoints() const -{ - return _perimeterPoints; +const std::vector& MinefieldStatePdu::getPerimeterPoints() const { + return _perimeterPoints; } -void MinefieldStatePdu::setPerimeterPoints(const std::vector& pX) -{ - _perimeterPoints = pX; +void MinefieldStatePdu::setPerimeterPoints(const std::vector& pX) { + _perimeterPoints = pX; } -std::vector& MinefieldStatePdu::getMineType() -{ - return _mineType; -} +std::vector& MinefieldStatePdu::getMineType() { return _mineType; } -const std::vector& MinefieldStatePdu::getMineType() const -{ - return _mineType; +const std::vector& MinefieldStatePdu::getMineType() const { + return _mineType; } -void MinefieldStatePdu::setMineType(const std::vector& pX) -{ - _mineType = pX; +void MinefieldStatePdu::setMineType(const std::vector& pX) { + _mineType = pX; } -void MinefieldStatePdu::marshal(DataStream& dataStream) const -{ - MinefieldFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _minefieldID.marshal(dataStream); - dataStream << _minefieldSequence; - dataStream << _forceID; - dataStream << ( unsigned char )_perimeterPoints.size(); - _minefieldType.marshal(dataStream); - dataStream << ( unsigned short )_mineType.size(); - _minefieldLocation.marshal(dataStream); - _minefieldOrientation.marshal(dataStream); - dataStream << _appearance; - dataStream << _protocolMode; - - for(size_t idx = 0; idx < _perimeterPoints.size(); idx++) - { - Point x = _perimeterPoints[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _mineType.size(); idx++) - { - EntityType x = _mineType[idx]; - x.marshal(dataStream); - } +void MinefieldStatePdu::marshal(DataStream& dataStream) const { + MinefieldFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _minefieldID.marshal(dataStream); + dataStream << _minefieldSequence; + dataStream << _forceID; + dataStream << (unsigned char)_perimeterPoints.size(); + _minefieldType.marshal(dataStream); + dataStream << (unsigned short)_mineType.size(); + _minefieldLocation.marshal(dataStream); + _minefieldOrientation.marshal(dataStream); + dataStream << _appearance; + dataStream << _protocolMode; -} + for (size_t idx = 0; idx < _perimeterPoints.size(); idx++) { + Point x = _perimeterPoints[idx]; + x.marshal(dataStream); + } -void MinefieldStatePdu::unmarshal(DataStream& dataStream) -{ - MinefieldFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _minefieldID.unmarshal(dataStream); - dataStream >> _minefieldSequence; - dataStream >> _forceID; - dataStream >> _numberOfPerimeterPoints; - _minefieldType.unmarshal(dataStream); - dataStream >> _numberOfMineTypes; - _minefieldLocation.unmarshal(dataStream); - _minefieldOrientation.unmarshal(dataStream); - dataStream >> _appearance; - dataStream >> _protocolMode; - - _perimeterPoints.clear(); - for(size_t idx = 0; idx < _numberOfPerimeterPoints; idx++) - { - Point x; - x.unmarshal(dataStream); - _perimeterPoints.push_back(x); - } - - _mineType.clear(); - for(size_t idx = 0; idx < _numberOfMineTypes; idx++) - { - EntityType x; - x.unmarshal(dataStream); - _mineType.push_back(x); - } + for (size_t idx = 0; idx < _mineType.size(); idx++) { + EntityType x = _mineType[idx]; + x.marshal(dataStream); + } } +void MinefieldStatePdu::unmarshal(DataStream& dataStream) { + MinefieldFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _minefieldID.unmarshal(dataStream); + dataStream >> _minefieldSequence; + dataStream >> _forceID; + dataStream >> _numberOfPerimeterPoints; + _minefieldType.unmarshal(dataStream); + dataStream >> _numberOfMineTypes; + _minefieldLocation.unmarshal(dataStream); + _minefieldOrientation.unmarshal(dataStream); + dataStream >> _appearance; + dataStream >> _protocolMode; -bool MinefieldStatePdu::operator ==(const MinefieldStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = MinefieldFamilyPdu::operator==(rhs); - - if( ! (_minefieldID == rhs._minefieldID) ) ivarsEqual = false; - if( ! (_minefieldSequence == rhs._minefieldSequence) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_minefieldType == rhs._minefieldType) ) ivarsEqual = false; - if( ! (_minefieldLocation == rhs._minefieldLocation) ) ivarsEqual = false; - if( ! (_minefieldOrientation == rhs._minefieldOrientation) ) ivarsEqual = false; - if( ! (_appearance == rhs._appearance) ) ivarsEqual = false; - if( ! (_protocolMode == rhs._protocolMode) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _perimeterPoints.size(); idx++) - { - if( ! ( _perimeterPoints[idx] == rhs._perimeterPoints[idx]) ) ivarsEqual = false; - } + _perimeterPoints.clear(); + for (size_t idx = 0; idx < _numberOfPerimeterPoints; idx++) { + Point x; + x.unmarshal(dataStream); + _perimeterPoints.push_back(x); + } + _mineType.clear(); + for (size_t idx = 0; idx < _numberOfMineTypes; idx++) { + EntityType x; + x.unmarshal(dataStream); + _mineType.push_back(x); + } +} - for(size_t idx = 0; idx < _mineType.size(); idx++) - { - if( ! ( _mineType[idx] == rhs._mineType[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int MinefieldStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; +bool MinefieldStatePdu::operator==(const MinefieldStatePdu& rhs) const { + bool ivarsEqual = true; - marshalSize = MinefieldFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID - marshalSize = marshalSize + 2; // _minefieldSequence - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _numberOfPerimeterPoints - marshalSize = marshalSize + _minefieldType.getMarshalledSize(); // _minefieldType - marshalSize = marshalSize + 2; // _numberOfMineTypes - marshalSize = marshalSize + _minefieldLocation.getMarshalledSize(); // _minefieldLocation - marshalSize = marshalSize + _minefieldOrientation.getMarshalledSize(); // _minefieldOrientation - marshalSize = marshalSize + 2; // _appearance - marshalSize = marshalSize + 2; // _protocolMode + ivarsEqual = MinefieldFamilyPdu::operator==(rhs); - for(unsigned long long idx=0; idx < _perimeterPoints.size(); idx++) - { - Point listElement = _perimeterPoints[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + if (!(_minefieldID == rhs._minefieldID)) ivarsEqual = false; + if (!(_minefieldSequence == rhs._minefieldSequence)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_minefieldType == rhs._minefieldType)) ivarsEqual = false; + if (!(_minefieldLocation == rhs._minefieldLocation)) ivarsEqual = false; + if (!(_minefieldOrientation == rhs._minefieldOrientation)) ivarsEqual = false; + if (!(_appearance == rhs._appearance)) ivarsEqual = false; + if (!(_protocolMode == rhs._protocolMode)) ivarsEqual = false; + for (size_t idx = 0; idx < _perimeterPoints.size(); idx++) { + if (!(_perimeterPoints[idx] == rhs._perimeterPoints[idx])) + ivarsEqual = false; + } - for(unsigned long long idx=0; idx < _mineType.size(); idx++) - { - EntityType listElement = _mineType[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (size_t idx = 0; idx < _mineType.size(); idx++) { + if (!(_mineType[idx] == rhs._mineType[idx])) ivarsEqual = false; + } - return marshalSize; + return ivarsEqual; +} + +int MinefieldStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = MinefieldFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID + marshalSize = marshalSize + 2; // _minefieldSequence + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _numberOfPerimeterPoints + marshalSize = + marshalSize + _minefieldType.getMarshalledSize(); // _minefieldType + marshalSize = marshalSize + 2; // _numberOfMineTypes + marshalSize = marshalSize + + _minefieldLocation.getMarshalledSize(); // _minefieldLocation + marshalSize = + marshalSize + + _minefieldOrientation.getMarshalledSize(); // _minefieldOrientation + marshalSize = marshalSize + 2; // _appearance + marshalSize = marshalSize + 2; // _protocolMode + + for (unsigned long long idx = 0; idx < _perimeterPoints.size(); idx++) { + Point listElement = _perimeterPoints[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _mineType.size(); idx++) { + EntityType listElement = _mineType[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -304,7 +249,7 @@ int MinefieldStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/MinefieldStatePdu.h b/src/dis6/MinefieldStatePdu.h index 44c0b5f8..10c72984 100644 --- a/src/dis6/MinefieldStatePdu.h +++ b/src/dis6/MinefieldStatePdu.h @@ -1,124 +1,121 @@ #pragma once +#include + #include #include -#include +#include #include #include -#include -#include -#include -#include +#include #include +#include +namespace DIS { +// Section 5.3.10.1 Abstract superclass for PDUs relating to minefields. +// COMPLETE -namespace DIS -{ -// Section 5.3.10.1 Abstract superclass for PDUs relating to minefields. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu -{ -protected: +class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { + protected: /** Minefield ID */ - EntityID _minefieldID; + EntityID _minefieldID; /** Minefield sequence */ - unsigned short _minefieldSequence; + unsigned short _minefieldSequence; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** Number of permieter points */ - unsigned char _numberOfPerimeterPoints; + unsigned char _numberOfPerimeterPoints; /** type of minefield */ - EntityType _minefieldType; + EntityType _minefieldType; /** how many mine types */ - unsigned short _numberOfMineTypes; + unsigned short _numberOfMineTypes; /** location of minefield in world coords */ - Vector3Double _minefieldLocation; + Vector3Double _minefieldLocation; /** orientation of minefield */ - Orientation _minefieldOrientation; + Orientation _minefieldOrientation; /** appearance bitflags */ - unsigned short _appearance; + unsigned short _appearance; /** protocolMode */ - unsigned short _protocolMode; + unsigned short _protocolMode; /** perimeter points for the minefield */ - std::vector _perimeterPoints; + std::vector _perimeterPoints; /** Type of mines */ - std::vector _mineType; - + std::vector _mineType; public: - MinefieldStatePdu(); - virtual ~MinefieldStatePdu(); + MinefieldStatePdu(); + virtual ~MinefieldStatePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getMinefieldID(); - const EntityID& getMinefieldID() const; - void setMinefieldID(const EntityID &pX); + EntityID& getMinefieldID(); + const EntityID& getMinefieldID() const; + void setMinefieldID(const EntityID& pX); - unsigned short getMinefieldSequence() const; - void setMinefieldSequence(unsigned short pX); + unsigned short getMinefieldSequence() const; + void setMinefieldSequence(unsigned short pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned char getForceID() const; + void setForceID(unsigned char pX); - unsigned char getNumberOfPerimeterPoints() const; + unsigned char getNumberOfPerimeterPoints() const; - EntityType& getMinefieldType(); - const EntityType& getMinefieldType() const; - void setMinefieldType(const EntityType &pX); + EntityType& getMinefieldType(); + const EntityType& getMinefieldType() const; + void setMinefieldType(const EntityType& pX); - unsigned short getNumberOfMineTypes() const; + unsigned short getNumberOfMineTypes() const; - Vector3Double& getMinefieldLocation(); - const Vector3Double& getMinefieldLocation() const; - void setMinefieldLocation(const Vector3Double &pX); + Vector3Double& getMinefieldLocation(); + const Vector3Double& getMinefieldLocation() const; + void setMinefieldLocation(const Vector3Double& pX); - Orientation& getMinefieldOrientation(); - const Orientation& getMinefieldOrientation() const; - void setMinefieldOrientation(const Orientation &pX); + Orientation& getMinefieldOrientation(); + const Orientation& getMinefieldOrientation() const; + void setMinefieldOrientation(const Orientation& pX); - unsigned short getAppearance() const; - void setAppearance(unsigned short pX); + unsigned short getAppearance() const; + void setAppearance(unsigned short pX); - unsigned short getProtocolMode() const; - void setProtocolMode(unsigned short pX); + unsigned short getProtocolMode() const; + void setProtocolMode(unsigned short pX); - std::vector& getPerimeterPoints(); - const std::vector& getPerimeterPoints() const; - void setPerimeterPoints(const std::vector& pX); + std::vector& getPerimeterPoints(); + const std::vector& getPerimeterPoints() const; + void setPerimeterPoints(const std::vector& pX); - std::vector& getMineType(); - const std::vector& getMineType() const; - void setMineType(const std::vector& pX); + std::vector& getMineType(); + const std::vector& getMineType() const; + void setMineType(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldStatePdu& rhs) const; + bool operator==(const MinefieldStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -131,7 +128,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ModulationType.cpp b/src/dis6/ModulationType.cpp index d87268c7..8dd86e7d 100644 --- a/src/dis6/ModulationType.cpp +++ b/src/dis6/ModulationType.cpp @@ -2,104 +2,71 @@ using namespace DIS; +ModulationType::ModulationType() + : _spreadSpectrum(0), _major(0), _detail(0), _system(0) {} -ModulationType::ModulationType(): - _spreadSpectrum(0), - _major(0), - _detail(0), - _system(0) -{ -} +ModulationType::~ModulationType() {} -ModulationType::~ModulationType() -{ +unsigned short ModulationType::getSpreadSpectrum() const { + return _spreadSpectrum; } -unsigned short ModulationType::getSpreadSpectrum() const -{ - return _spreadSpectrum; +void ModulationType::setSpreadSpectrum(unsigned short pX) { + _spreadSpectrum = pX; } -void ModulationType::setSpreadSpectrum(unsigned short pX) -{ - _spreadSpectrum = pX; -} +unsigned short ModulationType::getMajor() const { return _major; } -unsigned short ModulationType::getMajor() const -{ - return _major; -} +void ModulationType::setMajor(unsigned short pX) { _major = pX; } -void ModulationType::setMajor(unsigned short pX) -{ - _major = pX; -} +unsigned short ModulationType::getDetail() const { return _detail; } -unsigned short ModulationType::getDetail() const -{ - return _detail; -} +void ModulationType::setDetail(unsigned short pX) { _detail = pX; } -void ModulationType::setDetail(unsigned short pX) -{ - _detail = pX; -} +unsigned short ModulationType::getSystem() const { return _system; } -unsigned short ModulationType::getSystem() const -{ - return _system; -} - -void ModulationType::setSystem(unsigned short pX) -{ - _system = pX; -} +void ModulationType::setSystem(unsigned short pX) { _system = pX; } -void ModulationType::marshal(DataStream& dataStream) const -{ - dataStream << _spreadSpectrum; - dataStream << _major; - dataStream << _detail; - dataStream << _system; +void ModulationType::marshal(DataStream& dataStream) const { + dataStream << _spreadSpectrum; + dataStream << _major; + dataStream << _detail; + dataStream << _system; } -void ModulationType::unmarshal(DataStream& dataStream) -{ - dataStream >> _spreadSpectrum; - dataStream >> _major; - dataStream >> _detail; - dataStream >> _system; +void ModulationType::unmarshal(DataStream& dataStream) { + dataStream >> _spreadSpectrum; + dataStream >> _major; + dataStream >> _detail; + dataStream >> _system; } +bool ModulationType::operator==(const ModulationType& rhs) const { + bool ivarsEqual = true; -bool ModulationType::operator ==(const ModulationType& rhs) const - { - bool ivarsEqual = true; + if (!(_spreadSpectrum == rhs._spreadSpectrum)) ivarsEqual = false; + if (!(_major == rhs._major)) ivarsEqual = false; + if (!(_detail == rhs._detail)) ivarsEqual = false; + if (!(_system == rhs._system)) ivarsEqual = false; - if( ! (_spreadSpectrum == rhs._spreadSpectrum) ) ivarsEqual = false; - if( ! (_major == rhs._major) ) ivarsEqual = false; - if( ! (_detail == rhs._detail) ) ivarsEqual = false; - if( ! (_system == rhs._system) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ModulationType::getMarshalledSize() const -{ - int marshalSize = 0; +int ModulationType::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _spreadSpectrum - marshalSize = marshalSize + 2; // _major - marshalSize = marshalSize + 2; // _detail - marshalSize = marshalSize + 2; // _system - return marshalSize; + marshalSize = marshalSize + 2; // _spreadSpectrum + marshalSize = marshalSize + 2; // _major + marshalSize = marshalSize + 2; // _detail + marshalSize = marshalSize + 2; // _system + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +79,7 @@ int ModulationType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ModulationType.h b/src/dis6/ModulationType.h index 18e081fe..19d966ef 100644 --- a/src/dis6/ModulationType.h +++ b/src/dis6/ModulationType.h @@ -1,64 +1,60 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Radio modulation -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ModulationType -{ -protected: +class OPENDIS6_EXPORT ModulationType { + protected: /** spread spectrum, 16 bit boolean array */ - unsigned short _spreadSpectrum; + unsigned short _spreadSpectrum; /** major */ - unsigned short _major; + unsigned short _major; /** detail */ - unsigned short _detail; + unsigned short _detail; /** system */ - unsigned short _system; - + unsigned short _system; public: - ModulationType(); - virtual ~ModulationType(); + ModulationType(); + virtual ~ModulationType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSpreadSpectrum() const; - void setSpreadSpectrum(unsigned short pX); + unsigned short getSpreadSpectrum() const; + void setSpreadSpectrum(unsigned short pX); - unsigned short getMajor() const; - void setMajor(unsigned short pX); + unsigned short getMajor() const; + void setMajor(unsigned short pX); - unsigned short getDetail() const; - void setDetail(unsigned short pX); + unsigned short getDetail() const; + void setDetail(unsigned short pX); - unsigned short getSystem() const; - void setSystem(unsigned short pX); + unsigned short getSystem() const; + void setSystem(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ModulationType& rhs) const; + bool operator==(const ModulationType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +67,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/NamedLocation.cpp b/src/dis6/NamedLocation.cpp index d303222a..5d1e157d 100644 --- a/src/dis6/NamedLocation.cpp +++ b/src/dis6/NamedLocation.cpp @@ -2,74 +2,52 @@ using namespace DIS; +NamedLocation::NamedLocation() : _stationName(0), _stationNumber(0) {} -NamedLocation::NamedLocation(): - _stationName(0), - _stationNumber(0) -{ -} - -NamedLocation::~NamedLocation() -{ -} +NamedLocation::~NamedLocation() {} -unsigned short NamedLocation::getStationName() const -{ - return _stationName; -} +unsigned short NamedLocation::getStationName() const { return _stationName; } -void NamedLocation::setStationName(unsigned short pX) -{ - _stationName = pX; -} +void NamedLocation::setStationName(unsigned short pX) { _stationName = pX; } -unsigned short NamedLocation::getStationNumber() const -{ - return _stationNumber; +unsigned short NamedLocation::getStationNumber() const { + return _stationNumber; } -void NamedLocation::setStationNumber(unsigned short pX) -{ - _stationNumber = pX; -} +void NamedLocation::setStationNumber(unsigned short pX) { _stationNumber = pX; } -void NamedLocation::marshal(DataStream& dataStream) const -{ - dataStream << _stationName; - dataStream << _stationNumber; +void NamedLocation::marshal(DataStream& dataStream) const { + dataStream << _stationName; + dataStream << _stationNumber; } -void NamedLocation::unmarshal(DataStream& dataStream) -{ - dataStream >> _stationName; - dataStream >> _stationNumber; +void NamedLocation::unmarshal(DataStream& dataStream) { + dataStream >> _stationName; + dataStream >> _stationNumber; } +bool NamedLocation::operator==(const NamedLocation& rhs) const { + bool ivarsEqual = true; -bool NamedLocation::operator ==(const NamedLocation& rhs) const - { - bool ivarsEqual = true; + if (!(_stationName == rhs._stationName)) ivarsEqual = false; + if (!(_stationNumber == rhs._stationNumber)) ivarsEqual = false; - if( ! (_stationName == rhs._stationName) ) ivarsEqual = false; - if( ! (_stationNumber == rhs._stationNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int NamedLocation::getMarshalledSize() const -{ - int marshalSize = 0; +int NamedLocation::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _stationName - marshalSize = marshalSize + 2; // _stationNumber - return marshalSize; + marshalSize = marshalSize + 2; // _stationName + marshalSize = marshalSize + 2; // _stationNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +60,7 @@ int NamedLocation::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/NamedLocation.h b/src/dis6/NamedLocation.h index c8351d0f..edf9f0ac 100644 --- a/src/dis6/NamedLocation.h +++ b/src/dis6/NamedLocation.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include +namespace DIS { +// discrete ostional relationsihip -namespace DIS -{ -// discrete ostional relationsihip - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT NamedLocation -{ -protected: +class OPENDIS6_EXPORT NamedLocation { + protected: /** station name enumeration */ - unsigned short _stationName; + unsigned short _stationName; /** station number */ - unsigned short _stationNumber; - + unsigned short _stationNumber; public: - NamedLocation(); - virtual ~NamedLocation(); + NamedLocation(); + virtual ~NamedLocation(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getStationName() const; - void setStationName(unsigned short pX); + unsigned short getStationName() const; + void setStationName(unsigned short pX); - unsigned short getStationNumber() const; - void setStationNumber(unsigned short pX); + unsigned short getStationNumber() const; + void setStationNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const NamedLocation& rhs) const; + bool operator==(const NamedLocation& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ObjectType.cpp b/src/dis6/ObjectType.cpp index 91965dbb..f24df752 100644 --- a/src/dis6/ObjectType.cpp +++ b/src/dis6/ObjectType.cpp @@ -2,119 +2,75 @@ using namespace DIS; +ObjectType::ObjectType() + : _entityKind(0), _domain(0), _country(0), _category(0), _subcategory(0) {} -ObjectType::ObjectType(): - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0) -{ -} +ObjectType::~ObjectType() {} -ObjectType::~ObjectType() -{ -} +unsigned char ObjectType::getEntityKind() const { return _entityKind; } -unsigned char ObjectType::getEntityKind() const -{ - return _entityKind; -} +void ObjectType::setEntityKind(unsigned char pX) { _entityKind = pX; } -void ObjectType::setEntityKind(unsigned char pX) -{ - _entityKind = pX; -} +unsigned char ObjectType::getDomain() const { return _domain; } -unsigned char ObjectType::getDomain() const -{ - return _domain; -} +void ObjectType::setDomain(unsigned char pX) { _domain = pX; } -void ObjectType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned short ObjectType::getCountry() const { return _country; } -unsigned short ObjectType::getCountry() const -{ - return _country; -} +void ObjectType::setCountry(unsigned short pX) { _country = pX; } -void ObjectType::setCountry(unsigned short pX) -{ - _country = pX; -} +unsigned char ObjectType::getCategory() const { return _category; } -unsigned char ObjectType::getCategory() const -{ - return _category; -} +void ObjectType::setCategory(unsigned char pX) { _category = pX; } -void ObjectType::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char ObjectType::getSubcategory() const { return _subcategory; } -unsigned char ObjectType::getSubcategory() const -{ - return _subcategory; -} +void ObjectType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void ObjectType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; +void ObjectType::marshal(DataStream& dataStream) const { + dataStream << _entityKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; } -void ObjectType::marshal(DataStream& dataStream) const -{ - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; +void ObjectType::unmarshal(DataStream& dataStream) { + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; } -void ObjectType::unmarshal(DataStream& dataStream) -{ - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; -} +bool ObjectType::operator==(const ObjectType& rhs) const { + bool ivarsEqual = true; + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; -bool ObjectType::operator ==(const ObjectType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ObjectType::getMarshalledSize() const -{ - int marshalSize = 0; +int ObjectType::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - return marshalSize; + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +83,7 @@ int ObjectType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ObjectType.h b/src/dis6/ObjectType.h index 52e26b15..0f1c1fba 100644 --- a/src/dis6/ObjectType.h +++ b/src/dis6/ObjectType.h @@ -1,70 +1,67 @@ #pragma once -#include #include +#include +namespace DIS { +// Identifies type of object. This is a shorter version of EntityType that omits +// the specific and extra fields. -namespace DIS -{ -// Identifies type of object. This is a shorter version of EntityType that omits the specific and extra fields. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ObjectType -{ -protected: +class OPENDIS6_EXPORT ObjectType { + protected: /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; - + unsigned char _subcategory; public: - ObjectType(); - virtual ~ObjectType(); + ObjectType(); + virtual ~ObjectType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ObjectType& rhs) const; + bool operator==(const ObjectType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +74,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Orientation.cpp b/src/dis6/Orientation.cpp index 1269627e..483ab88d 100644 --- a/src/dis6/Orientation.cpp +++ b/src/dis6/Orientation.cpp @@ -2,89 +2,58 @@ using namespace DIS; +Orientation::Orientation() : _psi(0.0), _theta(0.0), _phi(0.0) {} -Orientation::Orientation(): - _psi(0.0), - _theta(0.0), - _phi(0.0) -{ -} +Orientation::~Orientation() {} -Orientation::~Orientation() -{ -} +float Orientation::getPsi() const { return _psi; } -float Orientation::getPsi() const -{ - return _psi; -} +void Orientation::setPsi(float pX) { _psi = pX; } -void Orientation::setPsi(float pX) -{ - _psi = pX; -} +float Orientation::getTheta() const { return _theta; } -float Orientation::getTheta() const -{ - return _theta; -} +void Orientation::setTheta(float pX) { _theta = pX; } -void Orientation::setTheta(float pX) -{ - _theta = pX; -} +float Orientation::getPhi() const { return _phi; } -float Orientation::getPhi() const -{ - return _phi; -} - -void Orientation::setPhi(float pX) -{ - _phi = pX; -} +void Orientation::setPhi(float pX) { _phi = pX; } -void Orientation::marshal(DataStream& dataStream) const -{ - dataStream << _psi; - dataStream << _theta; - dataStream << _phi; +void Orientation::marshal(DataStream& dataStream) const { + dataStream << _psi; + dataStream << _theta; + dataStream << _phi; } -void Orientation::unmarshal(DataStream& dataStream) -{ - dataStream >> _psi; - dataStream >> _theta; - dataStream >> _phi; +void Orientation::unmarshal(DataStream& dataStream) { + dataStream >> _psi; + dataStream >> _theta; + dataStream >> _phi; } +bool Orientation::operator==(const Orientation& rhs) const { + bool ivarsEqual = true; -bool Orientation::operator ==(const Orientation& rhs) const - { - bool ivarsEqual = true; + if (!(_psi == rhs._psi)) ivarsEqual = false; + if (!(_theta == rhs._theta)) ivarsEqual = false; + if (!(_phi == rhs._phi)) ivarsEqual = false; - if( ! (_psi == rhs._psi) ) ivarsEqual = false; - if( ! (_theta == rhs._theta) ) ivarsEqual = false; - if( ! (_phi == rhs._phi) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Orientation::getMarshalledSize() const -{ - int marshalSize = 0; +int Orientation::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _psi - marshalSize = marshalSize + 4; // _theta - marshalSize = marshalSize + 4; // _phi - return marshalSize; + marshalSize = marshalSize + 4; // _psi + marshalSize = marshalSize + 4; // _theta + marshalSize = marshalSize + 4; // _phi + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int Orientation::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Orientation.h b/src/dis6/Orientation.h index de1776c5..a7738cbe 100644 --- a/src/dis6/Orientation.h +++ b/src/dis6/Orientation.h @@ -1,55 +1,52 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.17. Three floating point values representing an orientation, psi, +// theta, and phi, aka the euler angles, in radians -namespace DIS -{ -// Section 5.2.17. Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Orientation -{ -protected: - float _psi; - - float _theta; +class OPENDIS6_EXPORT Orientation { + protected: + float _psi; - float _phi; + float _theta; + float _phi; public: - Orientation(); - virtual ~Orientation(); + Orientation(); + virtual ~Orientation(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getPsi() const; - void setPsi(float pX); + float getPsi() const; + void setPsi(float pX); - float getTheta() const; - void setTheta(float pX); + float getTheta() const; + void setTheta(float pX); - float getPhi() const; - void setPhi(float pX); + float getPhi() const; + void setPhi(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Orientation& rhs) const; + bool operator==(const Orientation& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -62,7 +59,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Pdu.cpp b/src/dis6/Pdu.cpp index 2405f885..f691c5ec 100644 --- a/src/dis6/Pdu.cpp +++ b/src/dis6/Pdu.cpp @@ -2,149 +2,97 @@ using namespace DIS; +Pdu::Pdu() + : _protocolVersion(6), + _exerciseID(0), + _pduType(0), + _protocolFamily(0), + _timestamp(0), + _length(0), + _padding(0) {} -Pdu::Pdu(): - _protocolVersion(6), - _exerciseID(0), - _pduType(0), - _protocolFamily(0), - _timestamp(0), - _length(0), - _padding(0) -{ -} +Pdu::~Pdu() {} -Pdu::~Pdu() -{ -} +unsigned char Pdu::getProtocolVersion() const { return _protocolVersion; } -unsigned char Pdu::getProtocolVersion() const -{ - return _protocolVersion; -} +void Pdu::setProtocolVersion(unsigned char pX) { _protocolVersion = pX; } -void Pdu::setProtocolVersion(unsigned char pX) -{ - _protocolVersion = pX; -} +unsigned char Pdu::getExerciseID() const { return _exerciseID; } -unsigned char Pdu::getExerciseID() const -{ - return _exerciseID; -} +void Pdu::setExerciseID(unsigned char pX) { _exerciseID = pX; } -void Pdu::setExerciseID(unsigned char pX) -{ - _exerciseID = pX; -} +unsigned char Pdu::getPduType() const { return _pduType; } -unsigned char Pdu::getPduType() const -{ - return _pduType; -} +void Pdu::setPduType(unsigned char pX) { _pduType = pX; } -void Pdu::setPduType(unsigned char pX) -{ - _pduType = pX; -} +unsigned char Pdu::getProtocolFamily() const { return _protocolFamily; } -unsigned char Pdu::getProtocolFamily() const -{ - return _protocolFamily; -} +void Pdu::setProtocolFamily(unsigned char pX) { _protocolFamily = pX; } -void Pdu::setProtocolFamily(unsigned char pX) -{ - _protocolFamily = pX; -} +unsigned int Pdu::getTimestamp() const { return _timestamp; } -unsigned int Pdu::getTimestamp() const -{ - return _timestamp; -} +void Pdu::setTimestamp(unsigned int pX) { _timestamp = pX; } -void Pdu::setTimestamp(unsigned int pX) -{ - _timestamp = pX; -} +unsigned short Pdu::getLength() const { return this->getMarshalledSize(); } -unsigned short Pdu::getLength() const -{ - return this->getMarshalledSize(); -} +void Pdu::setLength(unsigned short pX) { _length = pX; } -void Pdu::setLength(unsigned short pX) -{ - _length = pX; -} +short Pdu::getPadding() const { return _padding; } -short Pdu::getPadding() const -{ - return _padding; -} +void Pdu::setPadding(short pX) { _padding = pX; } -void Pdu::setPadding(short pX) -{ - _padding = pX; +void Pdu::marshal(DataStream& dataStream) const { + dataStream << _protocolVersion; + dataStream << _exerciseID; + dataStream << _pduType; + dataStream << _protocolFamily; + dataStream << _timestamp; + dataStream << this->getLength(); + dataStream << _padding; } -void Pdu::marshal(DataStream& dataStream) const -{ - dataStream << _protocolVersion; - dataStream << _exerciseID; - dataStream << _pduType; - dataStream << _protocolFamily; - dataStream << _timestamp; - dataStream << this->getLength(); - dataStream << _padding; +void Pdu::unmarshal(DataStream& dataStream) { + dataStream >> _protocolVersion; + dataStream >> _exerciseID; + dataStream >> _pduType; + dataStream >> _protocolFamily; + dataStream >> _timestamp; + dataStream >> _length; + dataStream >> _padding; } -void Pdu::unmarshal(DataStream& dataStream) -{ - dataStream >> _protocolVersion; - dataStream >> _exerciseID; - dataStream >> _pduType; - dataStream >> _protocolFamily; - dataStream >> _timestamp; - dataStream >> _length; - dataStream >> _padding; +bool Pdu::operator==(const Pdu& rhs) const { + bool ivarsEqual = true; + + if (!(_protocolVersion == rhs._protocolVersion)) ivarsEqual = false; + if (!(_exerciseID == rhs._exerciseID)) ivarsEqual = false; + if (!(_pduType == rhs._pduType)) ivarsEqual = false; + if (!(_protocolFamily == rhs._protocolFamily)) ivarsEqual = false; + if (!(_timestamp == rhs._timestamp)) ivarsEqual = false; + if (!(_length == rhs._length)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + + return ivarsEqual; } +int Pdu::getMarshalledSize() const { + int marshalSize = 0; -bool Pdu::operator ==(const Pdu& rhs) const - { - bool ivarsEqual = true; - - if( ! (_protocolVersion == rhs._protocolVersion) ) ivarsEqual = false; - if( ! (_exerciseID == rhs._exerciseID) ) ivarsEqual = false; - if( ! (_pduType == rhs._pduType) ) ivarsEqual = false; - if( ! (_protocolFamily == rhs._protocolFamily) ) ivarsEqual = false; - if( ! (_timestamp == rhs._timestamp) ) ivarsEqual = false; - if( ! (_length == rhs._length) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } - -int Pdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _protocolVersion - marshalSize = marshalSize + 1; // _exerciseID - marshalSize = marshalSize + 1; // _pduType - marshalSize = marshalSize + 1; // _protocolFamily - marshalSize = marshalSize + 4; // _timestamp - marshalSize = marshalSize + 2; // _length - marshalSize = marshalSize + 2; // _padding - return marshalSize; + marshalSize = marshalSize + 1; // _protocolVersion + marshalSize = marshalSize + 1; // _exerciseID + marshalSize = marshalSize + 1; // _pduType + marshalSize = marshalSize + 1; // _protocolFamily + marshalSize = marshalSize + 4; // _timestamp + marshalSize = marshalSize + 2; // _length + marshalSize = marshalSize + 2; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +105,7 @@ int Pdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Pdu.h b/src/dis6/Pdu.h index dcbb7272..84a281c6 100644 --- a/src/dis6/Pdu.h +++ b/src/dis6/Pdu.h @@ -1,82 +1,79 @@ #pragma once -#include #include +#include +namespace DIS { +// The superclass for all PDUs. This incorporates the PduHeader record, +// section 5.2.29. -namespace DIS -{ -// The superclass for all PDUs. This incorporates the PduHeader record, section 5.2.29. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Pdu -{ -protected: +class OPENDIS6_EXPORT Pdu { + protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998. */ - unsigned char _protocolVersion; + unsigned char _protocolVersion; /** Exercise ID */ - unsigned char _exerciseID; + unsigned char _exerciseID; /** Type of pdu, unique for each PDU class */ - unsigned char _pduType; + unsigned char _pduType; /** value that refers to the protocol family, eg SimulationManagement, et */ - unsigned char _protocolFamily; + unsigned char _protocolFamily; /** Timestamp value */ - unsigned int _timestamp; + unsigned int _timestamp; /** Length, in bytes, of the PDU */ - unsigned short _length; + unsigned short _length; /** zero-filled array of padding */ - short _padding; - + short _padding; public: - Pdu(); - virtual ~Pdu(); + Pdu(); + virtual ~Pdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getProtocolVersion() const; - void setProtocolVersion(unsigned char pX); + unsigned char getProtocolVersion() const; + void setProtocolVersion(unsigned char pX); - unsigned char getExerciseID() const; - void setExerciseID(unsigned char pX); + unsigned char getExerciseID() const; + void setExerciseID(unsigned char pX); - unsigned char getPduType() const; - void setPduType(unsigned char pX); + unsigned char getPduType() const; + void setPduType(unsigned char pX); - unsigned char getProtocolFamily() const; - void setProtocolFamily(unsigned char pX); + unsigned char getProtocolFamily() const; + void setProtocolFamily(unsigned char pX); - unsigned int getTimestamp() const; - void setTimestamp(unsigned int pX); + unsigned int getTimestamp() const; + void setTimestamp(unsigned int pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + unsigned short getLength() const; + void setLength(unsigned short pX); - short getPadding() const; - void setPadding(short pX); + short getPadding() const; + void setPadding(short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Pdu& rhs) const; + bool operator==(const Pdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/PduContainer.cpp b/src/dis6/PduContainer.cpp index 781c525e..c10a6c5f 100644 --- a/src/dis6/PduContainer.cpp +++ b/src/dis6/PduContainer.cpp @@ -2,97 +2,66 @@ using namespace DIS; +PduContainer::PduContainer() : _numberOfPdus(0) {} -PduContainer::PduContainer(): - _numberOfPdus(0) -{ -} +PduContainer::~PduContainer() { _pdus.clear(); } -PduContainer::~PduContainer() -{ - _pdus.clear(); -} +int PduContainer::getNumberOfPdus() const { return _pdus.size(); } -int PduContainer::getNumberOfPdus() const -{ - return _pdus.size(); -} +std::vector& PduContainer::getPdus() { return _pdus; } -std::vector& PduContainer::getPdus() -{ - return _pdus; -} +const std::vector& PduContainer::getPdus() const { return _pdus; } -const std::vector& PduContainer::getPdus() const -{ - return _pdus; -} - -void PduContainer::setPdus(const std::vector& pX) -{ - _pdus = pX; -} +void PduContainer::setPdus(const std::vector& pX) { _pdus = pX; } -void PduContainer::marshal(DataStream& dataStream) const -{ - dataStream << ( int )_pdus.size(); +void PduContainer::marshal(DataStream& dataStream) const { + dataStream << (int)_pdus.size(); - for(size_t idx = 0; idx < _pdus.size(); idx++) - { - Pdu x = _pdus[idx]; - x.marshal(dataStream); - } - -} - -void PduContainer::unmarshal(DataStream& dataStream) -{ - dataStream >> _numberOfPdus; - - _pdus.clear(); - for(int idx = 0; idx < _numberOfPdus; idx++) - { - Pdu x; - x.unmarshal(dataStream); - _pdus.push_back(x); - } + for (size_t idx = 0; idx < _pdus.size(); idx++) { + Pdu x = _pdus[idx]; + x.marshal(dataStream); + } } +void PduContainer::unmarshal(DataStream& dataStream) { + dataStream >> _numberOfPdus; -bool PduContainer::operator ==(const PduContainer& rhs) const - { - bool ivarsEqual = true; - + _pdus.clear(); + for (int idx = 0; idx < _numberOfPdus; idx++) { + Pdu x; + x.unmarshal(dataStream); + _pdus.push_back(x); + } +} - for(size_t idx = 0; idx < _pdus.size(); idx++) - { - if( ! ( _pdus[idx] == rhs._pdus[idx]) ) ivarsEqual = false; - } +bool PduContainer::operator==(const PduContainer& rhs) const { + bool ivarsEqual = true; + for (size_t idx = 0; idx < _pdus.size(); idx++) { + if (!(_pdus[idx] == rhs._pdus[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int PduContainer::getMarshalledSize() const -{ - int marshalSize = 0; +int PduContainer::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _numberOfPdus + marshalSize = marshalSize + 4; // _numberOfPdus - for(unsigned long long idx=0; idx < _pdus.size(); idx++) - { - Pdu listElement = _pdus[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _pdus.size(); idx++) { + Pdu listElement = _pdus[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +74,7 @@ int PduContainer::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/PduContainer.h b/src/dis6/PduContainer.h index 6c8df6fa..b176f85f 100644 --- a/src/dis6/PduContainer.h +++ b/src/dis6/PduContainer.h @@ -1,54 +1,51 @@ #pragma once -#include #include -#include -#include +#include +#include +#include -namespace DIS -{ +namespace DIS { // Used for XML compatability. A container that holds PDUs -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT PduContainer -{ -protected: +class OPENDIS6_EXPORT PduContainer { + protected: /** Number of PDUs in the container list */ - int _numberOfPdus; + int _numberOfPdus; /** record sets */ - std::vector _pdus; - + std::vector _pdus; public: - PduContainer(); - virtual ~PduContainer(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + PduContainer(); + virtual ~PduContainer(); - int getNumberOfPdus() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - std::vector& getPdus(); - const std::vector& getPdus() const; - void setPdus(const std::vector& pX); + int getNumberOfPdus() const; + std::vector& getPdus(); + const std::vector& getPdus() const; + void setPdus(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const PduContainer& rhs) const; + bool operator==(const PduContainer& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Point.cpp b/src/dis6/Point.cpp index aa7fad08..8b617796 100644 --- a/src/dis6/Point.cpp +++ b/src/dis6/Point.cpp @@ -2,74 +2,50 @@ using namespace DIS; +Point::Point() : _x(0.0), _y(0.0) {} -Point::Point(): - _x(0.0), - _y(0.0) -{ -} +Point::~Point() {} -Point::~Point() -{ -} +float Point::getX() const { return _x; } -float Point::getX() const -{ - return _x; -} +void Point::setX(float pX) { _x = pX; } -void Point::setX(float pX) -{ - _x = pX; -} +float Point::getY() const { return _y; } -float Point::getY() const -{ - return _y; -} +void Point::setY(float pX) { _y = pX; } -void Point::setY(float pX) -{ - _y = pX; +void Point::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; } -void Point::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; -} - -void Point::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; +void Point::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; } +bool Point::operator==(const Point& rhs) const { + bool ivarsEqual = true; -bool Point::operator ==(const Point& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Point::getMarshalledSize() const -{ - int marshalSize = 0; +int Point::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - return marshalSize; + marshalSize = marshalSize + 4; // _x + marshalSize = marshalSize + 4; // _y + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int Point::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Point.h b/src/dis6/Point.h index f6a19225..2cd8a1d0 100644 --- a/src/dis6/Point.h +++ b/src/dis6/Point.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // x,y point -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Point -{ -protected: +class OPENDIS6_EXPORT Point { + protected: /** x */ - float _x; + float _x; /** y */ - float _y; - + float _y; public: - Point(); - virtual ~Point(); + Point(); + virtual ~Point(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getX() const; - void setX(float pX); + float getX() const; + void setX(float pX); - float getY() const; - void setY(float pX); + float getY() const; + void setY(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Point& rhs) const; + bool operator==(const Point& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/PointObjectStatePdu.cpp b/src/dis6/PointObjectStatePdu.cpp index 7c2e4804..5566a720 100644 --- a/src/dis6/PointObjectStatePdu.cpp +++ b/src/dis6/PointObjectStatePdu.cpp @@ -2,265 +2,215 @@ using namespace DIS; - -PointObjectStatePdu::PointObjectStatePdu() : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), - _forceID(0), - _modifications(0), - _objectType(), - _objectLocation(), - _objectOrientation(), - _objectAppearance(0.0), - _requesterID(), - _receivingID(), - _pad2(0) -{ - setPduType( 43 ); +PointObjectStatePdu::PointObjectStatePdu() + : SyntheticEnvironmentFamilyPdu(), + _objectID(), + _referencedObjectID(), + _updateNumber(0), + _forceID(0), + _modifications(0), + _objectType(), + _objectLocation(), + _objectOrientation(), + _objectAppearance(0.0), + _requesterID(), + _receivingID(), + _pad2(0) { + setPduType(43); } -PointObjectStatePdu::~PointObjectStatePdu() -{ -} +PointObjectStatePdu::~PointObjectStatePdu() {} -EntityID& PointObjectStatePdu::getObjectID() -{ - return _objectID; -} +EntityID& PointObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& PointObjectStatePdu::getObjectID() const -{ - return _objectID; -} +const EntityID& PointObjectStatePdu::getObjectID() const { return _objectID; } -void PointObjectStatePdu::setObjectID(const EntityID &pX) -{ - _objectID = pX; -} +void PointObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } -EntityID& PointObjectStatePdu::getReferencedObjectID() -{ - return _referencedObjectID; +EntityID& PointObjectStatePdu::getReferencedObjectID() { + return _referencedObjectID; } -const EntityID& PointObjectStatePdu::getReferencedObjectID() const -{ - return _referencedObjectID; +const EntityID& PointObjectStatePdu::getReferencedObjectID() const { + return _referencedObjectID; } -void PointObjectStatePdu::setReferencedObjectID(const EntityID &pX) -{ - _referencedObjectID = pX; +void PointObjectStatePdu::setReferencedObjectID(const EntityID& pX) { + _referencedObjectID = pX; } -unsigned short PointObjectStatePdu::getUpdateNumber() const -{ - return _updateNumber; +unsigned short PointObjectStatePdu::getUpdateNumber() const { + return _updateNumber; } -void PointObjectStatePdu::setUpdateNumber(unsigned short pX) -{ - _updateNumber = pX; +void PointObjectStatePdu::setUpdateNumber(unsigned short pX) { + _updateNumber = pX; } -unsigned char PointObjectStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char PointObjectStatePdu::getForceID() const { return _forceID; } -void PointObjectStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void PointObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char PointObjectStatePdu::getModifications() const -{ - return _modifications; +unsigned char PointObjectStatePdu::getModifications() const { + return _modifications; } -void PointObjectStatePdu::setModifications(unsigned char pX) -{ - _modifications = pX; +void PointObjectStatePdu::setModifications(unsigned char pX) { + _modifications = pX; } -ObjectType& PointObjectStatePdu::getObjectType() -{ - return _objectType; -} +ObjectType& PointObjectStatePdu::getObjectType() { return _objectType; } -const ObjectType& PointObjectStatePdu::getObjectType() const -{ - return _objectType; +const ObjectType& PointObjectStatePdu::getObjectType() const { + return _objectType; } -void PointObjectStatePdu::setObjectType(const ObjectType &pX) -{ - _objectType = pX; +void PointObjectStatePdu::setObjectType(const ObjectType& pX) { + _objectType = pX; } -Vector3Double& PointObjectStatePdu::getObjectLocation() -{ - return _objectLocation; +Vector3Double& PointObjectStatePdu::getObjectLocation() { + return _objectLocation; } -const Vector3Double& PointObjectStatePdu::getObjectLocation() const -{ - return _objectLocation; +const Vector3Double& PointObjectStatePdu::getObjectLocation() const { + return _objectLocation; } -void PointObjectStatePdu::setObjectLocation(const Vector3Double &pX) -{ - _objectLocation = pX; +void PointObjectStatePdu::setObjectLocation(const Vector3Double& pX) { + _objectLocation = pX; } -Orientation& PointObjectStatePdu::getObjectOrientation() -{ - return _objectOrientation; +Orientation& PointObjectStatePdu::getObjectOrientation() { + return _objectOrientation; } -const Orientation& PointObjectStatePdu::getObjectOrientation() const -{ - return _objectOrientation; +const Orientation& PointObjectStatePdu::getObjectOrientation() const { + return _objectOrientation; } -void PointObjectStatePdu::setObjectOrientation(const Orientation &pX) -{ - _objectOrientation = pX; +void PointObjectStatePdu::setObjectOrientation(const Orientation& pX) { + _objectOrientation = pX; } -double PointObjectStatePdu::getObjectAppearance() const -{ - return _objectAppearance; +double PointObjectStatePdu::getObjectAppearance() const { + return _objectAppearance; } -void PointObjectStatePdu::setObjectAppearance(double pX) -{ - _objectAppearance = pX; +void PointObjectStatePdu::setObjectAppearance(double pX) { + _objectAppearance = pX; } -SimulationAddress& PointObjectStatePdu::getRequesterID() -{ - return _requesterID; +SimulationAddress& PointObjectStatePdu::getRequesterID() { + return _requesterID; } -const SimulationAddress& PointObjectStatePdu::getRequesterID() const -{ - return _requesterID; +const SimulationAddress& PointObjectStatePdu::getRequesterID() const { + return _requesterID; } -void PointObjectStatePdu::setRequesterID(const SimulationAddress &pX) -{ - _requesterID = pX; +void PointObjectStatePdu::setRequesterID(const SimulationAddress& pX) { + _requesterID = pX; } -SimulationAddress& PointObjectStatePdu::getReceivingID() -{ - return _receivingID; +SimulationAddress& PointObjectStatePdu::getReceivingID() { + return _receivingID; } -const SimulationAddress& PointObjectStatePdu::getReceivingID() const -{ - return _receivingID; +const SimulationAddress& PointObjectStatePdu::getReceivingID() const { + return _receivingID; } -void PointObjectStatePdu::setReceivingID(const SimulationAddress &pX) -{ - _receivingID = pX; +void PointObjectStatePdu::setReceivingID(const SimulationAddress& pX) { + _receivingID = pX; } -unsigned int PointObjectStatePdu::getPad2() const -{ - return _pad2; -} +unsigned int PointObjectStatePdu::getPad2() const { return _pad2; } + +void PointObjectStatePdu::setPad2(unsigned int pX) { _pad2 = pX; } -void PointObjectStatePdu::setPad2(unsigned int pX) -{ - _pad2 = pX; +void PointObjectStatePdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _objectID.marshal(dataStream); + _referencedObjectID.marshal(dataStream); + dataStream << _updateNumber; + dataStream << _forceID; + dataStream << _modifications; + _objectType.marshal(dataStream); + _objectLocation.marshal(dataStream); + _objectOrientation.marshal(dataStream); + dataStream << _objectAppearance; + _requesterID.marshal(dataStream); + _receivingID.marshal(dataStream); + dataStream << _pad2; } -void PointObjectStatePdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _objectID.marshal(dataStream); - _referencedObjectID.marshal(dataStream); - dataStream << _updateNumber; - dataStream << _forceID; - dataStream << _modifications; - _objectType.marshal(dataStream); - _objectLocation.marshal(dataStream); - _objectOrientation.marshal(dataStream); - dataStream << _objectAppearance; - _requesterID.marshal(dataStream); - _receivingID.marshal(dataStream); - dataStream << _pad2; +void PointObjectStatePdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _objectID.unmarshal(dataStream); + _referencedObjectID.unmarshal(dataStream); + dataStream >> _updateNumber; + dataStream >> _forceID; + dataStream >> _modifications; + _objectType.unmarshal(dataStream); + _objectLocation.unmarshal(dataStream); + _objectOrientation.unmarshal(dataStream); + dataStream >> _objectAppearance; + _requesterID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + dataStream >> _pad2; } -void PointObjectStatePdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _objectID.unmarshal(dataStream); - _referencedObjectID.unmarshal(dataStream); - dataStream >> _updateNumber; - dataStream >> _forceID; - dataStream >> _modifications; - _objectType.unmarshal(dataStream); - _objectLocation.unmarshal(dataStream); - _objectOrientation.unmarshal(dataStream); - dataStream >> _objectAppearance; - _requesterID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - dataStream >> _pad2; +bool PointObjectStatePdu::operator==(const PointObjectStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + + if (!(_objectID == rhs._objectID)) ivarsEqual = false; + if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; + if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_modifications == rhs._modifications)) ivarsEqual = false; + if (!(_objectType == rhs._objectType)) ivarsEqual = false; + if (!(_objectLocation == rhs._objectLocation)) ivarsEqual = false; + if (!(_objectOrientation == rhs._objectOrientation)) ivarsEqual = false; + if (!(_objectAppearance == rhs._objectAppearance)) ivarsEqual = false; + if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + + return ivarsEqual; } +int PointObjectStatePdu::getMarshalledSize() const { + int marshalSize = 0; -bool PointObjectStatePdu::operator ==(const PointObjectStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - - if( ! (_objectID == rhs._objectID) ) ivarsEqual = false; - if( ! (_referencedObjectID == rhs._referencedObjectID) ) ivarsEqual = false; - if( ! (_updateNumber == rhs._updateNumber) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_modifications == rhs._modifications) ) ivarsEqual = false; - if( ! (_objectType == rhs._objectType) ) ivarsEqual = false; - if( ! (_objectLocation == rhs._objectLocation) ) ivarsEqual = false; - if( ! (_objectOrientation == rhs._objectOrientation) ) ivarsEqual = false; - if( ! (_objectAppearance == rhs._objectAppearance) ) ivarsEqual = false; - if( ! (_requesterID == rhs._requesterID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - - return ivarsEqual; - } - -int PointObjectStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _modifications - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - marshalSize = marshalSize + _objectLocation.getMarshalledSize(); // _objectLocation - marshalSize = marshalSize + _objectOrientation.getMarshalledSize(); // _objectOrientation - marshalSize = marshalSize + 8; // _objectAppearance - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 4; // _pad2 - return marshalSize; + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID + marshalSize = marshalSize + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshalSize = marshalSize + 2; // _updateNumber + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _modifications + marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType + marshalSize = + marshalSize + _objectLocation.getMarshalledSize(); // _objectLocation + marshalSize = marshalSize + + _objectOrientation.getMarshalledSize(); // _objectOrientation + marshalSize = marshalSize + 8; // _objectAppearance + marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + 4; // _pad2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -273,7 +223,7 @@ int PointObjectStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/PointObjectStatePdu.h b/src/dis6/PointObjectStatePdu.h index 114cde1c..f67ce66d 100644 --- a/src/dis6/PointObjectStatePdu.h +++ b/src/dis6/PointObjectStatePdu.h @@ -1,127 +1,124 @@ #pragma once -#include #include #include -#include #include #include -#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.11.3: Inormation abut the addition or modification of a synthecic +// enviroment object that is anchored to the terrain with a single point. +// COMPLETE -namespace DIS -{ -// Section 5.3.11.3: Inormation abut the addition or modification of a synthecic enviroment object that is anchored to the terrain with a single point. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT PointObjectStatePdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS6_EXPORT PointObjectStatePdu + : public SyntheticEnvironmentFamilyPdu { + protected: /** Object in synthetic environment */ - EntityID _objectID; + EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + unsigned short _updateNumber; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** modifications */ - unsigned char _modifications; + unsigned char _modifications; /** Object type */ - ObjectType _objectType; + ObjectType _objectType; /** Object location */ - Vector3Double _objectLocation; + Vector3Double _objectLocation; /** Object orientation */ - Orientation _objectOrientation; + Orientation _objectOrientation; /** Object apperance */ - double _objectAppearance; + double _objectAppearance; /** requesterID */ - SimulationAddress _requesterID; + SimulationAddress _requesterID; /** receiver ID */ - SimulationAddress _receivingID; + SimulationAddress _receivingID; /** padding */ - unsigned int _pad2; - + unsigned int _pad2; public: - PointObjectStatePdu(); - virtual ~PointObjectStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + PointObjectStatePdu(); + virtual ~PointObjectStatePdu(); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID &pX); + EntityID& getObjectID(); + const EntityID& getObjectID() const; + void setObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + EntityID& getReferencedObjectID(); + const EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const EntityID& pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned short getUpdateNumber() const; + void setUpdateNumber(unsigned short pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + unsigned char getForceID() const; + void setForceID(unsigned char pX); - ObjectType& getObjectType(); - const ObjectType& getObjectType() const; - void setObjectType(const ObjectType &pX); + unsigned char getModifications() const; + void setModifications(unsigned char pX); - Vector3Double& getObjectLocation(); - const Vector3Double& getObjectLocation() const; - void setObjectLocation(const Vector3Double &pX); + ObjectType& getObjectType(); + const ObjectType& getObjectType() const; + void setObjectType(const ObjectType& pX); - Orientation& getObjectOrientation(); - const Orientation& getObjectOrientation() const; - void setObjectOrientation(const Orientation &pX); + Vector3Double& getObjectLocation(); + const Vector3Double& getObjectLocation() const; + void setObjectLocation(const Vector3Double& pX); - double getObjectAppearance() const; - void setObjectAppearance(double pX); + Orientation& getObjectOrientation(); + const Orientation& getObjectOrientation() const; + void setObjectOrientation(const Orientation& pX); - SimulationAddress& getRequesterID(); - const SimulationAddress& getRequesterID() const; - void setRequesterID(const SimulationAddress &pX); + double getObjectAppearance() const; + void setObjectAppearance(double pX); - SimulationAddress& getReceivingID(); - const SimulationAddress& getReceivingID() const; - void setReceivingID(const SimulationAddress &pX); + SimulationAddress& getRequesterID(); + const SimulationAddress& getRequesterID() const; + void setRequesterID(const SimulationAddress& pX); - unsigned int getPad2() const; - void setPad2(unsigned int pX); + SimulationAddress& getReceivingID(); + const SimulationAddress& getReceivingID() const; + void setReceivingID(const SimulationAddress& pX); + unsigned int getPad2() const; + void setPad2(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const PointObjectStatePdu& rhs) const; + bool operator==(const PointObjectStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -134,7 +131,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/PropulsionSystemData.cpp b/src/dis6/PropulsionSystemData.cpp index 029ce8d8..c92100f6 100644 --- a/src/dis6/PropulsionSystemData.cpp +++ b/src/dis6/PropulsionSystemData.cpp @@ -2,74 +2,51 @@ using namespace DIS; +PropulsionSystemData::PropulsionSystemData() + : _powerSetting(0.0), _engineRpm(0.0) {} -PropulsionSystemData::PropulsionSystemData(): - _powerSetting(0.0), - _engineRpm(0.0) -{ -} +PropulsionSystemData::~PropulsionSystemData() {} -PropulsionSystemData::~PropulsionSystemData() -{ -} +float PropulsionSystemData::getPowerSetting() const { return _powerSetting; } -float PropulsionSystemData::getPowerSetting() const -{ - return _powerSetting; -} +void PropulsionSystemData::setPowerSetting(float pX) { _powerSetting = pX; } -void PropulsionSystemData::setPowerSetting(float pX) -{ - _powerSetting = pX; -} +float PropulsionSystemData::getEngineRpm() const { return _engineRpm; } -float PropulsionSystemData::getEngineRpm() const -{ - return _engineRpm; -} +void PropulsionSystemData::setEngineRpm(float pX) { _engineRpm = pX; } -void PropulsionSystemData::setEngineRpm(float pX) -{ - _engineRpm = pX; +void PropulsionSystemData::marshal(DataStream& dataStream) const { + dataStream << _powerSetting; + dataStream << _engineRpm; } -void PropulsionSystemData::marshal(DataStream& dataStream) const -{ - dataStream << _powerSetting; - dataStream << _engineRpm; -} - -void PropulsionSystemData::unmarshal(DataStream& dataStream) -{ - dataStream >> _powerSetting; - dataStream >> _engineRpm; +void PropulsionSystemData::unmarshal(DataStream& dataStream) { + dataStream >> _powerSetting; + dataStream >> _engineRpm; } +bool PropulsionSystemData::operator==(const PropulsionSystemData& rhs) const { + bool ivarsEqual = true; -bool PropulsionSystemData::operator ==(const PropulsionSystemData& rhs) const - { - bool ivarsEqual = true; + if (!(_powerSetting == rhs._powerSetting)) ivarsEqual = false; + if (!(_engineRpm == rhs._engineRpm)) ivarsEqual = false; - if( ! (_powerSetting == rhs._powerSetting) ) ivarsEqual = false; - if( ! (_engineRpm == rhs._engineRpm) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int PropulsionSystemData::getMarshalledSize() const -{ - int marshalSize = 0; +int PropulsionSystemData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _powerSetting - marshalSize = marshalSize + 4; // _engineRpm - return marshalSize; + marshalSize = marshalSize + 4; // _powerSetting + marshalSize = marshalSize + 4; // _engineRpm + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +59,7 @@ int PropulsionSystemData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/PropulsionSystemData.h b/src/dis6/PropulsionSystemData.h index 1ce1d228..c06f6d63 100644 --- a/src/dis6/PropulsionSystemData.h +++ b/src/dis6/PropulsionSystemData.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Data about a propulsion system -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT PropulsionSystemData -{ -protected: +class OPENDIS6_EXPORT PropulsionSystemData { + protected: /** powerSetting */ - float _powerSetting; + float _powerSetting; /** engine RPMs */ - float _engineRpm; - + float _engineRpm; public: - PropulsionSystemData(); - virtual ~PropulsionSystemData(); + PropulsionSystemData(); + virtual ~PropulsionSystemData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getPowerSetting() const; - void setPowerSetting(float pX); + float getPowerSetting() const; + void setPowerSetting(float pX); - float getEngineRpm() const; - void setEngineRpm(float pX); + float getEngineRpm() const; + void setEngineRpm(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const PropulsionSystemData& rhs) const; + bool operator==(const PropulsionSystemData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RadioCommunicationsFamilyPdu.cpp b/src/dis6/RadioCommunicationsFamilyPdu.cpp index 6259b0ab..56a54c1b 100644 --- a/src/dis6/RadioCommunicationsFamilyPdu.cpp +++ b/src/dis6/RadioCommunicationsFamilyPdu.cpp @@ -2,85 +2,69 @@ using namespace DIS; - -RadioCommunicationsFamilyPdu::RadioCommunicationsFamilyPdu() : Pdu(), - _entityId(), - _radioId(0) -{ - setProtocolFamily( 4 ); +RadioCommunicationsFamilyPdu::RadioCommunicationsFamilyPdu() + : Pdu(), _entityId(), _radioId(0) { + setProtocolFamily(4); } -RadioCommunicationsFamilyPdu::~RadioCommunicationsFamilyPdu() -{ -} +RadioCommunicationsFamilyPdu::~RadioCommunicationsFamilyPdu() {} -EntityID& RadioCommunicationsFamilyPdu::getEntityId() -{ - return _entityId; -} +EntityID& RadioCommunicationsFamilyPdu::getEntityId() { return _entityId; } -const EntityID& RadioCommunicationsFamilyPdu::getEntityId() const -{ - return _entityId; +const EntityID& RadioCommunicationsFamilyPdu::getEntityId() const { + return _entityId; } -void RadioCommunicationsFamilyPdu::setEntityId(const EntityID &pX) -{ - _entityId = pX; +void RadioCommunicationsFamilyPdu::setEntityId(const EntityID& pX) { + _entityId = pX; } -unsigned short RadioCommunicationsFamilyPdu::getRadioId() const -{ - return _radioId; +unsigned short RadioCommunicationsFamilyPdu::getRadioId() const { + return _radioId; } -void RadioCommunicationsFamilyPdu::setRadioId(unsigned short pX) -{ - _radioId = pX; +void RadioCommunicationsFamilyPdu::setRadioId(unsigned short pX) { + _radioId = pX; } -void RadioCommunicationsFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _entityId.marshal(dataStream); - dataStream << _radioId; +void RadioCommunicationsFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _entityId.marshal(dataStream); + dataStream << _radioId; } -void RadioCommunicationsFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _entityId.unmarshal(dataStream); - dataStream >> _radioId; +void RadioCommunicationsFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _entityId.unmarshal(dataStream); + dataStream >> _radioId; } +bool RadioCommunicationsFamilyPdu::operator==( + const RadioCommunicationsFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool RadioCommunicationsFamilyPdu::operator ==(const RadioCommunicationsFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); + if (!(_entityId == rhs._entityId)) ivarsEqual = false; + if (!(_radioId == rhs._radioId)) ivarsEqual = false; - if( ! (_entityId == rhs._entityId) ) ivarsEqual = false; - if( ! (_radioId == rhs._radioId) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RadioCommunicationsFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RadioCommunicationsFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _entityId.getMarshalledSize(); // _entityId - marshalSize = marshalSize + 2; // _radioId - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = marshalSize + _entityId.getMarshalledSize(); // _entityId + marshalSize = marshalSize + 2; // _radioId + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -93,7 +77,7 @@ int RadioCommunicationsFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RadioCommunicationsFamilyPdu.h b/src/dis6/RadioCommunicationsFamilyPdu.h index f2910b79..838c11ec 100644 --- a/src/dis6/RadioCommunicationsFamilyPdu.h +++ b/src/dis6/RadioCommunicationsFamilyPdu.h @@ -2,54 +2,50 @@ #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.8. Abstract superclass for radio communications PDUs. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RadioCommunicationsFamilyPdu : public Pdu -{ -protected: +class OPENDIS6_EXPORT RadioCommunicationsFamilyPdu : public Pdu { + protected: /** ID of the entitythat is the source of the communication */ - EntityID _entityId; + EntityID _entityId; /** particular radio within an entity */ - unsigned short _radioId; - + unsigned short _radioId; public: - RadioCommunicationsFamilyPdu(); - virtual ~RadioCommunicationsFamilyPdu(); + RadioCommunicationsFamilyPdu(); + virtual ~RadioCommunicationsFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEntityId(); - const EntityID& getEntityId() const; - void setEntityId(const EntityID &pX); + EntityID& getEntityId(); + const EntityID& getEntityId() const; + void setEntityId(const EntityID& pX); - unsigned short getRadioId() const; - void setRadioId(unsigned short pX); + unsigned short getRadioId() const; + void setRadioId(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RadioCommunicationsFamilyPdu& rhs) const; + bool operator==(const RadioCommunicationsFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -62,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RadioEntityType.cpp b/src/dis6/RadioEntityType.cpp index fa63bc14..f22b4e47 100644 --- a/src/dis6/RadioEntityType.cpp +++ b/src/dis6/RadioEntityType.cpp @@ -2,134 +2,94 @@ using namespace DIS; +RadioEntityType::RadioEntityType() + : _entityKind(0), + _domain(0), + _country(0), + _category(0), + _nomenclatureVersion(0), + _nomenclature(0) {} -RadioEntityType::RadioEntityType(): - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _nomenclatureVersion(0), - _nomenclature(0) -{ -} +RadioEntityType::~RadioEntityType() {} -RadioEntityType::~RadioEntityType() -{ -} +unsigned char RadioEntityType::getEntityKind() const { return _entityKind; } -unsigned char RadioEntityType::getEntityKind() const -{ - return _entityKind; -} +void RadioEntityType::setEntityKind(unsigned char pX) { _entityKind = pX; } -void RadioEntityType::setEntityKind(unsigned char pX) -{ - _entityKind = pX; -} +unsigned char RadioEntityType::getDomain() const { return _domain; } -unsigned char RadioEntityType::getDomain() const -{ - return _domain; -} - -void RadioEntityType::setDomain(unsigned char pX) -{ - _domain = pX; -} +void RadioEntityType::setDomain(unsigned char pX) { _domain = pX; } -unsigned short RadioEntityType::getCountry() const -{ - return _country; -} +unsigned short RadioEntityType::getCountry() const { return _country; } -void RadioEntityType::setCountry(unsigned short pX) -{ - _country = pX; -} +void RadioEntityType::setCountry(unsigned short pX) { _country = pX; } -unsigned char RadioEntityType::getCategory() const -{ - return _category; -} +unsigned char RadioEntityType::getCategory() const { return _category; } -void RadioEntityType::setCategory(unsigned char pX) -{ - _category = pX; -} +void RadioEntityType::setCategory(unsigned char pX) { _category = pX; } -unsigned char RadioEntityType::getNomenclatureVersion() const -{ - return _nomenclatureVersion; +unsigned char RadioEntityType::getNomenclatureVersion() const { + return _nomenclatureVersion; } -void RadioEntityType::setNomenclatureVersion(unsigned char pX) -{ - _nomenclatureVersion = pX; +void RadioEntityType::setNomenclatureVersion(unsigned char pX) { + _nomenclatureVersion = pX; } -unsigned short RadioEntityType::getNomenclature() const -{ - return _nomenclature; +unsigned short RadioEntityType::getNomenclature() const { + return _nomenclature; } -void RadioEntityType::setNomenclature(unsigned short pX) -{ - _nomenclature = pX; -} +void RadioEntityType::setNomenclature(unsigned short pX) { _nomenclature = pX; } -void RadioEntityType::marshal(DataStream& dataStream) const -{ - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _nomenclatureVersion; - dataStream << _nomenclature; +void RadioEntityType::marshal(DataStream& dataStream) const { + dataStream << _entityKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _nomenclatureVersion; + dataStream << _nomenclature; } -void RadioEntityType::unmarshal(DataStream& dataStream) -{ - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _nomenclatureVersion; - dataStream >> _nomenclature; +void RadioEntityType::unmarshal(DataStream& dataStream) { + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _nomenclatureVersion; + dataStream >> _nomenclature; } +bool RadioEntityType::operator==(const RadioEntityType& rhs) const { + bool ivarsEqual = true; -bool RadioEntityType::operator ==(const RadioEntityType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_nomenclatureVersion == rhs._nomenclatureVersion) ) ivarsEqual = false; - if( ! (_nomenclature == rhs._nomenclature) ) ivarsEqual = false; + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_nomenclatureVersion == rhs._nomenclatureVersion)) ivarsEqual = false; + if (!(_nomenclature == rhs._nomenclature)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int RadioEntityType::getMarshalledSize() const -{ - int marshalSize = 0; +int RadioEntityType::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _nomenclatureVersion - marshalSize = marshalSize + 2; // _nomenclature - return marshalSize; + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _nomenclatureVersion + marshalSize = marshalSize + 2; // _nomenclature + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +102,7 @@ int RadioEntityType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RadioEntityType.h b/src/dis6/RadioEntityType.h index 2b5b8ba5..304cb5f0 100644 --- a/src/dis6/RadioEntityType.h +++ b/src/dis6/RadioEntityType.h @@ -1,75 +1,71 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.25. Identifies the type of radio -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RadioEntityType -{ -protected: +class OPENDIS6_EXPORT RadioEntityType { + protected: /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** specific info based on subcategory field */ - unsigned char _nomenclatureVersion; - - unsigned short _nomenclature; + unsigned char _nomenclatureVersion; + unsigned short _nomenclature; public: - RadioEntityType(); - virtual ~RadioEntityType(); + RadioEntityType(); + virtual ~RadioEntityType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getNomenclatureVersion() const; - void setNomenclatureVersion(unsigned char pX); + unsigned char getNomenclatureVersion() const; + void setNomenclatureVersion(unsigned char pX); - unsigned short getNomenclature() const; - void setNomenclature(unsigned short pX); + unsigned short getNomenclature() const; + void setNomenclature(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RadioEntityType& rhs) const; + bool operator==(const RadioEntityType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +78,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ReceiverPdu.cpp b/src/dis6/ReceiverPdu.cpp index 25c03713..eb6f2be6 100644 --- a/src/dis6/ReceiverPdu.cpp +++ b/src/dis6/ReceiverPdu.cpp @@ -2,130 +2,101 @@ using namespace DIS; - -ReceiverPdu::ReceiverPdu() : RadioCommunicationsFamilyPdu(), - _receiverState(0), - _padding1(0), - _receivedPower(0.0), - _transmitterEntityId(), - _transmitterRadioId(0) -{ - setPduType( 27 ); +ReceiverPdu::ReceiverPdu() + : RadioCommunicationsFamilyPdu(), + _receiverState(0), + _padding1(0), + _receivedPower(0.0), + _transmitterEntityId(), + _transmitterRadioId(0) { + setPduType(27); } -ReceiverPdu::~ReceiverPdu() -{ -} +ReceiverPdu::~ReceiverPdu() {} -unsigned short ReceiverPdu::getReceiverState() const -{ - return _receiverState; -} +unsigned short ReceiverPdu::getReceiverState() const { return _receiverState; } -void ReceiverPdu::setReceiverState(unsigned short pX) -{ - _receiverState = pX; -} +void ReceiverPdu::setReceiverState(unsigned short pX) { _receiverState = pX; } -unsigned short ReceiverPdu::getPadding1() const -{ - return _padding1; -} +unsigned short ReceiverPdu::getPadding1() const { return _padding1; } -void ReceiverPdu::setPadding1(unsigned short pX) -{ - _padding1 = pX; -} +void ReceiverPdu::setPadding1(unsigned short pX) { _padding1 = pX; } -float ReceiverPdu::getReceivedPower() const -{ - return _receivedPower; -} +float ReceiverPdu::getReceivedPower() const { return _receivedPower; } -void ReceiverPdu::setReceivedPower(float pX) -{ - _receivedPower = pX; -} +void ReceiverPdu::setReceivedPower(float pX) { _receivedPower = pX; } -EntityID& ReceiverPdu::getTransmitterEntityId() -{ - return _transmitterEntityId; -} +EntityID& ReceiverPdu::getTransmitterEntityId() { return _transmitterEntityId; } -const EntityID& ReceiverPdu::getTransmitterEntityId() const -{ - return _transmitterEntityId; +const EntityID& ReceiverPdu::getTransmitterEntityId() const { + return _transmitterEntityId; } -void ReceiverPdu::setTransmitterEntityId(const EntityID &pX) -{ - _transmitterEntityId = pX; +void ReceiverPdu::setTransmitterEntityId(const EntityID& pX) { + _transmitterEntityId = pX; } -unsigned short ReceiverPdu::getTransmitterRadioId() const -{ - return _transmitterRadioId; +unsigned short ReceiverPdu::getTransmitterRadioId() const { + return _transmitterRadioId; } -void ReceiverPdu::setTransmitterRadioId(unsigned short pX) -{ - _transmitterRadioId = pX; +void ReceiverPdu::setTransmitterRadioId(unsigned short pX) { + _transmitterRadioId = pX; } -void ReceiverPdu::marshal(DataStream& dataStream) const -{ - RadioCommunicationsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _receiverState; - dataStream << _padding1; - dataStream << _receivedPower; - _transmitterEntityId.marshal(dataStream); - dataStream << _transmitterRadioId; +void ReceiverPdu::marshal(DataStream& dataStream) const { + RadioCommunicationsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _receiverState; + dataStream << _padding1; + dataStream << _receivedPower; + _transmitterEntityId.marshal(dataStream); + dataStream << _transmitterRadioId; } -void ReceiverPdu::unmarshal(DataStream& dataStream) -{ - RadioCommunicationsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _receiverState; - dataStream >> _padding1; - dataStream >> _receivedPower; - _transmitterEntityId.unmarshal(dataStream); - dataStream >> _transmitterRadioId; +void ReceiverPdu::unmarshal(DataStream& dataStream) { + RadioCommunicationsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _receiverState; + dataStream >> _padding1; + dataStream >> _receivedPower; + _transmitterEntityId.unmarshal(dataStream); + dataStream >> _transmitterRadioId; } +bool ReceiverPdu::operator==(const ReceiverPdu& rhs) const { + bool ivarsEqual = true; -bool ReceiverPdu::operator ==(const ReceiverPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); - ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); + if (!(_receiverState == rhs._receiverState)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_receivedPower == rhs._receivedPower)) ivarsEqual = false; + if (!(_transmitterEntityId == rhs._transmitterEntityId)) ivarsEqual = false; + if (!(_transmitterRadioId == rhs._transmitterRadioId)) ivarsEqual = false; - if( ! (_receiverState == rhs._receiverState) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_receivedPower == rhs._receivedPower) ) ivarsEqual = false; - if( ! (_transmitterEntityId == rhs._transmitterEntityId) ) ivarsEqual = false; - if( ! (_transmitterRadioId == rhs._transmitterRadioId) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ReceiverPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ReceiverPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _receiverState - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 4; // _receivedPoser - marshalSize = marshalSize + _transmitterEntityId.getMarshalledSize(); // _transmitterEntityId - marshalSize = marshalSize + 2; // _transmitterRadioId - return marshalSize; + marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _receiverState + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 4; // _receivedPoser + marshalSize = + marshalSize + + _transmitterEntityId.getMarshalledSize(); // _transmitterEntityId + marshalSize = marshalSize + 2; // _transmitterRadioId + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -138,7 +109,7 @@ int ReceiverPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ReceiverPdu.h b/src/dis6/ReceiverPdu.h index d5a3e45b..1c19cede 100644 --- a/src/dis6/ReceiverPdu.h +++ b/src/dis6/ReceiverPdu.h @@ -2,72 +2,68 @@ #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.8.3. Communication of a receiver state. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { + protected: /** encoding scheme used, and enumeration */ - unsigned short _receiverState; + unsigned short _receiverState; /** padding */ - unsigned short _padding1; + unsigned short _padding1; /** received power */ - float _receivedPower; + float _receivedPower; /** ID of transmitter */ - EntityID _transmitterEntityId; + EntityID _transmitterEntityId; /** ID of transmitting radio */ - unsigned short _transmitterRadioId; - + unsigned short _transmitterRadioId; public: - ReceiverPdu(); - virtual ~ReceiverPdu(); + ReceiverPdu(); + virtual ~ReceiverPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getReceiverState() const; - void setReceiverState(unsigned short pX); + unsigned short getReceiverState() const; + void setReceiverState(unsigned short pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + unsigned short getPadding1() const; + void setPadding1(unsigned short pX); - float getReceivedPower() const; - void setReceivedPower(float pX); + float getReceivedPower() const; + void setReceivedPower(float pX); - EntityID& getTransmitterEntityId(); - const EntityID& getTransmitterEntityId() const; - void setTransmitterEntityId(const EntityID &pX); + EntityID& getTransmitterEntityId(); + const EntityID& getTransmitterEntityId() const; + void setTransmitterEntityId(const EntityID& pX); - unsigned short getTransmitterRadioId() const; - void setTransmitterRadioId(unsigned short pX); + unsigned short getTransmitterRadioId() const; + void setTransmitterRadioId(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ReceiverPdu& rhs) const; + bool operator==(const ReceiverPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -80,7 +76,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RecordQueryReliablePdu.cpp b/src/dis6/RecordQueryReliablePdu.cpp index f5254e09..a1f88f9a 100644 --- a/src/dis6/RecordQueryReliablePdu.cpp +++ b/src/dis6/RecordQueryReliablePdu.cpp @@ -2,193 +2,152 @@ using namespace DIS; - -RecordQueryReliablePdu::RecordQueryReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requestID(0), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _eventType(0), - _time(0), - _numberOfRecords(0) -{ - setPduType( 63 ); +RecordQueryReliablePdu::RecordQueryReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requestID(0), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _eventType(0), + _time(0), + _numberOfRecords(0) { + setPduType(63); } -RecordQueryReliablePdu::~RecordQueryReliablePdu() -{ - _recordIDs.clear(); -} +RecordQueryReliablePdu::~RecordQueryReliablePdu() { _recordIDs.clear(); } -unsigned int RecordQueryReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int RecordQueryReliablePdu::getRequestID() const { return _requestID; } -void RecordQueryReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void RecordQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned char RecordQueryReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char RecordQueryReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void RecordQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void RecordQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short RecordQueryReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short RecordQueryReliablePdu::getPad1() const { return _pad1; } -void RecordQueryReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void RecordQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char RecordQueryReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char RecordQueryReliablePdu::getPad2() const { return _pad2; } -void RecordQueryReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void RecordQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned short RecordQueryReliablePdu::getEventType() const -{ - return _eventType; +unsigned short RecordQueryReliablePdu::getEventType() const { + return _eventType; } -void RecordQueryReliablePdu::setEventType(unsigned short pX) -{ - _eventType = pX; +void RecordQueryReliablePdu::setEventType(unsigned short pX) { + _eventType = pX; } -unsigned int RecordQueryReliablePdu::getTime() const -{ - return _time; -} +unsigned int RecordQueryReliablePdu::getTime() const { return _time; } -void RecordQueryReliablePdu::setTime(unsigned int pX) -{ - _time = pX; -} +void RecordQueryReliablePdu::setTime(unsigned int pX) { _time = pX; } -unsigned int RecordQueryReliablePdu::getNumberOfRecords() const -{ - return _recordIDs.size(); +unsigned int RecordQueryReliablePdu::getNumberOfRecords() const { + return _recordIDs.size(); } -std::vector& RecordQueryReliablePdu::getRecordIDs() -{ - return _recordIDs; +std::vector& RecordQueryReliablePdu::getRecordIDs() { + return _recordIDs; } -const std::vector& RecordQueryReliablePdu::getRecordIDs() const -{ - return _recordIDs; +const std::vector& RecordQueryReliablePdu::getRecordIDs() const { + return _recordIDs; } -void RecordQueryReliablePdu::setRecordIDs(const std::vector& pX) -{ - _recordIDs = pX; +void RecordQueryReliablePdu::setRecordIDs( + const std::vector& pX) { + _recordIDs = pX; } -void RecordQueryReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _eventType; - dataStream << _time; - dataStream << ( unsigned int )_recordIDs.size(); - - for(size_t idx = 0; idx < _recordIDs.size(); idx++) - { - FourByteChunk x = _recordIDs[idx]; - x.marshal(dataStream); - } +void RecordQueryReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _eventType; + dataStream << _time; + dataStream << (unsigned int)_recordIDs.size(); + for (size_t idx = 0; idx < _recordIDs.size(); idx++) { + FourByteChunk x = _recordIDs[idx]; + x.marshal(dataStream); + } } -void RecordQueryReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _eventType; - dataStream >> _time; - dataStream >> _numberOfRecords; - - _recordIDs.clear(); - for(size_t idx = 0; idx < _numberOfRecords; idx++) - { - FourByteChunk x; - x.unmarshal(dataStream); - _recordIDs.push_back(x); - } -} +void RecordQueryReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _eventType; + dataStream >> _time; + dataStream >> _numberOfRecords; + _recordIDs.clear(); + for (size_t idx = 0; idx < _numberOfRecords; idx++) { + FourByteChunk x; + x.unmarshal(dataStream); + _recordIDs.push_back(x); + } +} -bool RecordQueryReliablePdu::operator ==(const RecordQueryReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); +bool RecordQueryReliablePdu::operator==( + const RecordQueryReliablePdu& rhs) const { + bool ivarsEqual = true; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_eventType == rhs._eventType) ) ivarsEqual = false; - if( ! (_time == rhs._time) ) ivarsEqual = false; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _recordIDs.size(); idx++) - { - if( ! ( _recordIDs[idx] == rhs._recordIDs[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_eventType == rhs._eventType)) ivarsEqual = false; + if (!(_time == rhs._time)) ivarsEqual = false; + for (size_t idx = 0; idx < _recordIDs.size(); idx++) { + if (!(_recordIDs[idx] == rhs._recordIDs[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int RecordQueryReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RecordQueryReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 2; // _eventType - marshalSize = marshalSize + 4; // _time - marshalSize = marshalSize + 4; // _numberOfRecords + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 2; // _eventType + marshalSize = marshalSize + 4; // _time + marshalSize = marshalSize + 4; // _numberOfRecords - for(unsigned long long idx=0; idx < _recordIDs.size(); idx++) - { - FourByteChunk listElement = _recordIDs[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _recordIDs.size(); idx++) { + FourByteChunk listElement = _recordIDs[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -201,7 +160,7 @@ int RecordQueryReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RecordQueryReliablePdu.h b/src/dis6/RecordQueryReliablePdu.h index 1ce1279b..fc4483fe 100644 --- a/src/dis6/RecordQueryReliablePdu.h +++ b/src/dis6/RecordQueryReliablePdu.h @@ -1,91 +1,90 @@ #pragma once -#include #include + +#include #include -#include #include +#include +namespace DIS { +// Section 5.3.12.13: A request for one or more records of data from an entity. +// COMPLETE -namespace DIS -{ -// Section 5.3.12.13: A request for one or more records of data from an entity. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RecordQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT RecordQueryReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** event type */ - unsigned short _eventType; + unsigned short _eventType; /** time */ - unsigned int _time; + unsigned int _time; /** numberOfRecords */ - unsigned int _numberOfRecords; + unsigned int _numberOfRecords; /** record IDs */ - std::vector _recordIDs; - + std::vector _recordIDs; public: - RecordQueryReliablePdu(); - virtual ~RecordQueryReliablePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RecordQueryReliablePdu(); + virtual ~RecordQueryReliablePdu(); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getTime() const; - void setTime(unsigned int pX); + unsigned short getEventType() const; + void setEventType(unsigned short pX); - unsigned int getNumberOfRecords() const; + unsigned int getTime() const; + void setTime(unsigned int pX); - std::vector& getRecordIDs(); - const std::vector& getRecordIDs() const; - void setRecordIDs(const std::vector& pX); + unsigned int getNumberOfRecords() const; + std::vector& getRecordIDs(); + const std::vector& getRecordIDs() const; + void setRecordIDs(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RecordQueryReliablePdu& rhs) const; + bool operator==(const RecordQueryReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +97,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RecordSet.cpp b/src/dis6/RecordSet.cpp index 84a343cc..dcc3881d 100644 --- a/src/dis6/RecordSet.cpp +++ b/src/dis6/RecordSet.cpp @@ -2,134 +2,93 @@ using namespace DIS; +RecordSet::RecordSet() + : _recordID(0), + _recordSetSerialNumber(0), + _recordLength(0), + _recordCount(0), + _recordValues(0), + _pad4(0) {} -RecordSet::RecordSet(): - _recordID(0), - _recordSetSerialNumber(0), - _recordLength(0), - _recordCount(0), - _recordValues(0), - _pad4(0) -{ -} +RecordSet::~RecordSet() {} -RecordSet::~RecordSet() -{ -} +unsigned int RecordSet::getRecordID() const { return _recordID; } -unsigned int RecordSet::getRecordID() const -{ - return _recordID; -} +void RecordSet::setRecordID(unsigned int pX) { _recordID = pX; } -void RecordSet::setRecordID(unsigned int pX) -{ - _recordID = pX; +unsigned int RecordSet::getRecordSetSerialNumber() const { + return _recordSetSerialNumber; } -unsigned int RecordSet::getRecordSetSerialNumber() const -{ - return _recordSetSerialNumber; +void RecordSet::setRecordSetSerialNumber(unsigned int pX) { + _recordSetSerialNumber = pX; } -void RecordSet::setRecordSetSerialNumber(unsigned int pX) -{ - _recordSetSerialNumber = pX; -} +unsigned short RecordSet::getRecordLength() const { return _recordLength; } -unsigned short RecordSet::getRecordLength() const -{ - return _recordLength; -} +void RecordSet::setRecordLength(unsigned short pX) { _recordLength = pX; } -void RecordSet::setRecordLength(unsigned short pX) -{ - _recordLength = pX; -} +unsigned short RecordSet::getRecordCount() const { return _recordCount; } -unsigned short RecordSet::getRecordCount() const -{ - return _recordCount; -} +void RecordSet::setRecordCount(unsigned short pX) { _recordCount = pX; } -void RecordSet::setRecordCount(unsigned short pX) -{ - _recordCount = pX; -} +unsigned short RecordSet::getRecordValues() const { return _recordValues; } -unsigned short RecordSet::getRecordValues() const -{ - return _recordValues; -} +void RecordSet::setRecordValues(unsigned short pX) { _recordValues = pX; } -void RecordSet::setRecordValues(unsigned short pX) -{ - _recordValues = pX; -} +unsigned char RecordSet::getPad4() const { return _pad4; } -unsigned char RecordSet::getPad4() const -{ - return _pad4; -} +void RecordSet::setPad4(unsigned char pX) { _pad4 = pX; } -void RecordSet::setPad4(unsigned char pX) -{ - _pad4 = pX; +void RecordSet::marshal(DataStream& dataStream) const { + dataStream << _recordID; + dataStream << _recordSetSerialNumber; + dataStream << _recordLength; + dataStream << _recordCount; + dataStream << _recordValues; + dataStream << _pad4; } -void RecordSet::marshal(DataStream& dataStream) const -{ - dataStream << _recordID; - dataStream << _recordSetSerialNumber; - dataStream << _recordLength; - dataStream << _recordCount; - dataStream << _recordValues; - dataStream << _pad4; +void RecordSet::unmarshal(DataStream& dataStream) { + dataStream >> _recordID; + dataStream >> _recordSetSerialNumber; + dataStream >> _recordLength; + dataStream >> _recordCount; + dataStream >> _recordValues; + dataStream >> _pad4; } -void RecordSet::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordID; - dataStream >> _recordSetSerialNumber; - dataStream >> _recordLength; - dataStream >> _recordCount; - dataStream >> _recordValues; - dataStream >> _pad4; -} +bool RecordSet::operator==(const RecordSet& rhs) const { + bool ivarsEqual = true; + if (!(_recordID == rhs._recordID)) ivarsEqual = false; + if (!(_recordSetSerialNumber == rhs._recordSetSerialNumber)) + ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_recordCount == rhs._recordCount)) ivarsEqual = false; + if (!(_recordValues == rhs._recordValues)) ivarsEqual = false; + if (!(_pad4 == rhs._pad4)) ivarsEqual = false; -bool RecordSet::operator ==(const RecordSet& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordID == rhs._recordID) ) ivarsEqual = false; - if( ! (_recordSetSerialNumber == rhs._recordSetSerialNumber) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_recordCount == rhs._recordCount) ) ivarsEqual = false; - if( ! (_recordValues == rhs._recordValues) ) ivarsEqual = false; - if( ! (_pad4 == rhs._pad4) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RecordSet::getMarshalledSize() const -{ - int marshalSize = 0; +int RecordSet::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _recordID - marshalSize = marshalSize + 4; // _recordSetSerialNumber - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _recordCount - marshalSize = marshalSize + 2; // _recordValues - marshalSize = marshalSize + 1; // _pad4 - return marshalSize; + marshalSize = marshalSize + 4; // _recordID + marshalSize = marshalSize + 4; // _recordSetSerialNumber + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 2; // _recordCount + marshalSize = marshalSize + 2; // _recordValues + marshalSize = marshalSize + 1; // _pad4 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +101,7 @@ int RecordSet::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RecordSet.h b/src/dis6/RecordSet.h index 6ece35fe..eef81df0 100644 --- a/src/dis6/RecordSet.h +++ b/src/dis6/RecordSet.h @@ -1,76 +1,72 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Record sets, used in transfer control request PDU -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RecordSet -{ -protected: +class OPENDIS6_EXPORT RecordSet { + protected: /** record ID */ - unsigned int _recordID; + unsigned int _recordID; /** record set serial number */ - unsigned int _recordSetSerialNumber; + unsigned int _recordSetSerialNumber; /** record length */ - unsigned short _recordLength; + unsigned short _recordLength; /** record count */ - unsigned short _recordCount; + unsigned short _recordCount; /** ^^^This is wrong--variable sized data records */ - unsigned short _recordValues; + unsigned short _recordValues; /** ^^^This is wrong--variable sized padding */ - unsigned char _pad4; - + unsigned char _pad4; public: - RecordSet(); - virtual ~RecordSet(); + RecordSet(); + virtual ~RecordSet(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordID() const; - void setRecordID(unsigned int pX); + unsigned int getRecordID() const; + void setRecordID(unsigned int pX); - unsigned int getRecordSetSerialNumber() const; - void setRecordSetSerialNumber(unsigned int pX); + unsigned int getRecordSetSerialNumber() const; + void setRecordSetSerialNumber(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned short getRecordCount() const; - void setRecordCount(unsigned short pX); + unsigned short getRecordCount() const; + void setRecordCount(unsigned short pX); - unsigned short getRecordValues() const; - void setRecordValues(unsigned short pX); + unsigned short getRecordValues() const; + void setRecordValues(unsigned short pX); - unsigned char getPad4() const; - void setPad4(unsigned char pX); + unsigned char getPad4() const; + void setPad4(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RecordSet& rhs) const; + bool operator==(const RecordSet& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +79,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Relationship.cpp b/src/dis6/Relationship.cpp index e7b35abf..01c5afbb 100644 --- a/src/dis6/Relationship.cpp +++ b/src/dis6/Relationship.cpp @@ -2,74 +2,50 @@ using namespace DIS; +Relationship::Relationship() : _nature(0), _position(0) {} -Relationship::Relationship(): - _nature(0), - _position(0) -{ -} +Relationship::~Relationship() {} -Relationship::~Relationship() -{ -} +unsigned short Relationship::getNature() const { return _nature; } -unsigned short Relationship::getNature() const -{ - return _nature; -} +void Relationship::setNature(unsigned short pX) { _nature = pX; } -void Relationship::setNature(unsigned short pX) -{ - _nature = pX; -} +unsigned short Relationship::getPosition() const { return _position; } -unsigned short Relationship::getPosition() const -{ - return _position; -} +void Relationship::setPosition(unsigned short pX) { _position = pX; } -void Relationship::setPosition(unsigned short pX) -{ - _position = pX; +void Relationship::marshal(DataStream& dataStream) const { + dataStream << _nature; + dataStream << _position; } -void Relationship::marshal(DataStream& dataStream) const -{ - dataStream << _nature; - dataStream << _position; -} - -void Relationship::unmarshal(DataStream& dataStream) -{ - dataStream >> _nature; - dataStream >> _position; +void Relationship::unmarshal(DataStream& dataStream) { + dataStream >> _nature; + dataStream >> _position; } +bool Relationship::operator==(const Relationship& rhs) const { + bool ivarsEqual = true; -bool Relationship::operator ==(const Relationship& rhs) const - { - bool ivarsEqual = true; + if (!(_nature == rhs._nature)) ivarsEqual = false; + if (!(_position == rhs._position)) ivarsEqual = false; - if( ! (_nature == rhs._nature) ) ivarsEqual = false; - if( ! (_position == rhs._position) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Relationship::getMarshalledSize() const -{ - int marshalSize = 0; +int Relationship::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _nature - marshalSize = marshalSize + 2; // _position - return marshalSize; + marshalSize = marshalSize + 2; // _nature + marshalSize = marshalSize + 2; // _position + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int Relationship::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Relationship.h b/src/dis6/Relationship.h index b61daf08..e0a5b2a4 100644 --- a/src/dis6/Relationship.h +++ b/src/dis6/Relationship.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.56. Purpose for joinging two entities -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Relationship -{ -protected: +class OPENDIS6_EXPORT Relationship { + protected: /** Nature of join */ - unsigned short _nature; + unsigned short _nature; /** position of join */ - unsigned short _position; - + unsigned short _position; public: - Relationship(); - virtual ~Relationship(); + Relationship(); + virtual ~Relationship(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getNature() const; - void setNature(unsigned short pX); + unsigned short getNature() const; + void setNature(unsigned short pX); - unsigned short getPosition() const; - void setPosition(unsigned short pX); + unsigned short getPosition() const; + void setPosition(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Relationship& rhs) const; + bool operator==(const Relationship& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RemoveEntityPdu.cpp b/src/dis6/RemoveEntityPdu.cpp index 2f9e3afe..41dece63 100644 --- a/src/dis6/RemoveEntityPdu.cpp +++ b/src/dis6/RemoveEntityPdu.cpp @@ -2,65 +2,52 @@ using namespace DIS; - -RemoveEntityPdu::RemoveEntityPdu() : SimulationManagementFamilyPdu(), - _requestID(0) -{ - setPduType( 12 ); +RemoveEntityPdu::RemoveEntityPdu() + : SimulationManagementFamilyPdu(), _requestID(0) { + setPduType(12); } -RemoveEntityPdu::~RemoveEntityPdu() -{ -} +RemoveEntityPdu::~RemoveEntityPdu() {} -unsigned int RemoveEntityPdu::getRequestID() const -{ - return _requestID; -} +unsigned int RemoveEntityPdu::getRequestID() const { return _requestID; } -void RemoveEntityPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void RemoveEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } -void RemoveEntityPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; +void RemoveEntityPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; } -void RemoveEntityPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; +void RemoveEntityPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; } +bool RemoveEntityPdu::operator==(const RemoveEntityPdu& rhs) const { + bool ivarsEqual = true; -bool RemoveEntityPdu::operator ==(const RemoveEntityPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int RemoveEntityPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RemoveEntityPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -73,7 +60,7 @@ int RemoveEntityPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RemoveEntityPdu.h b/src/dis6/RemoveEntityPdu.h index 31ffee76..c89a9ef9 100644 --- a/src/dis6/RemoveEntityPdu.h +++ b/src/dis6/RemoveEntityPdu.h @@ -1,47 +1,43 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.6.2. Remove an entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for the request */ - unsigned int _requestID; - + unsigned int _requestID; public: - RemoveEntityPdu(); - virtual ~RemoveEntityPdu(); + RemoveEntityPdu(); + virtual ~RemoveEntityPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RemoveEntityPdu& rhs) const; + bool operator==(const RemoveEntityPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RemoveEntityReliablePdu.cpp b/src/dis6/RemoveEntityReliablePdu.cpp index f07e35ec..8b41d2cd 100644 --- a/src/dis6/RemoveEntityReliablePdu.cpp +++ b/src/dis6/RemoveEntityReliablePdu.cpp @@ -2,110 +2,89 @@ using namespace DIS; - -RemoveEntityReliablePdu::RemoveEntityReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0) -{ - setPduType( 52 ); +RemoveEntityReliablePdu::RemoveEntityReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0) { + setPduType(52); } -RemoveEntityReliablePdu::~RemoveEntityReliablePdu() -{ -} +RemoveEntityReliablePdu::~RemoveEntityReliablePdu() {} -unsigned char RemoveEntityReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char RemoveEntityReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void RemoveEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void RemoveEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short RemoveEntityReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short RemoveEntityReliablePdu::getPad1() const { return _pad1; } -void RemoveEntityReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void RemoveEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char RemoveEntityReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char RemoveEntityReliablePdu::getPad2() const { return _pad2; } -void RemoveEntityReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void RemoveEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int RemoveEntityReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int RemoveEntityReliablePdu::getRequestID() const { + return _requestID; } -void RemoveEntityReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void RemoveEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void RemoveEntityReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; +void RemoveEntityReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; } -void RemoveEntityReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; +void RemoveEntityReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; } +bool RemoveEntityReliablePdu::operator==( + const RemoveEntityReliablePdu& rhs) const { + bool ivarsEqual = true; -bool RemoveEntityReliablePdu::operator ==(const RemoveEntityReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RemoveEntityReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RemoveEntityReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -118,7 +97,7 @@ int RemoveEntityReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RemoveEntityReliablePdu.h b/src/dis6/RemoveEntityReliablePdu.h index 30082496..37e6ad3f 100644 --- a/src/dis6/RemoveEntityReliablePdu.h +++ b/src/dis6/RemoveEntityReliablePdu.h @@ -1,65 +1,62 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.2: Removal of an entity , reliable. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RemoveEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT RemoveEntityReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - RemoveEntityReliablePdu(); - virtual ~RemoveEntityReliablePdu(); + RemoveEntityReliablePdu(); + virtual ~RemoveEntityReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RemoveEntityReliablePdu& rhs) const; + bool operator==(const RemoveEntityReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -72,7 +69,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RepairCompletePdu.cpp b/src/dis6/RepairCompletePdu.cpp index c2afc9be..6c2f2013 100644 --- a/src/dis6/RepairCompletePdu.cpp +++ b/src/dis6/RepairCompletePdu.cpp @@ -2,120 +2,98 @@ using namespace DIS; - -RepairCompletePdu::RepairCompletePdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _repairingEntityID(), - _repair(0), - _padding2(0) -{ - setPduType( 9 ); +RepairCompletePdu::RepairCompletePdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _repairingEntityID(), + _repair(0), + _padding2(0) { + setPduType(9); } -RepairCompletePdu::~RepairCompletePdu() -{ -} +RepairCompletePdu::~RepairCompletePdu() {} -EntityID& RepairCompletePdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& RepairCompletePdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& RepairCompletePdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& RepairCompletePdu::getReceivingEntityID() const { + return _receivingEntityID; } -void RepairCompletePdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void RepairCompletePdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& RepairCompletePdu::getRepairingEntityID() -{ - return _repairingEntityID; +EntityID& RepairCompletePdu::getRepairingEntityID() { + return _repairingEntityID; } -const EntityID& RepairCompletePdu::getRepairingEntityID() const -{ - return _repairingEntityID; +const EntityID& RepairCompletePdu::getRepairingEntityID() const { + return _repairingEntityID; } -void RepairCompletePdu::setRepairingEntityID(const EntityID &pX) -{ - _repairingEntityID = pX; +void RepairCompletePdu::setRepairingEntityID(const EntityID& pX) { + _repairingEntityID = pX; } -unsigned short RepairCompletePdu::getRepair() const -{ - return _repair; -} +unsigned short RepairCompletePdu::getRepair() const { return _repair; } -void RepairCompletePdu::setRepair(unsigned short pX) -{ - _repair = pX; -} +void RepairCompletePdu::setRepair(unsigned short pX) { _repair = pX; } -short RepairCompletePdu::getPadding2() const -{ - return _padding2; -} +short RepairCompletePdu::getPadding2() const { return _padding2; } -void RepairCompletePdu::setPadding2(short pX) -{ - _padding2 = pX; -} +void RepairCompletePdu::setPadding2(short pX) { _padding2 = pX; } -void RepairCompletePdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _repairingEntityID.marshal(dataStream); - dataStream << _repair; - dataStream << _padding2; +void RepairCompletePdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _repairingEntityID.marshal(dataStream); + dataStream << _repair; + dataStream << _padding2; } -void RepairCompletePdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _repairingEntityID.unmarshal(dataStream); - dataStream >> _repair; - dataStream >> _padding2; +void RepairCompletePdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _repairingEntityID.unmarshal(dataStream); + dataStream >> _repair; + dataStream >> _padding2; } +bool RepairCompletePdu::operator==(const RepairCompletePdu& rhs) const { + bool ivarsEqual = true; -bool RepairCompletePdu::operator ==(const RepairCompletePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_repairingEntityID == rhs._repairingEntityID) ) ivarsEqual = false; - if( ! (_repair == rhs._repair) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_repairingEntityID == rhs._repairingEntityID)) ivarsEqual = false; + if (!(_repair == rhs._repair)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; - return ivarsEqual; - } - -int RepairCompletePdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _repairingEntityID.getMarshalledSize(); // _repairingEntityID - marshalSize = marshalSize + 2; // _repair - marshalSize = marshalSize + 2; // _padding2 - return marshalSize; +int RepairCompletePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _repairingEntityID.getMarshalledSize(); // _repairingEntityID + marshalSize = marshalSize + 2; // _repair + marshalSize = marshalSize + 2; // _padding2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -128,7 +106,7 @@ int RepairCompletePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RepairCompletePdu.h b/src/dis6/RepairCompletePdu.h index 589da732..a5c12ec6 100644 --- a/src/dis6/RepairCompletePdu.h +++ b/src/dis6/RepairCompletePdu.h @@ -1,69 +1,64 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.5.5. Repair is complete. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RepairCompletePdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT RepairCompletePdu : public LogisticsFamilyPdu { + protected: /** Entity that is receiving service */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** Entity that is supplying */ - EntityID _repairingEntityID; + EntityID _repairingEntityID; /** Enumeration for type of repair */ - unsigned short _repair; + unsigned short _repair; /** padding, number prevents conflict with superclass ivar name */ - short _padding2; - + short _padding2; public: - RepairCompletePdu(); - virtual ~RepairCompletePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RepairCompletePdu(); + virtual ~RepairCompletePdu(); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getRepairingEntityID(); - const EntityID& getRepairingEntityID() const; - void setRepairingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - unsigned short getRepair() const; - void setRepair(unsigned short pX); + EntityID& getRepairingEntityID(); + const EntityID& getRepairingEntityID() const; + void setRepairingEntityID(const EntityID& pX); - short getPadding2() const; - void setPadding2(short pX); + unsigned short getRepair() const; + void setRepair(unsigned short pX); + short getPadding2() const; + void setPadding2(short pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RepairCompletePdu& rhs) const; + bool operator==(const RepairCompletePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -76,7 +71,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RepairResponsePdu.cpp b/src/dis6/RepairResponsePdu.cpp index f41da6cd..8335ec88 100644 --- a/src/dis6/RepairResponsePdu.cpp +++ b/src/dis6/RepairResponsePdu.cpp @@ -2,135 +2,111 @@ using namespace DIS; - -RepairResponsePdu::RepairResponsePdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _repairingEntityID(), - _repairResult(0), - _padding1(0), - _padding2(0) -{ - setPduType( 10 ); +RepairResponsePdu::RepairResponsePdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _repairingEntityID(), + _repairResult(0), + _padding1(0), + _padding2(0) { + setPduType(10); } -RepairResponsePdu::~RepairResponsePdu() -{ -} +RepairResponsePdu::~RepairResponsePdu() {} -EntityID& RepairResponsePdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& RepairResponsePdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& RepairResponsePdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& RepairResponsePdu::getReceivingEntityID() const { + return _receivingEntityID; } -void RepairResponsePdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void RepairResponsePdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& RepairResponsePdu::getRepairingEntityID() -{ - return _repairingEntityID; +EntityID& RepairResponsePdu::getRepairingEntityID() { + return _repairingEntityID; } -const EntityID& RepairResponsePdu::getRepairingEntityID() const -{ - return _repairingEntityID; +const EntityID& RepairResponsePdu::getRepairingEntityID() const { + return _repairingEntityID; } -void RepairResponsePdu::setRepairingEntityID(const EntityID &pX) -{ - _repairingEntityID = pX; +void RepairResponsePdu::setRepairingEntityID(const EntityID& pX) { + _repairingEntityID = pX; } -unsigned char RepairResponsePdu::getRepairResult() const -{ - return _repairResult; +unsigned char RepairResponsePdu::getRepairResult() const { + return _repairResult; } -void RepairResponsePdu::setRepairResult(unsigned char pX) -{ - _repairResult = pX; +void RepairResponsePdu::setRepairResult(unsigned char pX) { + _repairResult = pX; } -short RepairResponsePdu::getPadding1() const -{ - return _padding1; -} +short RepairResponsePdu::getPadding1() const { return _padding1; } -void RepairResponsePdu::setPadding1(short pX) -{ - _padding1 = pX; -} +void RepairResponsePdu::setPadding1(short pX) { _padding1 = pX; } -char RepairResponsePdu::getPadding2() const -{ - return _padding2; -} +char RepairResponsePdu::getPadding2() const { return _padding2; } -void RepairResponsePdu::setPadding2(char pX) -{ - _padding2 = pX; -} +void RepairResponsePdu::setPadding2(char pX) { _padding2 = pX; } -void RepairResponsePdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _repairingEntityID.marshal(dataStream); - dataStream << _repairResult; - dataStream << _padding1; - dataStream << _padding2; +void RepairResponsePdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _repairingEntityID.marshal(dataStream); + dataStream << _repairResult; + dataStream << _padding1; + dataStream << _padding2; } -void RepairResponsePdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _repairingEntityID.unmarshal(dataStream); - dataStream >> _repairResult; - dataStream >> _padding1; - dataStream >> _padding2; +void RepairResponsePdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _repairingEntityID.unmarshal(dataStream); + dataStream >> _repairResult; + dataStream >> _padding1; + dataStream >> _padding2; } +bool RepairResponsePdu::operator==(const RepairResponsePdu& rhs) const { + bool ivarsEqual = true; -bool RepairResponsePdu::operator ==(const RepairResponsePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_repairingEntityID == rhs._repairingEntityID)) ivarsEqual = false; + if (!(_repairResult == rhs._repairResult)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_repairingEntityID == rhs._repairingEntityID) ) ivarsEqual = false; - if( ! (_repairResult == rhs._repairResult) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RepairResponsePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RepairResponsePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _repairingEntityID.getMarshalledSize(); // _repairingEntityID - marshalSize = marshalSize + 1; // _repairResult - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - return marshalSize; + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _repairingEntityID.getMarshalledSize(); // _repairingEntityID + marshalSize = marshalSize + 1; // _repairResult + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -143,7 +119,7 @@ int RepairResponsePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/RepairResponsePdu.h b/src/dis6/RepairResponsePdu.h index 3dfeb9da..2d677b5c 100644 --- a/src/dis6/RepairResponsePdu.h +++ b/src/dis6/RepairResponsePdu.h @@ -1,75 +1,70 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.5.6. Sent after repair complete PDU. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT RepairResponsePdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { + protected: /** Entity that is receiving service */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** Entity that is supplying */ - EntityID _repairingEntityID; + EntityID _repairingEntityID; /** Result of repair operation */ - unsigned char _repairResult; + unsigned char _repairResult; /** padding */ - short _padding1; + short _padding1; /** padding */ - char _padding2; - + char _padding2; public: - RepairResponsePdu(); - virtual ~RepairResponsePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RepairResponsePdu(); + virtual ~RepairResponsePdu(); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getRepairingEntityID(); - const EntityID& getRepairingEntityID() const; - void setRepairingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - unsigned char getRepairResult() const; - void setRepairResult(unsigned char pX); + EntityID& getRepairingEntityID(); + const EntityID& getRepairingEntityID() const; + void setRepairingEntityID(const EntityID& pX); - short getPadding1() const; - void setPadding1(short pX); + unsigned char getRepairResult() const; + void setRepairResult(unsigned char pX); - char getPadding2() const; - void setPadding2(char pX); + short getPadding1() const; + void setPadding1(short pX); + char getPadding2() const; + void setPadding2(char pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RepairResponsePdu& rhs) const; + bool operator==(const RepairResponsePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +77,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ResupplyCancelPdu.cpp b/src/dis6/ResupplyCancelPdu.cpp index 741256cc..9a6adfa4 100644 --- a/src/dis6/ResupplyCancelPdu.cpp +++ b/src/dis6/ResupplyCancelPdu.cpp @@ -2,90 +2,78 @@ using namespace DIS; - -ResupplyCancelPdu::ResupplyCancelPdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _supplyingEntityID() -{ - setPduType( 8 ); +ResupplyCancelPdu::ResupplyCancelPdu() + : LogisticsFamilyPdu(), _receivingEntityID(), _supplyingEntityID() { + setPduType(8); } -ResupplyCancelPdu::~ResupplyCancelPdu() -{ -} +ResupplyCancelPdu::~ResupplyCancelPdu() {} -EntityID& ResupplyCancelPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& ResupplyCancelPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& ResupplyCancelPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& ResupplyCancelPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void ResupplyCancelPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void ResupplyCancelPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& ResupplyCancelPdu::getSupplyingEntityID() -{ - return _supplyingEntityID; +EntityID& ResupplyCancelPdu::getSupplyingEntityID() { + return _supplyingEntityID; } -const EntityID& ResupplyCancelPdu::getSupplyingEntityID() const -{ - return _supplyingEntityID; +const EntityID& ResupplyCancelPdu::getSupplyingEntityID() const { + return _supplyingEntityID; } -void ResupplyCancelPdu::setSupplyingEntityID(const EntityID &pX) -{ - _supplyingEntityID = pX; +void ResupplyCancelPdu::setSupplyingEntityID(const EntityID& pX) { + _supplyingEntityID = pX; } -void ResupplyCancelPdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _supplyingEntityID.marshal(dataStream); +void ResupplyCancelPdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _supplyingEntityID.marshal(dataStream); } -void ResupplyCancelPdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _supplyingEntityID.unmarshal(dataStream); +void ResupplyCancelPdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _supplyingEntityID.unmarshal(dataStream); } +bool ResupplyCancelPdu::operator==(const ResupplyCancelPdu& rhs) const { + bool ivarsEqual = true; -bool ResupplyCancelPdu::operator ==(const ResupplyCancelPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_supplyingEntityID == rhs._supplyingEntityID)) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_supplyingEntityID == rhs._supplyingEntityID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ResupplyCancelPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ResupplyCancelPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID - return marshalSize; + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +86,7 @@ int ResupplyCancelPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ResupplyCancelPdu.h b/src/dis6/ResupplyCancelPdu.h index a36a67c2..427fcb2c 100644 --- a/src/dis6/ResupplyCancelPdu.h +++ b/src/dis6/ResupplyCancelPdu.h @@ -1,57 +1,53 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// Section 5.2.5.4. Cancel of resupply by either the receiving or supplying +// entity. COMPLETE -namespace DIS -{ -// Section 5.2.5.4. Cancel of resupply by either the receiving or supplying entity. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ResupplyCancelPdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ResupplyCancelPdu : public LogisticsFamilyPdu { + protected: /** Entity that is receiving service */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** Entity that is supplying */ - EntityID _supplyingEntityID; - + EntityID _supplyingEntityID; public: - ResupplyCancelPdu(); - virtual ~ResupplyCancelPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + ResupplyCancelPdu(); + virtual ~ResupplyCancelPdu(); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getSupplyingEntityID(); - const EntityID& getSupplyingEntityID() const; - void setSupplyingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); + EntityID& getSupplyingEntityID(); + const EntityID& getSupplyingEntityID() const; + void setSupplyingEntityID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const ResupplyCancelPdu& rhs) const; + bool operator==(const ResupplyCancelPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ResupplyOfferPdu.cpp b/src/dis6/ResupplyOfferPdu.cpp index 908e9d52..d47e0bdf 100644 --- a/src/dis6/ResupplyOfferPdu.cpp +++ b/src/dis6/ResupplyOfferPdu.cpp @@ -2,173 +2,140 @@ using namespace DIS; - -ResupplyOfferPdu::ResupplyOfferPdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _supplyingEntityID(), - _numberOfSupplyTypes(0), - _padding1(0), - _padding2(0) -{ - setPduType( 6 ); +ResupplyOfferPdu::ResupplyOfferPdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _supplyingEntityID(), + _numberOfSupplyTypes(0), + _padding1(0), + _padding2(0) { + setPduType(6); } -ResupplyOfferPdu::~ResupplyOfferPdu() -{ - _supplies.clear(); -} +ResupplyOfferPdu::~ResupplyOfferPdu() { _supplies.clear(); } -EntityID& ResupplyOfferPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& ResupplyOfferPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& ResupplyOfferPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& ResupplyOfferPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void ResupplyOfferPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void ResupplyOfferPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& ResupplyOfferPdu::getSupplyingEntityID() -{ - return _supplyingEntityID; +EntityID& ResupplyOfferPdu::getSupplyingEntityID() { + return _supplyingEntityID; } -const EntityID& ResupplyOfferPdu::getSupplyingEntityID() const -{ - return _supplyingEntityID; +const EntityID& ResupplyOfferPdu::getSupplyingEntityID() const { + return _supplyingEntityID; } -void ResupplyOfferPdu::setSupplyingEntityID(const EntityID &pX) -{ - _supplyingEntityID = pX; +void ResupplyOfferPdu::setSupplyingEntityID(const EntityID& pX) { + _supplyingEntityID = pX; } -unsigned char ResupplyOfferPdu::getNumberOfSupplyTypes() const -{ - return _supplies.size(); +unsigned char ResupplyOfferPdu::getNumberOfSupplyTypes() const { + return _supplies.size(); } -short ResupplyOfferPdu::getPadding1() const -{ - return _padding1; -} +short ResupplyOfferPdu::getPadding1() const { return _padding1; } -void ResupplyOfferPdu::setPadding1(short pX) -{ - _padding1 = pX; -} +void ResupplyOfferPdu::setPadding1(short pX) { _padding1 = pX; } -char ResupplyOfferPdu::getPadding2() const -{ - return _padding2; -} +char ResupplyOfferPdu::getPadding2() const { return _padding2; } -void ResupplyOfferPdu::setPadding2(char pX) -{ - _padding2 = pX; -} +void ResupplyOfferPdu::setPadding2(char pX) { _padding2 = pX; } -std::vector& ResupplyOfferPdu::getSupplies() -{ - return _supplies; +std::vector& ResupplyOfferPdu::getSupplies() { + return _supplies; } -const std::vector& ResupplyOfferPdu::getSupplies() const -{ - return _supplies; +const std::vector& ResupplyOfferPdu::getSupplies() const { + return _supplies; } -void ResupplyOfferPdu::setSupplies(const std::vector& pX) -{ - _supplies = pX; +void ResupplyOfferPdu::setSupplies(const std::vector& pX) { + _supplies = pX; } -void ResupplyOfferPdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _supplyingEntityID.marshal(dataStream); - dataStream << ( unsigned char )_supplies.size(); - dataStream << _padding1; - dataStream << _padding2; - - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - SupplyQuantity x = _supplies[idx]; - x.marshal(dataStream); - } - -} +void ResupplyOfferPdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _supplyingEntityID.marshal(dataStream); + dataStream << (unsigned char)_supplies.size(); + dataStream << _padding1; + dataStream << _padding2; -void ResupplyOfferPdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _supplyingEntityID.unmarshal(dataStream); - dataStream >> _numberOfSupplyTypes; - dataStream >> _padding1; - dataStream >> _padding2; - - _supplies.clear(); - for(size_t idx = 0; idx < _numberOfSupplyTypes; idx++) - { - SupplyQuantity x; - x.unmarshal(dataStream); - _supplies.push_back(x); - } + for (size_t idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity x = _supplies[idx]; + x.marshal(dataStream); + } } +void ResupplyOfferPdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _supplyingEntityID.unmarshal(dataStream); + dataStream >> _numberOfSupplyTypes; + dataStream >> _padding1; + dataStream >> _padding2; -bool ResupplyOfferPdu::operator ==(const ResupplyOfferPdu& rhs) const - { - bool ivarsEqual = true; + _supplies.clear(); + for (size_t idx = 0; idx < _numberOfSupplyTypes; idx++) { + SupplyQuantity x; + x.unmarshal(dataStream); + _supplies.push_back(x); + } +} - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); +bool ResupplyOfferPdu::operator==(const ResupplyOfferPdu& rhs) const { + bool ivarsEqual = true; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_supplyingEntityID == rhs._supplyingEntityID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - if( ! ( _supplies[idx] == rhs._supplies[idx]) ) ivarsEqual = false; - } + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_supplyingEntityID == rhs._supplyingEntityID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + if (!(_supplies[idx] == rhs._supplies[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int ResupplyOfferPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ResupplyOfferPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID - marshalSize = marshalSize + 1; // _numberOfSupplyTypes - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID + marshalSize = marshalSize + 1; // _numberOfSupplyTypes + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 - for(unsigned long long idx=0; idx < _supplies.size(); idx++) - { - SupplyQuantity listElement = _supplies[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity listElement = _supplies[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -181,7 +148,7 @@ int ResupplyOfferPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ResupplyOfferPdu.h b/src/dis6/ResupplyOfferPdu.h index ac4ea4f6..5445086a 100644 --- a/src/dis6/ResupplyOfferPdu.h +++ b/src/dis6/ResupplyOfferPdu.h @@ -1,82 +1,78 @@ #pragma once -#include -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.5.2. Information about a request for supplies. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { + protected: /** Entity that is receiving service */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** Entity that is supplying */ - EntityID _supplyingEntityID; + EntityID _supplyingEntityID; /** how many supplies are being offered */ - unsigned char _numberOfSupplyTypes; + unsigned char _numberOfSupplyTypes; /** padding */ - short _padding1; + short _padding1; /** padding */ - char _padding2; - - std::vector _supplies; + char _padding2; + std::vector _supplies; public: - ResupplyOfferPdu(); - virtual ~ResupplyOfferPdu(); + ResupplyOfferPdu(); + virtual ~ResupplyOfferPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - EntityID& getSupplyingEntityID(); - const EntityID& getSupplyingEntityID() const; - void setSupplyingEntityID(const EntityID &pX); + EntityID& getSupplyingEntityID(); + const EntityID& getSupplyingEntityID() const; + void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + unsigned char getNumberOfSupplyTypes() const; - short getPadding1() const; - void setPadding1(short pX); + short getPadding1() const; + void setPadding1(short pX); - char getPadding2() const; - void setPadding2(char pX); + char getPadding2() const; + void setPadding2(char pX); - std::vector& getSupplies(); - const std::vector& getSupplies() const; - void setSupplies(const std::vector& pX); + std::vector& getSupplies(); + const std::vector& getSupplies() const; + void setSupplies(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ResupplyOfferPdu& rhs) const; + bool operator==(const ResupplyOfferPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ResupplyReceivedPdu.cpp b/src/dis6/ResupplyReceivedPdu.cpp index 163ecad2..b6dfba8f 100644 --- a/src/dis6/ResupplyReceivedPdu.cpp +++ b/src/dis6/ResupplyReceivedPdu.cpp @@ -2,173 +2,140 @@ using namespace DIS; - -ResupplyReceivedPdu::ResupplyReceivedPdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _supplyingEntityID(), - _numberOfSupplyTypes(0), - _padding1(0), - _padding2(0) -{ - setPduType( 7 ); +ResupplyReceivedPdu::ResupplyReceivedPdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _supplyingEntityID(), + _numberOfSupplyTypes(0), + _padding1(0), + _padding2(0) { + setPduType(7); } -ResupplyReceivedPdu::~ResupplyReceivedPdu() -{ - _supplies.clear(); -} +ResupplyReceivedPdu::~ResupplyReceivedPdu() { _supplies.clear(); } -EntityID& ResupplyReceivedPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& ResupplyReceivedPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& ResupplyReceivedPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& ResupplyReceivedPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void ResupplyReceivedPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void ResupplyReceivedPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& ResupplyReceivedPdu::getSupplyingEntityID() -{ - return _supplyingEntityID; +EntityID& ResupplyReceivedPdu::getSupplyingEntityID() { + return _supplyingEntityID; } -const EntityID& ResupplyReceivedPdu::getSupplyingEntityID() const -{ - return _supplyingEntityID; +const EntityID& ResupplyReceivedPdu::getSupplyingEntityID() const { + return _supplyingEntityID; } -void ResupplyReceivedPdu::setSupplyingEntityID(const EntityID &pX) -{ - _supplyingEntityID = pX; +void ResupplyReceivedPdu::setSupplyingEntityID(const EntityID& pX) { + _supplyingEntityID = pX; } -unsigned char ResupplyReceivedPdu::getNumberOfSupplyTypes() const -{ - return _supplies.size(); +unsigned char ResupplyReceivedPdu::getNumberOfSupplyTypes() const { + return _supplies.size(); } -short ResupplyReceivedPdu::getPadding1() const -{ - return _padding1; -} +short ResupplyReceivedPdu::getPadding1() const { return _padding1; } -void ResupplyReceivedPdu::setPadding1(short pX) -{ - _padding1 = pX; -} +void ResupplyReceivedPdu::setPadding1(short pX) { _padding1 = pX; } -char ResupplyReceivedPdu::getPadding2() const -{ - return _padding2; -} +char ResupplyReceivedPdu::getPadding2() const { return _padding2; } -void ResupplyReceivedPdu::setPadding2(char pX) -{ - _padding2 = pX; -} +void ResupplyReceivedPdu::setPadding2(char pX) { _padding2 = pX; } -std::vector& ResupplyReceivedPdu::getSupplies() -{ - return _supplies; +std::vector& ResupplyReceivedPdu::getSupplies() { + return _supplies; } -const std::vector& ResupplyReceivedPdu::getSupplies() const -{ - return _supplies; +const std::vector& ResupplyReceivedPdu::getSupplies() const { + return _supplies; } -void ResupplyReceivedPdu::setSupplies(const std::vector& pX) -{ - _supplies = pX; +void ResupplyReceivedPdu::setSupplies(const std::vector& pX) { + _supplies = pX; } -void ResupplyReceivedPdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _supplyingEntityID.marshal(dataStream); - dataStream << ( unsigned char )_supplies.size(); - dataStream << _padding1; - dataStream << _padding2; - - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - SupplyQuantity x = _supplies[idx]; - x.marshal(dataStream); - } - -} +void ResupplyReceivedPdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _supplyingEntityID.marshal(dataStream); + dataStream << (unsigned char)_supplies.size(); + dataStream << _padding1; + dataStream << _padding2; -void ResupplyReceivedPdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _supplyingEntityID.unmarshal(dataStream); - dataStream >> _numberOfSupplyTypes; - dataStream >> _padding1; - dataStream >> _padding2; - - _supplies.clear(); - for(size_t idx = 0; idx < _numberOfSupplyTypes; idx++) - { - SupplyQuantity x; - x.unmarshal(dataStream); - _supplies.push_back(x); - } + for (size_t idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity x = _supplies[idx]; + x.marshal(dataStream); + } } +void ResupplyReceivedPdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _supplyingEntityID.unmarshal(dataStream); + dataStream >> _numberOfSupplyTypes; + dataStream >> _padding1; + dataStream >> _padding2; -bool ResupplyReceivedPdu::operator ==(const ResupplyReceivedPdu& rhs) const - { - bool ivarsEqual = true; + _supplies.clear(); + for (size_t idx = 0; idx < _numberOfSupplyTypes; idx++) { + SupplyQuantity x; + x.unmarshal(dataStream); + _supplies.push_back(x); + } +} - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); +bool ResupplyReceivedPdu::operator==(const ResupplyReceivedPdu& rhs) const { + bool ivarsEqual = true; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_supplyingEntityID == rhs._supplyingEntityID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - if( ! ( _supplies[idx] == rhs._supplies[idx]) ) ivarsEqual = false; - } + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_supplyingEntityID == rhs._supplyingEntityID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + if (!(_supplies[idx] == rhs._supplies[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int ResupplyReceivedPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ResupplyReceivedPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID - marshalSize = marshalSize + 1; // _numberOfSupplyTypes - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID + marshalSize = marshalSize + 1; // _numberOfSupplyTypes + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 - for(unsigned long long idx=0; idx < _supplies.size(); idx++) - { - SupplyQuantity listElement = _supplies[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity listElement = _supplies[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -181,7 +148,7 @@ int ResupplyReceivedPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ResupplyReceivedPdu.h b/src/dis6/ResupplyReceivedPdu.h index b6867908..ad1b59c9 100644 --- a/src/dis6/ResupplyReceivedPdu.h +++ b/src/dis6/ResupplyReceivedPdu.h @@ -1,82 +1,78 @@ #pragma once -#include -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.5.3. Receipt of supplies is communiated. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { + protected: /** Entity that is receiving service */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** Entity that is supplying */ - EntityID _supplyingEntityID; + EntityID _supplyingEntityID; /** how many supplies are being offered */ - unsigned char _numberOfSupplyTypes; + unsigned char _numberOfSupplyTypes; /** padding */ - short _padding1; + short _padding1; /** padding */ - char _padding2; - - std::vector _supplies; + char _padding2; + std::vector _supplies; public: - ResupplyReceivedPdu(); - virtual ~ResupplyReceivedPdu(); + ResupplyReceivedPdu(); + virtual ~ResupplyReceivedPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - EntityID& getSupplyingEntityID(); - const EntityID& getSupplyingEntityID() const; - void setSupplyingEntityID(const EntityID &pX); + EntityID& getSupplyingEntityID(); + const EntityID& getSupplyingEntityID() const; + void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + unsigned char getNumberOfSupplyTypes() const; - short getPadding1() const; - void setPadding1(short pX); + short getPadding1() const; + void setPadding1(short pX); - char getPadding2() const; - void setPadding2(char pX); + char getPadding2() const; + void setPadding2(char pX); - std::vector& getSupplies(); - const std::vector& getSupplies() const; - void setSupplies(const std::vector& pX); + std::vector& getSupplies(); + const std::vector& getSupplies() const; + void setSupplies(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ResupplyReceivedPdu& rhs) const; + bool operator==(const ResupplyReceivedPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SeesPdu.cpp b/src/dis6/SeesPdu.cpp index 053dc92b..cef93f84 100644 --- a/src/dis6/SeesPdu.cpp +++ b/src/dis6/SeesPdu.cpp @@ -2,221 +2,200 @@ using namespace DIS; - -SeesPdu::SeesPdu() : DistributedEmissionsFamilyPdu(), - _orginatingEntityID(), - _infraredSignatureRepresentationIndex(0), - _acousticSignatureRepresentationIndex(0), - _radarCrossSectionSignatureRepresentationIndex(0), - _numberOfPropulsionSystems(0), - _numberOfVectoringNozzleSystems(0) -{ - setPduType( 30 ); +SeesPdu::SeesPdu() + : DistributedEmissionsFamilyPdu(), + _orginatingEntityID(), + _infraredSignatureRepresentationIndex(0), + _acousticSignatureRepresentationIndex(0), + _radarCrossSectionSignatureRepresentationIndex(0), + _numberOfPropulsionSystems(0), + _numberOfVectoringNozzleSystems(0) { + setPduType(30); } -SeesPdu::~SeesPdu() -{ - _propulsionSystemData.clear(); - _vectoringSystemData.clear(); +SeesPdu::~SeesPdu() { + _propulsionSystemData.clear(); + _vectoringSystemData.clear(); } -EntityID& SeesPdu::getOrginatingEntityID() -{ - return _orginatingEntityID; -} +EntityID& SeesPdu::getOrginatingEntityID() { return _orginatingEntityID; } -const EntityID& SeesPdu::getOrginatingEntityID() const -{ - return _orginatingEntityID; +const EntityID& SeesPdu::getOrginatingEntityID() const { + return _orginatingEntityID; } -void SeesPdu::setOrginatingEntityID(const EntityID &pX) -{ - _orginatingEntityID = pX; +void SeesPdu::setOrginatingEntityID(const EntityID& pX) { + _orginatingEntityID = pX; } -unsigned short SeesPdu::getInfraredSignatureRepresentationIndex() const -{ - return _infraredSignatureRepresentationIndex; +unsigned short SeesPdu::getInfraredSignatureRepresentationIndex() const { + return _infraredSignatureRepresentationIndex; } -void SeesPdu::setInfraredSignatureRepresentationIndex(unsigned short pX) -{ - _infraredSignatureRepresentationIndex = pX; +void SeesPdu::setInfraredSignatureRepresentationIndex(unsigned short pX) { + _infraredSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getAcousticSignatureRepresentationIndex() const -{ - return _acousticSignatureRepresentationIndex; +unsigned short SeesPdu::getAcousticSignatureRepresentationIndex() const { + return _acousticSignatureRepresentationIndex; } -void SeesPdu::setAcousticSignatureRepresentationIndex(unsigned short pX) -{ - _acousticSignatureRepresentationIndex = pX; +void SeesPdu::setAcousticSignatureRepresentationIndex(unsigned short pX) { + _acousticSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() const -{ - return _radarCrossSectionSignatureRepresentationIndex; +unsigned short SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() + const { + return _radarCrossSectionSignatureRepresentationIndex; } -void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX) -{ - _radarCrossSectionSignatureRepresentationIndex = pX; +void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex( + unsigned short pX) { + _radarCrossSectionSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getNumberOfPropulsionSystems() const -{ - return _propulsionSystemData.size(); +unsigned short SeesPdu::getNumberOfPropulsionSystems() const { + return _propulsionSystemData.size(); } -unsigned short SeesPdu::getNumberOfVectoringNozzleSystems() const -{ - return _vectoringSystemData.size(); +unsigned short SeesPdu::getNumberOfVectoringNozzleSystems() const { + return _vectoringSystemData.size(); } -std::vector& SeesPdu::getPropulsionSystemData() -{ - return _propulsionSystemData; +std::vector& SeesPdu::getPropulsionSystemData() { + return _propulsionSystemData; } -const std::vector& SeesPdu::getPropulsionSystemData() const -{ - return _propulsionSystemData; +const std::vector& SeesPdu::getPropulsionSystemData() + const { + return _propulsionSystemData; } -void SeesPdu::setPropulsionSystemData(const std::vector& pX) -{ - _propulsionSystemData = pX; +void SeesPdu::setPropulsionSystemData( + const std::vector& pX) { + _propulsionSystemData = pX; } -std::vector& SeesPdu::getVectoringSystemData() -{ - return _vectoringSystemData; +std::vector& SeesPdu::getVectoringSystemData() { + return _vectoringSystemData; } -const std::vector& SeesPdu::getVectoringSystemData() const -{ - return _vectoringSystemData; +const std::vector& SeesPdu::getVectoringSystemData() + const { + return _vectoringSystemData; } -void SeesPdu::setVectoringSystemData(const std::vector& pX) -{ - _vectoringSystemData = pX; +void SeesPdu::setVectoringSystemData( + const std::vector& pX) { + _vectoringSystemData = pX; } -void SeesPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _orginatingEntityID.marshal(dataStream); - dataStream << _infraredSignatureRepresentationIndex; - dataStream << _acousticSignatureRepresentationIndex; - dataStream << _radarCrossSectionSignatureRepresentationIndex; - dataStream << ( unsigned short )_propulsionSystemData.size(); - dataStream << ( unsigned short )_vectoringSystemData.size(); - - for(size_t idx = 0; idx < _propulsionSystemData.size(); idx++) - { - PropulsionSystemData x = _propulsionSystemData[idx]; - x.marshal(dataStream); - } +void SeesPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _orginatingEntityID.marshal(dataStream); + dataStream << _infraredSignatureRepresentationIndex; + dataStream << _acousticSignatureRepresentationIndex; + dataStream << _radarCrossSectionSignatureRepresentationIndex; + dataStream << (unsigned short)_propulsionSystemData.size(); + dataStream << (unsigned short)_vectoringSystemData.size(); + for (size_t idx = 0; idx < _propulsionSystemData.size(); idx++) { + PropulsionSystemData x = _propulsionSystemData[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _vectoringSystemData.size(); idx++) - { - VectoringNozzleSystemData x = _vectoringSystemData[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _vectoringSystemData.size(); idx++) { + VectoringNozzleSystemData x = _vectoringSystemData[idx]; + x.marshal(dataStream); + } } -void SeesPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _orginatingEntityID.unmarshal(dataStream); - dataStream >> _infraredSignatureRepresentationIndex; - dataStream >> _acousticSignatureRepresentationIndex; - dataStream >> _radarCrossSectionSignatureRepresentationIndex; - dataStream >> _numberOfPropulsionSystems; - dataStream >> _numberOfVectoringNozzleSystems; +void SeesPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _orginatingEntityID.unmarshal(dataStream); + dataStream >> _infraredSignatureRepresentationIndex; + dataStream >> _acousticSignatureRepresentationIndex; + dataStream >> _radarCrossSectionSignatureRepresentationIndex; + dataStream >> _numberOfPropulsionSystems; + dataStream >> _numberOfVectoringNozzleSystems; - _propulsionSystemData.clear(); - for(size_t idx = 0; idx < _numberOfPropulsionSystems; idx++) - { - PropulsionSystemData x; - x.unmarshal(dataStream); - _propulsionSystemData.push_back(x); - } + _propulsionSystemData.clear(); + for (size_t idx = 0; idx < _numberOfPropulsionSystems; idx++) { + PropulsionSystemData x; + x.unmarshal(dataStream); + _propulsionSystemData.push_back(x); + } - _vectoringSystemData.clear(); - for(size_t idx = 0; idx < _numberOfVectoringNozzleSystems; idx++) - { - VectoringNozzleSystemData x; - x.unmarshal(dataStream); - _vectoringSystemData.push_back(x); - } + _vectoringSystemData.clear(); + for (size_t idx = 0; idx < _numberOfVectoringNozzleSystems; idx++) { + VectoringNozzleSystemData x; + x.unmarshal(dataStream); + _vectoringSystemData.push_back(x); + } } +bool SeesPdu::operator==(const SeesPdu& rhs) const { + bool ivarsEqual = true; -bool SeesPdu::operator ==(const SeesPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - - if( ! (_orginatingEntityID == rhs._orginatingEntityID) ) ivarsEqual = false; - if( ! (_infraredSignatureRepresentationIndex == rhs._infraredSignatureRepresentationIndex) ) ivarsEqual = false; - if( ! (_acousticSignatureRepresentationIndex == rhs._acousticSignatureRepresentationIndex) ) ivarsEqual = false; - if( ! (_radarCrossSectionSignatureRepresentationIndex == rhs._radarCrossSectionSignatureRepresentationIndex) ) ivarsEqual = false; + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _propulsionSystemData.size(); idx++) - { - if( ! ( _propulsionSystemData[idx] == rhs._propulsionSystemData[idx]) ) ivarsEqual = false; - } + if (!(_orginatingEntityID == rhs._orginatingEntityID)) ivarsEqual = false; + if (!(_infraredSignatureRepresentationIndex == + rhs._infraredSignatureRepresentationIndex)) + ivarsEqual = false; + if (!(_acousticSignatureRepresentationIndex == + rhs._acousticSignatureRepresentationIndex)) + ivarsEqual = false; + if (!(_radarCrossSectionSignatureRepresentationIndex == + rhs._radarCrossSectionSignatureRepresentationIndex)) + ivarsEqual = false; + for (size_t idx = 0; idx < _propulsionSystemData.size(); idx++) { + if (!(_propulsionSystemData[idx] == rhs._propulsionSystemData[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _vectoringSystemData.size(); idx++) - { - if( ! ( _vectoringSystemData[idx] == rhs._vectoringSystemData[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int SeesPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID - marshalSize = marshalSize + 2; // _infraredSignatureRepresentationIndex - marshalSize = marshalSize + 2; // _acousticSignatureRepresentationIndex - marshalSize = marshalSize + 2; // _radarCrossSectionSignatureRepresentationIndex - marshalSize = marshalSize + 2; // _numberOfPropulsionSystems - marshalSize = marshalSize + 2; // _numberOfVectoringNozzleSystems - - for(unsigned long long idx=0; idx < _propulsionSystemData.size(); idx++) - { - PropulsionSystemData listElement = _propulsionSystemData[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (size_t idx = 0; idx < _vectoringSystemData.size(); idx++) { + if (!(_vectoringSystemData[idx] == rhs._vectoringSystemData[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _vectoringSystemData.size(); idx++) - { - VectoringNozzleSystemData listElement = _vectoringSystemData[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int SeesPdu::getMarshalledSize() const { + int marshalSize = 0; - return marshalSize; + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID + marshalSize = marshalSize + 2; // _infraredSignatureRepresentationIndex + marshalSize = marshalSize + 2; // _acousticSignatureRepresentationIndex + marshalSize = + marshalSize + 2; // _radarCrossSectionSignatureRepresentationIndex + marshalSize = marshalSize + 2; // _numberOfPropulsionSystems + marshalSize = marshalSize + 2; // _numberOfVectoringNozzleSystems + + for (unsigned long long idx = 0; idx < _propulsionSystemData.size(); idx++) { + PropulsionSystemData listElement = _propulsionSystemData[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _vectoringSystemData.size(); idx++) { + VectoringNozzleSystemData listElement = _vectoringSystemData[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -229,7 +208,7 @@ int SeesPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SeesPdu.h b/src/dis6/SeesPdu.h index 1d1c5d57..0d87ea40 100644 --- a/src/dis6/SeesPdu.h +++ b/src/dis6/SeesPdu.h @@ -1,94 +1,92 @@ #pragma once +#include + +#include #include #include #include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.7.5. SEES PDU, supplemental emissions entity state information. +// COMPLETE -namespace DIS -{ -// Section 5.3.7.5. SEES PDU, supplemental emissions entity state information. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu { + protected: /** Originating entity ID */ - EntityID _orginatingEntityID; + EntityID _orginatingEntityID; /** IR Signature representation index */ - unsigned short _infraredSignatureRepresentationIndex; + unsigned short _infraredSignatureRepresentationIndex; /** acoustic Signature representation index */ - unsigned short _acousticSignatureRepresentationIndex; + unsigned short _acousticSignatureRepresentationIndex; /** radar cross section representation index */ - unsigned short _radarCrossSectionSignatureRepresentationIndex; + unsigned short _radarCrossSectionSignatureRepresentationIndex; /** how many propulsion systems */ - unsigned short _numberOfPropulsionSystems; + unsigned short _numberOfPropulsionSystems; /** how many vectoring nozzle systems */ - unsigned short _numberOfVectoringNozzleSystems; + unsigned short _numberOfVectoringNozzleSystems; /** variable length list of propulsion system data */ - std::vector _propulsionSystemData; + std::vector _propulsionSystemData; /** variable length list of vectoring system data */ - std::vector _vectoringSystemData; - + std::vector _vectoringSystemData; public: - SeesPdu(); - virtual ~SeesPdu(); + SeesPdu(); + virtual ~SeesPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOrginatingEntityID(); - const EntityID& getOrginatingEntityID() const; - void setOrginatingEntityID(const EntityID &pX); + EntityID& getOrginatingEntityID(); + const EntityID& getOrginatingEntityID() const; + void setOrginatingEntityID(const EntityID& pX); - unsigned short getInfraredSignatureRepresentationIndex() const; - void setInfraredSignatureRepresentationIndex(unsigned short pX); + unsigned short getInfraredSignatureRepresentationIndex() const; + void setInfraredSignatureRepresentationIndex(unsigned short pX); - unsigned short getAcousticSignatureRepresentationIndex() const; - void setAcousticSignatureRepresentationIndex(unsigned short pX); + unsigned short getAcousticSignatureRepresentationIndex() const; + void setAcousticSignatureRepresentationIndex(unsigned short pX); - unsigned short getRadarCrossSectionSignatureRepresentationIndex() const; - void setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX); + unsigned short getRadarCrossSectionSignatureRepresentationIndex() const; + void setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX); - unsigned short getNumberOfPropulsionSystems() const; + unsigned short getNumberOfPropulsionSystems() const; - unsigned short getNumberOfVectoringNozzleSystems() const; + unsigned short getNumberOfVectoringNozzleSystems() const; - std::vector& getPropulsionSystemData(); - const std::vector& getPropulsionSystemData() const; - void setPropulsionSystemData(const std::vector& pX); + std::vector& getPropulsionSystemData(); + const std::vector& getPropulsionSystemData() const; + void setPropulsionSystemData(const std::vector& pX); - std::vector& getVectoringSystemData(); - const std::vector& getVectoringSystemData() const; - void setVectoringSystemData(const std::vector& pX); + std::vector& getVectoringSystemData(); + const std::vector& getVectoringSystemData() const; + void setVectoringSystemData(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SeesPdu& rhs) const; + bool operator==(const SeesPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -101,7 +99,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ServiceRequestPdu.cpp b/src/dis6/ServiceRequestPdu.cpp index 2a47f0ae..13d11050 100644 --- a/src/dis6/ServiceRequestPdu.cpp +++ b/src/dis6/ServiceRequestPdu.cpp @@ -2,173 +2,149 @@ using namespace DIS; - -ServiceRequestPdu::ServiceRequestPdu() : LogisticsFamilyPdu(), - _requestingEntityID(), - _servicingEntityID(), - _serviceTypeRequested(0), - _numberOfSupplyTypes(0), - _serviceRequestPadding(0) -{ - setPduType( 5 ); +ServiceRequestPdu::ServiceRequestPdu() + : LogisticsFamilyPdu(), + _requestingEntityID(), + _servicingEntityID(), + _serviceTypeRequested(0), + _numberOfSupplyTypes(0), + _serviceRequestPadding(0) { + setPduType(5); } -ServiceRequestPdu::~ServiceRequestPdu() -{ - _supplies.clear(); -} +ServiceRequestPdu::~ServiceRequestPdu() { _supplies.clear(); } -EntityID& ServiceRequestPdu::getRequestingEntityID() -{ - return _requestingEntityID; +EntityID& ServiceRequestPdu::getRequestingEntityID() { + return _requestingEntityID; } -const EntityID& ServiceRequestPdu::getRequestingEntityID() const -{ - return _requestingEntityID; +const EntityID& ServiceRequestPdu::getRequestingEntityID() const { + return _requestingEntityID; } -void ServiceRequestPdu::setRequestingEntityID(const EntityID &pX) -{ - _requestingEntityID = pX; +void ServiceRequestPdu::setRequestingEntityID(const EntityID& pX) { + _requestingEntityID = pX; } -EntityID& ServiceRequestPdu::getServicingEntityID() -{ - return _servicingEntityID; +EntityID& ServiceRequestPdu::getServicingEntityID() { + return _servicingEntityID; } -const EntityID& ServiceRequestPdu::getServicingEntityID() const -{ - return _servicingEntityID; +const EntityID& ServiceRequestPdu::getServicingEntityID() const { + return _servicingEntityID; } -void ServiceRequestPdu::setServicingEntityID(const EntityID &pX) -{ - _servicingEntityID = pX; +void ServiceRequestPdu::setServicingEntityID(const EntityID& pX) { + _servicingEntityID = pX; } -unsigned char ServiceRequestPdu::getServiceTypeRequested() const -{ - return _serviceTypeRequested; +unsigned char ServiceRequestPdu::getServiceTypeRequested() const { + return _serviceTypeRequested; } -void ServiceRequestPdu::setServiceTypeRequested(unsigned char pX) -{ - _serviceTypeRequested = pX; +void ServiceRequestPdu::setServiceTypeRequested(unsigned char pX) { + _serviceTypeRequested = pX; } -unsigned char ServiceRequestPdu::getNumberOfSupplyTypes() const -{ - return _supplies.size(); +unsigned char ServiceRequestPdu::getNumberOfSupplyTypes() const { + return _supplies.size(); } -short ServiceRequestPdu::getServiceRequestPadding() const -{ - return _serviceRequestPadding; +short ServiceRequestPdu::getServiceRequestPadding() const { + return _serviceRequestPadding; } -void ServiceRequestPdu::setServiceRequestPadding(short pX) -{ - _serviceRequestPadding = pX; +void ServiceRequestPdu::setServiceRequestPadding(short pX) { + _serviceRequestPadding = pX; } -std::vector& ServiceRequestPdu::getSupplies() -{ - return _supplies; +std::vector& ServiceRequestPdu::getSupplies() { + return _supplies; } -const std::vector& ServiceRequestPdu::getSupplies() const -{ - return _supplies; +const std::vector& ServiceRequestPdu::getSupplies() const { + return _supplies; } -void ServiceRequestPdu::setSupplies(const std::vector& pX) -{ - _supplies = pX; +void ServiceRequestPdu::setSupplies(const std::vector& pX) { + _supplies = pX; } -void ServiceRequestPdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _requestingEntityID.marshal(dataStream); - _servicingEntityID.marshal(dataStream); - dataStream << _serviceTypeRequested; - dataStream << ( unsigned char )_supplies.size(); - dataStream << _serviceRequestPadding; - - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - SupplyQuantity x = _supplies[idx]; - x.marshal(dataStream); - } +void ServiceRequestPdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _requestingEntityID.marshal(dataStream); + _servicingEntityID.marshal(dataStream); + dataStream << _serviceTypeRequested; + dataStream << (unsigned char)_supplies.size(); + dataStream << _serviceRequestPadding; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity x = _supplies[idx]; + x.marshal(dataStream); + } } -void ServiceRequestPdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _requestingEntityID.unmarshal(dataStream); - _servicingEntityID.unmarshal(dataStream); - dataStream >> _serviceTypeRequested; - dataStream >> _numberOfSupplyTypes; - dataStream >> _serviceRequestPadding; +void ServiceRequestPdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _requestingEntityID.unmarshal(dataStream); + _servicingEntityID.unmarshal(dataStream); + dataStream >> _serviceTypeRequested; + dataStream >> _numberOfSupplyTypes; + dataStream >> _serviceRequestPadding; - _supplies.clear(); - for(size_t idx = 0; idx < _numberOfSupplyTypes; idx++) - { - SupplyQuantity x; - x.unmarshal(dataStream); - _supplies.push_back(x); - } + _supplies.clear(); + for (size_t idx = 0; idx < _numberOfSupplyTypes; idx++) { + SupplyQuantity x; + x.unmarshal(dataStream); + _supplies.push_back(x); + } } +bool ServiceRequestPdu::operator==(const ServiceRequestPdu& rhs) const { + bool ivarsEqual = true; -bool ServiceRequestPdu::operator ==(const ServiceRequestPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); + if (!(_requestingEntityID == rhs._requestingEntityID)) ivarsEqual = false; + if (!(_servicingEntityID == rhs._servicingEntityID)) ivarsEqual = false; + if (!(_serviceTypeRequested == rhs._serviceTypeRequested)) ivarsEqual = false; + if (!(_serviceRequestPadding == rhs._serviceRequestPadding)) + ivarsEqual = false; - if( ! (_requestingEntityID == rhs._requestingEntityID) ) ivarsEqual = false; - if( ! (_servicingEntityID == rhs._servicingEntityID) ) ivarsEqual = false; - if( ! (_serviceTypeRequested == rhs._serviceTypeRequested) ) ivarsEqual = false; - if( ! (_serviceRequestPadding == rhs._serviceRequestPadding) ) ivarsEqual = false; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + if (!(_supplies[idx] == rhs._supplies[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - if( ! ( _supplies[idx] == rhs._supplies[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int ServiceRequestPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ServiceRequestPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _requestingEntityID.getMarshalledSize(); // _requestingEntityID - marshalSize = marshalSize + _servicingEntityID.getMarshalledSize(); // _servicingEntityID - marshalSize = marshalSize + 1; // _serviceTypeRequested - marshalSize = marshalSize + 1; // _numberOfSupplyTypes - marshalSize = marshalSize + 2; // _serviceRequestPadding + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _requestingEntityID.getMarshalledSize(); // _requestingEntityID + marshalSize = marshalSize + + _servicingEntityID.getMarshalledSize(); // _servicingEntityID + marshalSize = marshalSize + 1; // _serviceTypeRequested + marshalSize = marshalSize + 1; // _numberOfSupplyTypes + marshalSize = marshalSize + 2; // _serviceRequestPadding - for(unsigned long long idx=0; idx < _supplies.size(); idx++) - { - SupplyQuantity listElement = _supplies[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity listElement = _supplies[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -181,7 +157,7 @@ int ServiceRequestPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ServiceRequestPdu.h b/src/dis6/ServiceRequestPdu.h index 37712391..517bd750 100644 --- a/src/dis6/ServiceRequestPdu.h +++ b/src/dis6/ServiceRequestPdu.h @@ -1,82 +1,78 @@ #pragma once -#include -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.5.1. Information about a request for supplies. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { + protected: /** Entity that is requesting service */ - EntityID _requestingEntityID; + EntityID _requestingEntityID; /** Entity that is providing the service */ - EntityID _servicingEntityID; + EntityID _servicingEntityID; /** type of service requested */ - unsigned char _serviceTypeRequested; + unsigned char _serviceTypeRequested; /** How many requested */ - unsigned char _numberOfSupplyTypes; + unsigned char _numberOfSupplyTypes; /** padding */ - short _serviceRequestPadding; - - std::vector _supplies; + short _serviceRequestPadding; + std::vector _supplies; public: - ServiceRequestPdu(); - virtual ~ServiceRequestPdu(); + ServiceRequestPdu(); + virtual ~ServiceRequestPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getRequestingEntityID(); - const EntityID& getRequestingEntityID() const; - void setRequestingEntityID(const EntityID &pX); + EntityID& getRequestingEntityID(); + const EntityID& getRequestingEntityID() const; + void setRequestingEntityID(const EntityID& pX); - EntityID& getServicingEntityID(); - const EntityID& getServicingEntityID() const; - void setServicingEntityID(const EntityID &pX); + EntityID& getServicingEntityID(); + const EntityID& getServicingEntityID() const; + void setServicingEntityID(const EntityID& pX); - unsigned char getServiceTypeRequested() const; - void setServiceTypeRequested(unsigned char pX); + unsigned char getServiceTypeRequested() const; + void setServiceTypeRequested(unsigned char pX); - unsigned char getNumberOfSupplyTypes() const; + unsigned char getNumberOfSupplyTypes() const; - short getServiceRequestPadding() const; - void setServiceRequestPadding(short pX); + short getServiceRequestPadding() const; + void setServiceRequestPadding(short pX); - std::vector& getSupplies(); - const std::vector& getSupplies() const; - void setSupplies(const std::vector& pX); + std::vector& getSupplies(); + const std::vector& getSupplies() const; + void setSupplies(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ServiceRequestPdu& rhs) const; + bool operator==(const ServiceRequestPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SetDataPdu.cpp b/src/dis6/SetDataPdu.cpp index 791ff762..21dd1332 100644 --- a/src/dis6/SetDataPdu.cpp +++ b/src/dis6/SetDataPdu.cpp @@ -2,186 +2,146 @@ using namespace DIS; - -SetDataPdu::SetDataPdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _padding1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 19 ); +SetDataPdu::SetDataPdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _padding1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(19); } -SetDataPdu::~SetDataPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +SetDataPdu::~SetDataPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int SetDataPdu::getRequestID() const -{ - return _requestID; -} +unsigned int SetDataPdu::getRequestID() const { return _requestID; } -void SetDataPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void SetDataPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int SetDataPdu::getPadding1() const -{ - return _padding1; -} +unsigned int SetDataPdu::getPadding1() const { return _padding1; } -void SetDataPdu::setPadding1(unsigned int pX) -{ - _padding1 = pX; -} +void SetDataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } -unsigned int SetDataPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int SetDataPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int SetDataPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int SetDataPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& SetDataPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& SetDataPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& SetDataPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& SetDataPdu::getFixedDatums() const { + return _fixedDatums; } -void SetDataPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void SetDataPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& SetDataPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& SetDataPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& SetDataPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& SetDataPdu::getVariableDatums() const { + return _variableDatums; } -void SetDataPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void SetDataPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void SetDataPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _padding1; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void SetDataPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _padding1; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void SetDataPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _padding1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void SetDataPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _padding1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool SetDataPdu::operator ==(const SetDataPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool SetDataPdu::operator==(const SetDataPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int SetDataPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _padding1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int SetDataPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _padding1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +154,7 @@ int SetDataPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SetDataPdu.h b/src/dis6/SetDataPdu.h index 8c2f7716..92fbc715 100644 --- a/src/dis6/SetDataPdu.h +++ b/src/dis6/SetDataPdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.6.9. Change state information with the data contained in this. +// COMPLETE -namespace DIS -{ -// Section 5.3.6.9. Change state information with the data contained in this. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SetDataPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT SetDataPdu : public SimulationManagementFamilyPdu { + protected: /** ID of request */ - unsigned int _requestID; + unsigned int _requestID; /** padding */ - unsigned int _padding1; + unsigned int _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - SetDataPdu(); - virtual ~SetDataPdu(); + SetDataPdu(); + virtual ~SetDataPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + unsigned int getPadding1() const; + void setPadding1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SetDataPdu& rhs) const; + bool operator==(const SetDataPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SetDataReliablePdu.cpp b/src/dis6/SetDataReliablePdu.cpp index 494d1151..b253de94 100644 --- a/src/dis6/SetDataReliablePdu.cpp +++ b/src/dis6/SetDataReliablePdu.cpp @@ -2,216 +2,178 @@ using namespace DIS; - -SetDataReliablePdu::SetDataReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 59 ); +SetDataReliablePdu::SetDataReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(59); } -SetDataReliablePdu::~SetDataReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +SetDataReliablePdu::~SetDataReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned char SetDataReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char SetDataReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void SetDataReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void SetDataReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short SetDataReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short SetDataReliablePdu::getPad1() const { return _pad1; } -void SetDataReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void SetDataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char SetDataReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char SetDataReliablePdu::getPad2() const { return _pad2; } -void SetDataReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void SetDataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int SetDataReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int SetDataReliablePdu::getRequestID() const { return _requestID; } -void SetDataReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void SetDataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int SetDataReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int SetDataReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int SetDataReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int SetDataReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& SetDataReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& SetDataReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& SetDataReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& SetDataReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void SetDataReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void SetDataReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& SetDataReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& SetDataReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& SetDataReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& SetDataReliablePdu::getVariableDatumRecords() + const { + return _variableDatumRecords; } -void SetDataReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void SetDataReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void SetDataReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void SetDataReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void SetDataReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void SetDataReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool SetDataReliablePdu::operator==(const SetDataReliablePdu& rhs) const { + bool ivarsEqual = true; -bool SetDataReliablePdu::operator ==(const SetDataReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } - -int SetDataReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int SetDataReliablePdu::getMarshalledSize() const { + int marshalSize = 0; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -224,7 +186,7 @@ int SetDataReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SetDataReliablePdu.h b/src/dis6/SetDataReliablePdu.h index c496ef67..c9a60a99 100644 --- a/src/dis6/SetDataReliablePdu.h +++ b/src/dis6/SetDataReliablePdu.h @@ -1,92 +1,92 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.9: initializing or chaning internal state information, +// reliable. Needs manual intervention to fix padding on variable datums. +// UNFINISHED -namespace DIS -{ -// Section 5.3.12.9: initializing or chaning internal state information, reliable. Needs manual intervention to fix padding on variable datums. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SetDataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT SetDataReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; + unsigned int _requestID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - SetDataReliablePdu(); - virtual ~SetDataReliablePdu(); + SetDataReliablePdu(); + virtual ~SetDataReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SetDataReliablePdu& rhs) const; + bool operator==(const SetDataReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -99,7 +99,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SetRecordReliablePdu.cpp b/src/dis6/SetRecordReliablePdu.cpp index 98d44c87..5fa4a8a8 100644 --- a/src/dis6/SetRecordReliablePdu.cpp +++ b/src/dis6/SetRecordReliablePdu.cpp @@ -2,163 +2,128 @@ using namespace DIS; - -SetRecordReliablePdu::SetRecordReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requestID(0), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _numberOfRecordSets(0) -{ - setPduType( 64 ); +SetRecordReliablePdu::SetRecordReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requestID(0), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _numberOfRecordSets(0) { + setPduType(64); } -SetRecordReliablePdu::~SetRecordReliablePdu() -{ - _recordSets.clear(); -} +SetRecordReliablePdu::~SetRecordReliablePdu() { _recordSets.clear(); } -unsigned int SetRecordReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int SetRecordReliablePdu::getRequestID() const { return _requestID; } -void SetRecordReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void SetRecordReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned char SetRecordReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char SetRecordReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void SetRecordReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void SetRecordReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short SetRecordReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short SetRecordReliablePdu::getPad1() const { return _pad1; } -void SetRecordReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void SetRecordReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char SetRecordReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char SetRecordReliablePdu::getPad2() const { return _pad2; } -void SetRecordReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void SetRecordReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int SetRecordReliablePdu::getNumberOfRecordSets() const -{ - return _recordSets.size(); +unsigned int SetRecordReliablePdu::getNumberOfRecordSets() const { + return _recordSets.size(); } -std::vector& SetRecordReliablePdu::getRecordSets() -{ - return _recordSets; +std::vector& SetRecordReliablePdu::getRecordSets() { + return _recordSets; } -const std::vector& SetRecordReliablePdu::getRecordSets() const -{ - return _recordSets; +const std::vector& SetRecordReliablePdu::getRecordSets() const { + return _recordSets; } -void SetRecordReliablePdu::setRecordSets(const std::vector& pX) -{ - _recordSets = pX; +void SetRecordReliablePdu::setRecordSets(const std::vector& pX) { + _recordSets = pX; } -void SetRecordReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << ( unsigned int )_recordSets.size(); - - for(size_t idx = 0; idx < _recordSets.size(); idx++) - { - RecordSet x = _recordSets[idx]; - x.marshal(dataStream); - } - -} +void SetRecordReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << (unsigned int)_recordSets.size(); -void SetRecordReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _numberOfRecordSets; - - _recordSets.clear(); - for(size_t idx = 0; idx < _numberOfRecordSets; idx++) - { - RecordSet x; - x.unmarshal(dataStream); - _recordSets.push_back(x); - } + for (size_t idx = 0; idx < _recordSets.size(); idx++) { + RecordSet x = _recordSets[idx]; + x.marshal(dataStream); + } } +void SetRecordReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _numberOfRecordSets; -bool SetRecordReliablePdu::operator ==(const SetRecordReliablePdu& rhs) const - { - bool ivarsEqual = true; + _recordSets.clear(); + for (size_t idx = 0; idx < _numberOfRecordSets; idx++) { + RecordSet x; + x.unmarshal(dataStream); + _recordSets.push_back(x); + } +} - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); +bool SetRecordReliablePdu::operator==(const SetRecordReliablePdu& rhs) const { + bool ivarsEqual = true; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _recordSets.size(); idx++) - { - if( ! ( _recordSets[idx] == rhs._recordSets[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + for (size_t idx = 0; idx < _recordSets.size(); idx++) { + if (!(_recordSets[idx] == rhs._recordSets[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int SetRecordReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int SetRecordReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _numberOfRecordSets + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _numberOfRecordSets - for(unsigned long long idx=0; idx < _recordSets.size(); idx++) - { - RecordSet listElement = _recordSets[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _recordSets.size(); idx++) { + RecordSet listElement = _recordSets[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -171,7 +136,7 @@ int SetRecordReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SetRecordReliablePdu.h b/src/dis6/SetRecordReliablePdu.h index 7ed85078..222295f6 100644 --- a/src/dis6/SetRecordReliablePdu.h +++ b/src/dis6/SetRecordReliablePdu.h @@ -1,79 +1,78 @@ #pragma once -#include #include + +#include #include -#include #include +#include +namespace DIS { +// Section 5.3.12.14: Initializing or changing internal parameter info. Needs +// manual intervention to fix padding in recrod set PDUs. UNFINISHED -namespace DIS -{ -// Section 5.3.12.14: Initializing or changing internal parameter info. Needs manual intervention to fix padding in recrod set PDUs. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SetRecordReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT SetRecordReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Number of record sets in list */ - unsigned int _numberOfRecordSets; + unsigned int _numberOfRecordSets; /** record sets */ - std::vector _recordSets; - + std::vector _recordSets; public: - SetRecordReliablePdu(); - virtual ~SetRecordReliablePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + SetRecordReliablePdu(); + virtual ~SetRecordReliablePdu(); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned int getNumberOfRecordSets() const; + unsigned char getPad2() const; + void setPad2(unsigned char pX); - std::vector& getRecordSets(); - const std::vector& getRecordSets() const; - void setRecordSets(const std::vector& pX); + unsigned int getNumberOfRecordSets() const; + std::vector& getRecordSets(); + const std::vector& getRecordSets() const; + void setRecordSets(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const SetRecordReliablePdu& rhs) const; + bool operator==(const SetRecordReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -86,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ShaftRPMs.cpp b/src/dis6/ShaftRPMs.cpp index b1c06112..2e757fc6 100644 --- a/src/dis6/ShaftRPMs.cpp +++ b/src/dis6/ShaftRPMs.cpp @@ -2,89 +2,63 @@ using namespace DIS; +ShaftRPMs::ShaftRPMs() + : _currentShaftRPMs(0), _orderedShaftRPMs(0), _shaftRPMRateOfChange(0.0) {} -ShaftRPMs::ShaftRPMs(): - _currentShaftRPMs(0), - _orderedShaftRPMs(0), - _shaftRPMRateOfChange(0.0) -{ -} +ShaftRPMs::~ShaftRPMs() {} -ShaftRPMs::~ShaftRPMs() -{ -} +short ShaftRPMs::getCurrentShaftRPMs() const { return _currentShaftRPMs; } -short ShaftRPMs::getCurrentShaftRPMs() const -{ - return _currentShaftRPMs; -} +void ShaftRPMs::setCurrentShaftRPMs(short pX) { _currentShaftRPMs = pX; } -void ShaftRPMs::setCurrentShaftRPMs(short pX) -{ - _currentShaftRPMs = pX; -} +short ShaftRPMs::getOrderedShaftRPMs() const { return _orderedShaftRPMs; } -short ShaftRPMs::getOrderedShaftRPMs() const -{ - return _orderedShaftRPMs; -} +void ShaftRPMs::setOrderedShaftRPMs(short pX) { _orderedShaftRPMs = pX; } -void ShaftRPMs::setOrderedShaftRPMs(short pX) -{ - _orderedShaftRPMs = pX; +float ShaftRPMs::getShaftRPMRateOfChange() const { + return _shaftRPMRateOfChange; } -float ShaftRPMs::getShaftRPMRateOfChange() const -{ - return _shaftRPMRateOfChange; +void ShaftRPMs::setShaftRPMRateOfChange(float pX) { + _shaftRPMRateOfChange = pX; } -void ShaftRPMs::setShaftRPMRateOfChange(float pX) -{ - _shaftRPMRateOfChange = pX; +void ShaftRPMs::marshal(DataStream& dataStream) const { + dataStream << _currentShaftRPMs; + dataStream << _orderedShaftRPMs; + dataStream << _shaftRPMRateOfChange; } -void ShaftRPMs::marshal(DataStream& dataStream) const -{ - dataStream << _currentShaftRPMs; - dataStream << _orderedShaftRPMs; - dataStream << _shaftRPMRateOfChange; -} - -void ShaftRPMs::unmarshal(DataStream& dataStream) -{ - dataStream >> _currentShaftRPMs; - dataStream >> _orderedShaftRPMs; - dataStream >> _shaftRPMRateOfChange; +void ShaftRPMs::unmarshal(DataStream& dataStream) { + dataStream >> _currentShaftRPMs; + dataStream >> _orderedShaftRPMs; + dataStream >> _shaftRPMRateOfChange; } +bool ShaftRPMs::operator==(const ShaftRPMs& rhs) const { + bool ivarsEqual = true; -bool ShaftRPMs::operator ==(const ShaftRPMs& rhs) const - { - bool ivarsEqual = true; + if (!(_currentShaftRPMs == rhs._currentShaftRPMs)) ivarsEqual = false; + if (!(_orderedShaftRPMs == rhs._orderedShaftRPMs)) ivarsEqual = false; + if (!(_shaftRPMRateOfChange == rhs._shaftRPMRateOfChange)) ivarsEqual = false; - if( ! (_currentShaftRPMs == rhs._currentShaftRPMs) ) ivarsEqual = false; - if( ! (_orderedShaftRPMs == rhs._orderedShaftRPMs) ) ivarsEqual = false; - if( ! (_shaftRPMRateOfChange == rhs._shaftRPMRateOfChange) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ShaftRPMs::getMarshalledSize() const -{ - int marshalSize = 0; +int ShaftRPMs::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _currentShaftRPMs - marshalSize = marshalSize + 2; // _orderedShaftRPMs - marshalSize = marshalSize + 4; // _shaftRPMRateOfChange - return marshalSize; + marshalSize = marshalSize + 2; // _currentShaftRPMs + marshalSize = marshalSize + 2; // _orderedShaftRPMs + marshalSize = marshalSize + 4; // _shaftRPMRateOfChange + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +71,7 @@ int ShaftRPMs::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/ShaftRPMs.h b/src/dis6/ShaftRPMs.h index eed83091..55745d2a 100644 --- a/src/dis6/ShaftRPMs.h +++ b/src/dis6/ShaftRPMs.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Shaft RPMs, used in underwater acoustic clacluations. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT ShaftRPMs -{ -protected: +class OPENDIS6_EXPORT ShaftRPMs { + protected: /** Current shaft RPMs */ - short _currentShaftRPMs; + short _currentShaftRPMs; /** ordered shaft rpms */ - short _orderedShaftRPMs; + short _orderedShaftRPMs; /** rate of change of shaft RPMs */ - float _shaftRPMRateOfChange; - + float _shaftRPMRateOfChange; public: - ShaftRPMs(); - virtual ~ShaftRPMs(); + ShaftRPMs(); + virtual ~ShaftRPMs(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - short getCurrentShaftRPMs() const; - void setCurrentShaftRPMs(short pX); + short getCurrentShaftRPMs() const; + void setCurrentShaftRPMs(short pX); - short getOrderedShaftRPMs() const; - void setOrderedShaftRPMs(short pX); + short getOrderedShaftRPMs() const; + void setOrderedShaftRPMs(short pX); - float getShaftRPMRateOfChange() const; - void setShaftRPMRateOfChange(float pX); + float getShaftRPMRateOfChange() const; + void setShaftRPMRateOfChange(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ShaftRPMs& rhs) const; + bool operator==(const ShaftRPMs& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SignalPdu.cpp b/src/dis6/SignalPdu.cpp index 57ef309e..2eecad3d 100644 --- a/src/dis6/SignalPdu.cpp +++ b/src/dis6/SignalPdu.cpp @@ -3,8 +3,12 @@ using namespace DIS; SignalPdu::SignalPdu() - : RadioCommunicationsFamilyPdu(), _encodingScheme(0), _tdlType(0), - _sampleRate(0), _dataLength(0), _samples(0) { + : RadioCommunicationsFamilyPdu(), + _encodingScheme(0), + _tdlType(0), + _sampleRate(0), + _dataLength(0), + _samples(0) { setPduType(26); } @@ -28,15 +32,15 @@ short SignalPdu::getSamples() const { return _samples; } void SignalPdu::setSamples(short pX) { _samples = pX; } -std::vector &SignalPdu::getData() { return _data; } +std::vector& SignalPdu::getData() { return _data; } -const std::vector &SignalPdu::getData() const { return _data; } +const std::vector& SignalPdu::getData() const { return _data; } -void SignalPdu::setData(const std::vector &pX) { _data = pX; } +void SignalPdu::setData(const std::vector& pX) { _data = pX; } -void SignalPdu::marshal(DataStream &dataStream) const { +void SignalPdu::marshal(DataStream& dataStream) const { RadioCommunicationsFamilyPdu::marshal( - dataStream); // Marshal information in superclass first + dataStream); // Marshal information in superclass first dataStream << _encodingScheme; dataStream << _tdlType; dataStream << _sampleRate; @@ -47,9 +51,9 @@ void SignalPdu::marshal(DataStream &dataStream) const { } } -void SignalPdu::unmarshal(DataStream &dataStream) { +void SignalPdu::unmarshal(DataStream& dataStream) { RadioCommunicationsFamilyPdu::unmarshal( - dataStream); // unmarshal information in superclass first + dataStream); // unmarshal information in superclass first dataStream >> _encodingScheme; dataStream >> _tdlType; dataStream >> _sampleRate; @@ -64,7 +68,7 @@ void SignalPdu::unmarshal(DataStream &dataStream) { } } -bool SignalPdu::operator==(const SignalPdu &rhs) const { +bool SignalPdu::operator==(const SignalPdu& rhs) const { auto ivarsEqual = true; ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs) && @@ -79,11 +83,11 @@ int SignalPdu::getMarshalledSize() const { auto marshalSize = 0; marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); - marshalSize += 2; // _encodingScheme - marshalSize += 2; // _tdlType - marshalSize += 4; // _sampleRate - marshalSize += 2; // _dataLength - marshalSize += 2; // _samples + marshalSize += 2; // _encodingScheme + marshalSize += 2; // _tdlType + marshalSize += 4; // _sampleRate + marshalSize += 2; // _dataLength + marshalSize += 2; // _samples marshalSize += _data.size(); return marshalSize; diff --git a/src/dis6/SignalPdu.h b/src/dis6/SignalPdu.h index a0ee3889..f6f9202d 100644 --- a/src/dis6/SignalPdu.h +++ b/src/dis6/SignalPdu.h @@ -1,10 +1,11 @@ #pragma once +#include +#include + #include "dis6/RadioCommunicationsFamilyPdu.h" #include "dis6/opendis6_export.h" #include "dis6/utils/DataStream.h" -#include -#include namespace DIS { // Section 5.3.8.2. Detailed information about a radio transmitter. This PDU @@ -18,7 +19,7 @@ namespace DIS { // @author DMcG, jkg class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { -protected: + protected: /** encoding scheme used, and enumeration */ unsigned short _encodingScheme; @@ -37,12 +38,12 @@ class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { /** list of eight bit values */ std::vector _data; -public: + public: SignalPdu(); virtual ~SignalPdu(); - virtual void marshal(DataStream &dataStream) const; - virtual void unmarshal(DataStream &dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); unsigned short getEncodingScheme() const; void setEncodingScheme(unsigned short pX); @@ -58,15 +59,15 @@ class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { short getSamples() const; void setSamples(short pX); - std::vector &getData(); - const std::vector &getData() const; - void setData(const std::vector &pX); + std::vector& getData(); + const std::vector& getData() const; + void setData(const std::vector& pX); virtual int getMarshalledSize() const; - bool operator==(const SignalPdu &rhs) const; + bool operator==(const SignalPdu& rhs) const; }; -} // namespace DIS +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/SimulationAddress.cpp b/src/dis6/SimulationAddress.cpp index ef20c1b6..be8258bf 100644 --- a/src/dis6/SimulationAddress.cpp +++ b/src/dis6/SimulationAddress.cpp @@ -2,74 +2,52 @@ using namespace DIS; +SimulationAddress::SimulationAddress() : _site(0), _application(0) {} -SimulationAddress::SimulationAddress(): - _site(0), - _application(0) -{ -} - -SimulationAddress::~SimulationAddress() -{ -} +SimulationAddress::~SimulationAddress() {} -unsigned short SimulationAddress::getSite() const -{ - return _site; -} +unsigned short SimulationAddress::getSite() const { return _site; } -void SimulationAddress::setSite(unsigned short pX) -{ - _site = pX; -} +void SimulationAddress::setSite(unsigned short pX) { _site = pX; } -unsigned short SimulationAddress::getApplication() const -{ - return _application; +unsigned short SimulationAddress::getApplication() const { + return _application; } -void SimulationAddress::setApplication(unsigned short pX) -{ - _application = pX; -} +void SimulationAddress::setApplication(unsigned short pX) { _application = pX; } -void SimulationAddress::marshal(DataStream& dataStream) const -{ - dataStream << _site; - dataStream << _application; +void SimulationAddress::marshal(DataStream& dataStream) const { + dataStream << _site; + dataStream << _application; } -void SimulationAddress::unmarshal(DataStream& dataStream) -{ - dataStream >> _site; - dataStream >> _application; +void SimulationAddress::unmarshal(DataStream& dataStream) { + dataStream >> _site; + dataStream >> _application; } +bool SimulationAddress::operator==(const SimulationAddress& rhs) const { + bool ivarsEqual = true; -bool SimulationAddress::operator ==(const SimulationAddress& rhs) const - { - bool ivarsEqual = true; + if (!(_site == rhs._site)) ivarsEqual = false; + if (!(_application == rhs._application)) ivarsEqual = false; - if( ! (_site == rhs._site) ) ivarsEqual = false; - if( ! (_application == rhs._application) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationAddress::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationAddress::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - return marshalSize; + marshalSize = marshalSize + 2; // _site + marshalSize = marshalSize + 2; // _application + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +60,7 @@ int SimulationAddress::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SimulationAddress.h b/src/dis6/SimulationAddress.h index e26f0577..8210adee 100644 --- a/src/dis6/SimulationAddress.h +++ b/src/dis6/SimulationAddress.h @@ -1,52 +1,49 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.14.1. A Simulation Address record shall consist of the Site +// Identification number and the Application Identification number. -namespace DIS -{ -// Section 5.2.14.1. A Simulation Address record shall consist of the Site Identification number and the Application Identification number. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SimulationAddress -{ -protected: +class OPENDIS6_EXPORT SimulationAddress { + protected: /** The site ID */ - unsigned short _site; + unsigned short _site; /** The application ID */ - unsigned short _application; - + unsigned short _application; public: - SimulationAddress(); - virtual ~SimulationAddress(); + SimulationAddress(); + virtual ~SimulationAddress(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + unsigned short getSite() const; + void setSite(unsigned short pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + unsigned short getApplication() const; + void setApplication(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SimulationAddress& rhs) const; + bool operator==(const SimulationAddress& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +56,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SimulationManagementFamilyPdu.cpp b/src/dis6/SimulationManagementFamilyPdu.cpp index 31417b1b..74feb4ef 100644 --- a/src/dis6/SimulationManagementFamilyPdu.cpp +++ b/src/dis6/SimulationManagementFamilyPdu.cpp @@ -2,90 +2,78 @@ using namespace DIS; - -SimulationManagementFamilyPdu::SimulationManagementFamilyPdu() : Pdu(), - _originatingEntityID(), - _receivingEntityID() -{ - setProtocolFamily( 5 ); +SimulationManagementFamilyPdu::SimulationManagementFamilyPdu() + : Pdu(), _originatingEntityID(), _receivingEntityID() { + setProtocolFamily(5); } -SimulationManagementFamilyPdu::~SimulationManagementFamilyPdu() -{ -} +SimulationManagementFamilyPdu::~SimulationManagementFamilyPdu() {} -EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() -{ - return _originatingEntityID; +EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() { + return _originatingEntityID; } -const EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() const -{ - return _originatingEntityID; +const EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() const { + return _originatingEntityID; } -void SimulationManagementFamilyPdu::setOriginatingEntityID(const EntityID &pX) -{ - _originatingEntityID = pX; +void SimulationManagementFamilyPdu::setOriginatingEntityID(const EntityID& pX) { + _originatingEntityID = pX; } -EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void SimulationManagementFamilyPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void SimulationManagementFamilyPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -void SimulationManagementFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _originatingEntityID.marshal(dataStream); - _receivingEntityID.marshal(dataStream); +void SimulationManagementFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _originatingEntityID.marshal(dataStream); + _receivingEntityID.marshal(dataStream); } -void SimulationManagementFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingEntityID.unmarshal(dataStream); - _receivingEntityID.unmarshal(dataStream); +void SimulationManagementFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _originatingEntityID.unmarshal(dataStream); + _receivingEntityID.unmarshal(dataStream); } +bool SimulationManagementFamilyPdu::operator==( + const SimulationManagementFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool SimulationManagementFamilyPdu::operator ==(const SimulationManagementFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); + if (!(_originatingEntityID == rhs._originatingEntityID)) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; - if( ! (_originatingEntityID == rhs._originatingEntityID) ) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationManagementFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationManagementFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingEntityID.getMarshalledSize(); // _originatingEntityID - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = + marshalSize + + _originatingEntityID.getMarshalledSize(); // _originatingEntityID + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +86,7 @@ int SimulationManagementFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SimulationManagementFamilyPdu.h b/src/dis6/SimulationManagementFamilyPdu.h index 380f47e6..ac97aa5e 100644 --- a/src/dis6/SimulationManagementFamilyPdu.h +++ b/src/dis6/SimulationManagementFamilyPdu.h @@ -1,57 +1,53 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// Section 5.3.6. Abstract superclass for PDUs relating to the simulation +// itself. COMPLETE -namespace DIS -{ -// Section 5.3.6. Abstract superclass for PDUs relating to the simulation itself. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SimulationManagementFamilyPdu : public Pdu -{ -protected: +class OPENDIS6_EXPORT SimulationManagementFamilyPdu : public Pdu { + protected: /** Entity that is sending message */ - EntityID _originatingEntityID; + EntityID _originatingEntityID; /** Entity that is intended to receive message */ - EntityID _receivingEntityID; - + EntityID _receivingEntityID; public: - SimulationManagementFamilyPdu(); - virtual ~SimulationManagementFamilyPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + SimulationManagementFamilyPdu(); + virtual ~SimulationManagementFamilyPdu(); - EntityID& getOriginatingEntityID(); - const EntityID& getOriginatingEntityID() const; - void setOriginatingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getOriginatingEntityID(); + const EntityID& getOriginatingEntityID() const; + void setOriginatingEntityID(const EntityID& pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const SimulationManagementFamilyPdu& rhs) const; + bool operator==(const SimulationManagementFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp index ce3624a3..870bed47 100644 --- a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp +++ b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp @@ -2,90 +2,87 @@ using namespace DIS; - -SimulationManagementWithReliabilityFamilyPdu::SimulationManagementWithReliabilityFamilyPdu() : Pdu(), - _originatingEntityID(), - _receivingEntityID() -{ - setProtocolFamily( 10 ); +SimulationManagementWithReliabilityFamilyPdu:: + SimulationManagementWithReliabilityFamilyPdu() + : Pdu(), _originatingEntityID(), _receivingEntityID() { + setProtocolFamily(10); } -SimulationManagementWithReliabilityFamilyPdu::~SimulationManagementWithReliabilityFamilyPdu() -{ -} +SimulationManagementWithReliabilityFamilyPdu:: + ~SimulationManagementWithReliabilityFamilyPdu() {} -EntityID& SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() -{ - return _originatingEntityID; +EntityID& +SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() { + return _originatingEntityID; } -const EntityID& SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() const -{ - return _originatingEntityID; +const EntityID& +SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() const { + return _originatingEntityID; } -void SimulationManagementWithReliabilityFamilyPdu::setOriginatingEntityID(const EntityID &pX) -{ - _originatingEntityID = pX; +void SimulationManagementWithReliabilityFamilyPdu::setOriginatingEntityID( + const EntityID& pX) { + _originatingEntityID = pX; } -EntityID& SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& +SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void SimulationManagementWithReliabilityFamilyPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void SimulationManagementWithReliabilityFamilyPdu::setReceivingEntityID( + const EntityID& pX) { + _receivingEntityID = pX; } -void SimulationManagementWithReliabilityFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _originatingEntityID.marshal(dataStream); - _receivingEntityID.marshal(dataStream); +void SimulationManagementWithReliabilityFamilyPdu::marshal( + DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _originatingEntityID.marshal(dataStream); + _receivingEntityID.marshal(dataStream); } -void SimulationManagementWithReliabilityFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingEntityID.unmarshal(dataStream); - _receivingEntityID.unmarshal(dataStream); +void SimulationManagementWithReliabilityFamilyPdu::unmarshal( + DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _originatingEntityID.unmarshal(dataStream); + _receivingEntityID.unmarshal(dataStream); } +bool SimulationManagementWithReliabilityFamilyPdu::operator==( + const SimulationManagementWithReliabilityFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool SimulationManagementWithReliabilityFamilyPdu::operator ==(const SimulationManagementWithReliabilityFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); + if (!(_originatingEntityID == rhs._originatingEntityID)) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; - if( ! (_originatingEntityID == rhs._originatingEntityID) ) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingEntityID.getMarshalledSize(); // _originatingEntityID - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = + marshalSize + + _originatingEntityID.getMarshalledSize(); // _originatingEntityID + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +95,7 @@ int SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h index b4c8aff2..7c2252ab 100644 --- a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h +++ b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h @@ -1,57 +1,54 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12: Abstract superclass for reliable simulation management PDUs -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SimulationManagementWithReliabilityFamilyPdu : public Pdu -{ -protected: +class OPENDIS6_EXPORT SimulationManagementWithReliabilityFamilyPdu + : public Pdu { + protected: /** Object originatig the request */ - EntityID _originatingEntityID; + EntityID _originatingEntityID; /** Object with which this point object is associated */ - EntityID _receivingEntityID; - + EntityID _receivingEntityID; public: - SimulationManagementWithReliabilityFamilyPdu(); - virtual ~SimulationManagementWithReliabilityFamilyPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + SimulationManagementWithReliabilityFamilyPdu(); + virtual ~SimulationManagementWithReliabilityFamilyPdu(); - EntityID& getOriginatingEntityID(); - const EntityID& getOriginatingEntityID() const; - void setOriginatingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getOriginatingEntityID(); + const EntityID& getOriginatingEntityID() const; + void setOriginatingEntityID(const EntityID& pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const SimulationManagementWithReliabilityFamilyPdu& rhs) const; + bool operator==( + const SimulationManagementWithReliabilityFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SixByteChunk.cpp b/src/dis6/SixByteChunk.cpp index e6aaf57c..f175d33f 100644 --- a/src/dis6/SixByteChunk.cpp +++ b/src/dis6/SixByteChunk.cpp @@ -2,87 +2,63 @@ using namespace DIS; - -SixByteChunk::SixByteChunk() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 6; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +SixByteChunk::SixByteChunk() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 6; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -SixByteChunk::~SixByteChunk() -{ -} +SixByteChunk::~SixByteChunk() {} -char* SixByteChunk::getOtherParameters() -{ - return _otherParameters; -} +char* SixByteChunk::getOtherParameters() { return _otherParameters; } -const char* SixByteChunk::getOtherParameters() const -{ - return _otherParameters; +const char* SixByteChunk::getOtherParameters() const { + return _otherParameters; } -void SixByteChunk::setOtherParameters(const char* x) -{ - for(int i = 0; i < 6; i++) - { - _otherParameters[i] = x[i]; - } +void SixByteChunk::setOtherParameters(const char* x) { + for (int i = 0; i < 6; i++) { + _otherParameters[i] = x[i]; + } } -void SixByteChunk::marshal(DataStream& dataStream) const -{ - - for(size_t idx = 0; idx < 6; idx++) - { - dataStream << _otherParameters[idx]; - } - +void SixByteChunk::marshal(DataStream& dataStream) const { + for (size_t idx = 0; idx < 6; idx++) { + dataStream << _otherParameters[idx]; + } } -void SixByteChunk::unmarshal(DataStream& dataStream) -{ - - for(size_t idx = 0; idx < 6; idx++) - { - dataStream >> _otherParameters[idx]; - } - +void SixByteChunk::unmarshal(DataStream& dataStream) { + for (size_t idx = 0; idx < 6; idx++) { + dataStream >> _otherParameters[idx]; + } } +bool SixByteChunk::operator==(const SixByteChunk& rhs) const { + bool ivarsEqual = true; -bool SixByteChunk::operator ==(const SixByteChunk& rhs) const - { - bool ivarsEqual = true; - + for (unsigned char idx = 0; idx < 6; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - for(unsigned char idx = 0; idx < 6; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int SixByteChunk::getMarshalledSize() const -{ - int marshalSize = 0; +int SixByteChunk::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 6 * 1; // _otherParameters - return marshalSize; + marshalSize = marshalSize + 6 * 1; // _otherParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +71,7 @@ int SixByteChunk::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SixByteChunk.h b/src/dis6/SixByteChunk.h index d9334ab1..f948b40c 100644 --- a/src/dis6/SixByteChunk.h +++ b/src/dis6/SixByteChunk.h @@ -1,47 +1,43 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 48 bit piece of data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SixByteChunk -{ -protected: +class OPENDIS6_EXPORT SixByteChunk { + protected: /** six bytes of arbitrary data */ - char _otherParameters[6]; - + char _otherParameters[6]; public: - SixByteChunk(); - virtual ~SixByteChunk(); + SixByteChunk(); + virtual ~SixByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SixByteChunk& rhs) const; + bool operator==(const SixByteChunk& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SphericalHarmonicAntennaPattern.cpp b/src/dis6/SphericalHarmonicAntennaPattern.cpp index 4d76dc09..ecd99760 100644 --- a/src/dis6/SphericalHarmonicAntennaPattern.cpp +++ b/src/dis6/SphericalHarmonicAntennaPattern.cpp @@ -2,59 +2,44 @@ using namespace DIS; +SphericalHarmonicAntennaPattern::SphericalHarmonicAntennaPattern() + : _order(0) {} -SphericalHarmonicAntennaPattern::SphericalHarmonicAntennaPattern(): - _order(0) -{ -} +SphericalHarmonicAntennaPattern::~SphericalHarmonicAntennaPattern() {} -SphericalHarmonicAntennaPattern::~SphericalHarmonicAntennaPattern() -{ -} +char SphericalHarmonicAntennaPattern::getOrder() const { return _order; } -char SphericalHarmonicAntennaPattern::getOrder() const -{ - return _order; -} +void SphericalHarmonicAntennaPattern::setOrder(char pX) { _order = pX; } -void SphericalHarmonicAntennaPattern::setOrder(char pX) -{ - _order = pX; +void SphericalHarmonicAntennaPattern::marshal(DataStream& dataStream) const { + dataStream << _order; } -void SphericalHarmonicAntennaPattern::marshal(DataStream& dataStream) const -{ - dataStream << _order; +void SphericalHarmonicAntennaPattern::unmarshal(DataStream& dataStream) { + dataStream >> _order; } -void SphericalHarmonicAntennaPattern::unmarshal(DataStream& dataStream) -{ - dataStream >> _order; -} +bool SphericalHarmonicAntennaPattern::operator==( + const SphericalHarmonicAntennaPattern& rhs) const { + bool ivarsEqual = true; + if (!(_order == rhs._order)) ivarsEqual = false; -bool SphericalHarmonicAntennaPattern::operator ==(const SphericalHarmonicAntennaPattern& rhs) const - { - bool ivarsEqual = true; - - if( ! (_order == rhs._order) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SphericalHarmonicAntennaPattern::getMarshalledSize() const -{ - int marshalSize = 0; +int SphericalHarmonicAntennaPattern::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _order - return marshalSize; + marshalSize = marshalSize + 1; // _order + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +52,7 @@ int SphericalHarmonicAntennaPattern::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SphericalHarmonicAntennaPattern.h b/src/dis6/SphericalHarmonicAntennaPattern.h index a3bc5097..9e6d848c 100644 --- a/src/dis6/SphericalHarmonicAntennaPattern.h +++ b/src/dis6/SphericalHarmonicAntennaPattern.h @@ -1,45 +1,44 @@ #pragma once -#include #include +#include +namespace DIS { +// Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is +// of value 2. Specified the direction and radiation pattern from a +// radio transmitter's antenna. NOTE: this class must be hand-coded to +// clean up some implementation details. -namespace DIS -{ -// Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is of value 2. Specified the direction and radiation pattern from a radio transmitter's antenna. NOTE: this class must be hand-coded to clean up some implementation details. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SphericalHarmonicAntennaPattern -{ -protected: - char _order; - +class OPENDIS6_EXPORT SphericalHarmonicAntennaPattern { + protected: + char _order; public: - SphericalHarmonicAntennaPattern(); - virtual ~SphericalHarmonicAntennaPattern(); + SphericalHarmonicAntennaPattern(); + virtual ~SphericalHarmonicAntennaPattern(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char getOrder() const; - void setOrder(char pX); + char getOrder() const; + void setOrder(char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SphericalHarmonicAntennaPattern& rhs) const; + bool operator==(const SphericalHarmonicAntennaPattern& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -52,7 +51,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StartResumePdu.cpp b/src/dis6/StartResumePdu.cpp index d2b61445..d424699a 100644 --- a/src/dis6/StartResumePdu.cpp +++ b/src/dis6/StartResumePdu.cpp @@ -2,105 +2,85 @@ using namespace DIS; - -StartResumePdu::StartResumePdu() : SimulationManagementFamilyPdu(), - _realWorldTime(), - _simulationTime(), - _requestID(0) -{ - setPduType( 13 ); +StartResumePdu::StartResumePdu() + : SimulationManagementFamilyPdu(), + _realWorldTime(), + _simulationTime(), + _requestID(0) { + setPduType(13); } -StartResumePdu::~StartResumePdu() -{ -} +StartResumePdu::~StartResumePdu() {} -ClockTime& StartResumePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StartResumePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StartResumePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StartResumePdu::getRealWorldTime() const { + return _realWorldTime; } -void StartResumePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StartResumePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -ClockTime& StartResumePdu::getSimulationTime() -{ - return _simulationTime; -} +ClockTime& StartResumePdu::getSimulationTime() { return _simulationTime; } -const ClockTime& StartResumePdu::getSimulationTime() const -{ - return _simulationTime; +const ClockTime& StartResumePdu::getSimulationTime() const { + return _simulationTime; } -void StartResumePdu::setSimulationTime(const ClockTime &pX) -{ - _simulationTime = pX; +void StartResumePdu::setSimulationTime(const ClockTime& pX) { + _simulationTime = pX; } -unsigned int StartResumePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StartResumePdu::getRequestID() const { return _requestID; } -void StartResumePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void StartResumePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void StartResumePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _realWorldTime.marshal(dataStream); - _simulationTime.marshal(dataStream); - dataStream << _requestID; +void StartResumePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _realWorldTime.marshal(dataStream); + _simulationTime.marshal(dataStream); + dataStream << _requestID; } -void StartResumePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _realWorldTime.unmarshal(dataStream); - _simulationTime.unmarshal(dataStream); - dataStream >> _requestID; +void StartResumePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _realWorldTime.unmarshal(dataStream); + _simulationTime.unmarshal(dataStream); + dataStream >> _requestID; } +bool StartResumePdu::operator==(const StartResumePdu& rhs) const { + bool ivarsEqual = true; -bool StartResumePdu::operator ==(const StartResumePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_simulationTime == rhs._simulationTime)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_simulationTime == rhs._simulationTime) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int StartResumePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int StartResumePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = + marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -113,7 +93,7 @@ int StartResumePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StartResumePdu.h b/src/dis6/StartResumePdu.h index ebe8ccc8..f391c6bf 100644 --- a/src/dis6/StartResumePdu.h +++ b/src/dis6/StartResumePdu.h @@ -1,63 +1,58 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.6.3. Start or resume an exercise. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT StartResumePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT StartResumePdu : public SimulationManagementFamilyPdu { + protected: /** UTC time at which the simulation shall start or resume */ - ClockTime _realWorldTime; + ClockTime _realWorldTime; /** Simulation clock time at which the simulation shall start or resume */ - ClockTime _simulationTime; + ClockTime _simulationTime; /** Identifier for the request */ - unsigned int _requestID; - + unsigned int _requestID; public: - StartResumePdu(); - virtual ~StartResumePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + StartResumePdu(); + virtual ~StartResumePdu(); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - ClockTime& getSimulationTime(); - const ClockTime& getSimulationTime() const; - void setSimulationTime(const ClockTime &pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + ClockTime& getSimulationTime(); + const ClockTime& getSimulationTime() const; + void setSimulationTime(const ClockTime& pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const StartResumePdu& rhs) const; + bool operator==(const StartResumePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -70,7 +65,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StartResumeReliablePdu.cpp b/src/dis6/StartResumeReliablePdu.cpp index 650b243d..16c37c92 100644 --- a/src/dis6/StartResumeReliablePdu.cpp +++ b/src/dis6/StartResumeReliablePdu.cpp @@ -2,150 +2,121 @@ using namespace DIS; - -StartResumeReliablePdu::StartResumeReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _realWorldTime(), - _simulationTime(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0) -{ - setPduType( 53 ); +StartResumeReliablePdu::StartResumeReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _realWorldTime(), + _simulationTime(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0) { + setPduType(53); } -StartResumeReliablePdu::~StartResumeReliablePdu() -{ -} +StartResumeReliablePdu::~StartResumeReliablePdu() {} -ClockTime& StartResumeReliablePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StartResumeReliablePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StartResumeReliablePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StartResumeReliablePdu::getRealWorldTime() const { + return _realWorldTime; } -void StartResumeReliablePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StartResumeReliablePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -ClockTime& StartResumeReliablePdu::getSimulationTime() -{ - return _simulationTime; +ClockTime& StartResumeReliablePdu::getSimulationTime() { + return _simulationTime; } -const ClockTime& StartResumeReliablePdu::getSimulationTime() const -{ - return _simulationTime; +const ClockTime& StartResumeReliablePdu::getSimulationTime() const { + return _simulationTime; } -void StartResumeReliablePdu::setSimulationTime(const ClockTime &pX) -{ - _simulationTime = pX; +void StartResumeReliablePdu::setSimulationTime(const ClockTime& pX) { + _simulationTime = pX; } -unsigned char StartResumeReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char StartResumeReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void StartResumeReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void StartResumeReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short StartResumeReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short StartResumeReliablePdu::getPad1() const { return _pad1; } -void StartResumeReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void StartResumeReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char StartResumeReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char StartResumeReliablePdu::getPad2() const { return _pad2; } -void StartResumeReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void StartResumeReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int StartResumeReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StartResumeReliablePdu::getRequestID() const { return _requestID; } -void StartResumeReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void StartResumeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void StartResumeReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _realWorldTime.marshal(dataStream); - _simulationTime.marshal(dataStream); - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; +void StartResumeReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _realWorldTime.marshal(dataStream); + _simulationTime.marshal(dataStream); + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; } -void StartResumeReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _realWorldTime.unmarshal(dataStream); - _simulationTime.unmarshal(dataStream); - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; +void StartResumeReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _realWorldTime.unmarshal(dataStream); + _simulationTime.unmarshal(dataStream); + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; } +bool StartResumeReliablePdu::operator==( + const StartResumeReliablePdu& rhs) const { + bool ivarsEqual = true; -bool StartResumeReliablePdu::operator ==(const StartResumeReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_simulationTime == rhs._simulationTime)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_simulationTime == rhs._simulationTime) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int StartResumeReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int StartResumeReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = + marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -158,7 +129,7 @@ int StartResumeReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StartResumeReliablePdu.h b/src/dis6/StartResumeReliablePdu.h index 3e5c797f..caecd565 100644 --- a/src/dis6/StartResumeReliablePdu.h +++ b/src/dis6/StartResumeReliablePdu.h @@ -1,81 +1,77 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.3: Start resume simulation, relaible. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT StartResumeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT StartResumeReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** time in real world for this operation to happen */ - ClockTime _realWorldTime; + ClockTime _realWorldTime; /** time in simulation for the simulation to resume */ - ClockTime _simulationTime; + ClockTime _simulationTime; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - StartResumeReliablePdu(); - virtual ~StartResumeReliablePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + StartResumeReliablePdu(); + virtual ~StartResumeReliablePdu(); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - ClockTime& getSimulationTime(); - const ClockTime& getSimulationTime() const; - void setSimulationTime(const ClockTime &pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + ClockTime& getSimulationTime(); + const ClockTime& getSimulationTime() const; + void setSimulationTime(const ClockTime& pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const StartResumeReliablePdu& rhs) const; + bool operator==(const StartResumeReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -88,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StopFreezePdu.cpp b/src/dis6/StopFreezePdu.cpp index c54d93fb..abad49bd 100644 --- a/src/dis6/StopFreezePdu.cpp +++ b/src/dis6/StopFreezePdu.cpp @@ -2,130 +2,100 @@ using namespace DIS; - -StopFreezePdu::StopFreezePdu() : SimulationManagementFamilyPdu(), - _realWorldTime(), - _reason(0), - _frozenBehavior(0), - _padding1(0), - _requestID(0) -{ - setPduType( 14 ); +StopFreezePdu::StopFreezePdu() + : SimulationManagementFamilyPdu(), + _realWorldTime(), + _reason(0), + _frozenBehavior(0), + _padding1(0), + _requestID(0) { + setPduType(14); } -StopFreezePdu::~StopFreezePdu() -{ -} +StopFreezePdu::~StopFreezePdu() {} -ClockTime& StopFreezePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StopFreezePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StopFreezePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StopFreezePdu::getRealWorldTime() const { + return _realWorldTime; } -void StopFreezePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StopFreezePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -unsigned char StopFreezePdu::getReason() const -{ - return _reason; -} +unsigned char StopFreezePdu::getReason() const { return _reason; } -void StopFreezePdu::setReason(unsigned char pX) -{ - _reason = pX; -} +void StopFreezePdu::setReason(unsigned char pX) { _reason = pX; } -unsigned char StopFreezePdu::getFrozenBehavior() const -{ - return _frozenBehavior; +unsigned char StopFreezePdu::getFrozenBehavior() const { + return _frozenBehavior; } -void StopFreezePdu::setFrozenBehavior(unsigned char pX) -{ - _frozenBehavior = pX; +void StopFreezePdu::setFrozenBehavior(unsigned char pX) { + _frozenBehavior = pX; } -short StopFreezePdu::getPadding1() const -{ - return _padding1; -} +short StopFreezePdu::getPadding1() const { return _padding1; } -void StopFreezePdu::setPadding1(short pX) -{ - _padding1 = pX; -} +void StopFreezePdu::setPadding1(short pX) { _padding1 = pX; } -unsigned int StopFreezePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StopFreezePdu::getRequestID() const { return _requestID; } -void StopFreezePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void StopFreezePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void StopFreezePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _realWorldTime.marshal(dataStream); - dataStream << _reason; - dataStream << _frozenBehavior; - dataStream << _padding1; - dataStream << _requestID; +void StopFreezePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _realWorldTime.marshal(dataStream); + dataStream << _reason; + dataStream << _frozenBehavior; + dataStream << _padding1; + dataStream << _requestID; } -void StopFreezePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _realWorldTime.unmarshal(dataStream); - dataStream >> _reason; - dataStream >> _frozenBehavior; - dataStream >> _padding1; - dataStream >> _requestID; +void StopFreezePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _realWorldTime.unmarshal(dataStream); + dataStream >> _reason; + dataStream >> _frozenBehavior; + dataStream >> _padding1; + dataStream >> _requestID; } +bool StopFreezePdu::operator==(const StopFreezePdu& rhs) const { + bool ivarsEqual = true; -bool StopFreezePdu::operator ==(const StopFreezePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_reason == rhs._reason)) ivarsEqual = false; + if (!(_frozenBehavior == rhs._frozenBehavior)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_reason == rhs._reason) ) ivarsEqual = false; - if( ! (_frozenBehavior == rhs._frozenBehavior) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int StopFreezePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int StopFreezePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + 1; // _reason - marshalSize = marshalSize + 1; // _frozenBehavior - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = marshalSize + 1; // _reason + marshalSize = marshalSize + 1; // _frozenBehavior + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -138,7 +108,7 @@ int StopFreezePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StopFreezePdu.h b/src/dis6/StopFreezePdu.h index 78eae2fa..21a838bb 100644 --- a/src/dis6/StopFreezePdu.h +++ b/src/dis6/StopFreezePdu.h @@ -2,72 +2,69 @@ #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.3.4. Stop or freeze an exercise. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { + protected: /** UTC time at which the simulation shall stop or freeze */ - ClockTime _realWorldTime; + ClockTime _realWorldTime; /** Reason the simulation was stopped or frozen */ - unsigned char _reason; + unsigned char _reason; - /** Internal behavior of the simulation and its appearance while frozento the other participants */ - unsigned char _frozenBehavior; + /** Internal behavior of the simulation and its appearance while frozento the + * other participants */ + unsigned char _frozenBehavior; /** padding */ - short _padding1; + short _padding1; /** Request ID that is unique */ - unsigned int _requestID; - + unsigned int _requestID; public: - StopFreezePdu(); - virtual ~StopFreezePdu(); + StopFreezePdu(); + virtual ~StopFreezePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + unsigned char getReason() const; + void setReason(unsigned char pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + unsigned char getFrozenBehavior() const; + void setFrozenBehavior(unsigned char pX); - short getPadding1() const; - void setPadding1(short pX); + short getPadding1() const; + void setPadding1(short pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const StopFreezePdu& rhs) const; + bool operator==(const StopFreezePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -80,7 +77,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StopFreezeReliablePdu.cpp b/src/dis6/StopFreezeReliablePdu.cpp index 3eccfb64..44af0965 100644 --- a/src/dis6/StopFreezeReliablePdu.cpp +++ b/src/dis6/StopFreezeReliablePdu.cpp @@ -2,145 +2,115 @@ using namespace DIS; - -StopFreezeReliablePdu::StopFreezeReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _realWorldTime(), - _reason(0), - _frozenBehavior(0), - _requiredReliablityService(0), - _pad1(0), - _requestID(0) -{ - setPduType( 54 ); +StopFreezeReliablePdu::StopFreezeReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _realWorldTime(), + _reason(0), + _frozenBehavior(0), + _requiredReliablityService(0), + _pad1(0), + _requestID(0) { + setPduType(54); } -StopFreezeReliablePdu::~StopFreezeReliablePdu() -{ -} +StopFreezeReliablePdu::~StopFreezeReliablePdu() {} -ClockTime& StopFreezeReliablePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StopFreezeReliablePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StopFreezeReliablePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StopFreezeReliablePdu::getRealWorldTime() const { + return _realWorldTime; } -void StopFreezeReliablePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StopFreezeReliablePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -unsigned char StopFreezeReliablePdu::getReason() const -{ - return _reason; -} +unsigned char StopFreezeReliablePdu::getReason() const { return _reason; } -void StopFreezeReliablePdu::setReason(unsigned char pX) -{ - _reason = pX; -} +void StopFreezeReliablePdu::setReason(unsigned char pX) { _reason = pX; } -unsigned char StopFreezeReliablePdu::getFrozenBehavior() const -{ - return _frozenBehavior; +unsigned char StopFreezeReliablePdu::getFrozenBehavior() const { + return _frozenBehavior; } -void StopFreezeReliablePdu::setFrozenBehavior(unsigned char pX) -{ - _frozenBehavior = pX; +void StopFreezeReliablePdu::setFrozenBehavior(unsigned char pX) { + _frozenBehavior = pX; } -unsigned char StopFreezeReliablePdu::getRequiredReliablityService() const -{ - return _requiredReliablityService; +unsigned char StopFreezeReliablePdu::getRequiredReliablityService() const { + return _requiredReliablityService; } -void StopFreezeReliablePdu::setRequiredReliablityService(unsigned char pX) -{ - _requiredReliablityService = pX; +void StopFreezeReliablePdu::setRequiredReliablityService(unsigned char pX) { + _requiredReliablityService = pX; } -unsigned char StopFreezeReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned char StopFreezeReliablePdu::getPad1() const { return _pad1; } -void StopFreezeReliablePdu::setPad1(unsigned char pX) -{ - _pad1 = pX; -} +void StopFreezeReliablePdu::setPad1(unsigned char pX) { _pad1 = pX; } -unsigned int StopFreezeReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StopFreezeReliablePdu::getRequestID() const { return _requestID; } -void StopFreezeReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void StopFreezeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void StopFreezeReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _realWorldTime.marshal(dataStream); - dataStream << _reason; - dataStream << _frozenBehavior; - dataStream << _requiredReliablityService; - dataStream << _pad1; - dataStream << _requestID; +void StopFreezeReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _realWorldTime.marshal(dataStream); + dataStream << _reason; + dataStream << _frozenBehavior; + dataStream << _requiredReliablityService; + dataStream << _pad1; + dataStream << _requestID; } -void StopFreezeReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _realWorldTime.unmarshal(dataStream); - dataStream >> _reason; - dataStream >> _frozenBehavior; - dataStream >> _requiredReliablityService; - dataStream >> _pad1; - dataStream >> _requestID; +void StopFreezeReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _realWorldTime.unmarshal(dataStream); + dataStream >> _reason; + dataStream >> _frozenBehavior; + dataStream >> _requiredReliablityService; + dataStream >> _pad1; + dataStream >> _requestID; } +bool StopFreezeReliablePdu::operator==(const StopFreezeReliablePdu& rhs) const { + bool ivarsEqual = true; -bool StopFreezeReliablePdu::operator ==(const StopFreezeReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_reason == rhs._reason)) ivarsEqual = false; + if (!(_frozenBehavior == rhs._frozenBehavior)) ivarsEqual = false; + if (!(_requiredReliablityService == rhs._requiredReliablityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_reason == rhs._reason) ) ivarsEqual = false; - if( ! (_frozenBehavior == rhs._frozenBehavior) ) ivarsEqual = false; - if( ! (_requiredReliablityService == rhs._requiredReliablityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int StopFreezeReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int StopFreezeReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + 1; // _reason - marshalSize = marshalSize + 1; // _frozenBehavior - marshalSize = marshalSize + 1; // _requiredReliablityService - marshalSize = marshalSize + 1; // _pad1 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = marshalSize + 1; // _reason + marshalSize = marshalSize + 1; // _frozenBehavior + marshalSize = marshalSize + 1; // _requiredReliablityService + marshalSize = marshalSize + 1; // _pad1 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -153,7 +123,7 @@ int StopFreezeReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/StopFreezeReliablePdu.h b/src/dis6/StopFreezeReliablePdu.h index edff740d..05f45f67 100644 --- a/src/dis6/StopFreezeReliablePdu.h +++ b/src/dis6/StopFreezeReliablePdu.h @@ -2,78 +2,75 @@ #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT StopFreezeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS6_EXPORT StopFreezeReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** time in real world for this operation to happen */ - ClockTime _realWorldTime; + ClockTime _realWorldTime; /** Reason for stopping/freezing simulation */ - unsigned char _reason; + unsigned char _reason; /** internal behvior of the simulation while frozen */ - unsigned char _frozenBehavior; + unsigned char _frozenBehavior; /** reliablity level */ - unsigned char _requiredReliablityService; + unsigned char _requiredReliablityService; /** padding */ - unsigned char _pad1; + unsigned char _pad1; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - StopFreezeReliablePdu(); - virtual ~StopFreezeReliablePdu(); + StopFreezeReliablePdu(); + virtual ~StopFreezeReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + unsigned char getReason() const; + void setReason(unsigned char pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + unsigned char getFrozenBehavior() const; + void setFrozenBehavior(unsigned char pX); - unsigned char getRequiredReliablityService() const; - void setRequiredReliablityService(unsigned char pX); + unsigned char getRequiredReliablityService() const; + void setRequiredReliablityService(unsigned char pX); - unsigned char getPad1() const; - void setPad1(unsigned char pX); + unsigned char getPad1() const; + void setPad1(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const StopFreezeReliablePdu& rhs) const; + bool operator==(const StopFreezeReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -86,7 +83,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SupplyQuantity.cpp b/src/dis6/SupplyQuantity.cpp index b54a4574..bfc01101 100644 --- a/src/dis6/SupplyQuantity.cpp +++ b/src/dis6/SupplyQuantity.cpp @@ -2,79 +2,52 @@ using namespace DIS; +SupplyQuantity::SupplyQuantity() : _supplyType(), _quantity(0) {} -SupplyQuantity::SupplyQuantity(): - _supplyType(), - _quantity(0) -{ -} +SupplyQuantity::~SupplyQuantity() {} -SupplyQuantity::~SupplyQuantity() -{ -} +EntityType& SupplyQuantity::getSupplyType() { return _supplyType; } -EntityType& SupplyQuantity::getSupplyType() -{ - return _supplyType; -} - -const EntityType& SupplyQuantity::getSupplyType() const -{ - return _supplyType; -} +const EntityType& SupplyQuantity::getSupplyType() const { return _supplyType; } -void SupplyQuantity::setSupplyType(const EntityType &pX) -{ - _supplyType = pX; -} +void SupplyQuantity::setSupplyType(const EntityType& pX) { _supplyType = pX; } -unsigned char SupplyQuantity::getQuantity() const -{ - return _quantity; -} +unsigned char SupplyQuantity::getQuantity() const { return _quantity; } -void SupplyQuantity::setQuantity(unsigned char pX) -{ - _quantity = pX; -} +void SupplyQuantity::setQuantity(unsigned char pX) { _quantity = pX; } -void SupplyQuantity::marshal(DataStream& dataStream) const -{ - _supplyType.marshal(dataStream); - dataStream << _quantity; +void SupplyQuantity::marshal(DataStream& dataStream) const { + _supplyType.marshal(dataStream); + dataStream << _quantity; } -void SupplyQuantity::unmarshal(DataStream& dataStream) -{ - _supplyType.unmarshal(dataStream); - dataStream >> _quantity; +void SupplyQuantity::unmarshal(DataStream& dataStream) { + _supplyType.unmarshal(dataStream); + dataStream >> _quantity; } +bool SupplyQuantity::operator==(const SupplyQuantity& rhs) const { + bool ivarsEqual = true; -bool SupplyQuantity::operator ==(const SupplyQuantity& rhs) const - { - bool ivarsEqual = true; + if (!(_supplyType == rhs._supplyType)) ivarsEqual = false; + if (!(_quantity == rhs._quantity)) ivarsEqual = false; - if( ! (_supplyType == rhs._supplyType) ) ivarsEqual = false; - if( ! (_quantity == rhs._quantity) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SupplyQuantity::getMarshalledSize() const -{ - int marshalSize = 0; +int SupplyQuantity::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _supplyType.getMarshalledSize(); // _supplyType - marshalSize = marshalSize + 1; // _quantity - return marshalSize; + marshalSize = marshalSize + _supplyType.getMarshalledSize(); // _supplyType + marshalSize = marshalSize + 1; // _quantity + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +60,7 @@ int SupplyQuantity::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SupplyQuantity.h b/src/dis6/SupplyQuantity.h index 6c8c47c9..d748debb 100644 --- a/src/dis6/SupplyQuantity.h +++ b/src/dis6/SupplyQuantity.h @@ -1,54 +1,51 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.2.30. A supply, and the amount of that supply. Similar to an entity +// kind but with the addition of a quantity. -namespace DIS -{ -// Section 5.2.30. A supply, and the amount of that supply. Similar to an entity kind but with the addition of a quantity. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SupplyQuantity -{ -protected: +class OPENDIS6_EXPORT SupplyQuantity { + protected: /** Type of supply */ - EntityType _supplyType; + EntityType _supplyType; /** quantity to be supplied */ - unsigned char _quantity; - + unsigned char _quantity; public: - SupplyQuantity(); - virtual ~SupplyQuantity(); + SupplyQuantity(); + virtual ~SupplyQuantity(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getSupplyType(); - const EntityType& getSupplyType() const; - void setSupplyType(const EntityType &pX); + EntityType& getSupplyType(); + const EntityType& getSupplyType() const; + void setSupplyType(const EntityType& pX); - unsigned char getQuantity() const; - void setQuantity(unsigned char pX); + unsigned char getQuantity() const; + void setQuantity(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SupplyQuantity& rhs) const; + bool operator==(const SupplyQuantity& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SyntheticEnvironmentFamilyPdu.cpp b/src/dis6/SyntheticEnvironmentFamilyPdu.cpp index 89fae3aa..5f986f64 100644 --- a/src/dis6/SyntheticEnvironmentFamilyPdu.cpp +++ b/src/dis6/SyntheticEnvironmentFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -SyntheticEnvironmentFamilyPdu::SyntheticEnvironmentFamilyPdu() : Pdu() +SyntheticEnvironmentFamilyPdu::SyntheticEnvironmentFamilyPdu() + : Pdu() { - setProtocolFamily( 9 ); + setProtocolFamily(9); } -SyntheticEnvironmentFamilyPdu::~SyntheticEnvironmentFamilyPdu() -{ -} +SyntheticEnvironmentFamilyPdu::~SyntheticEnvironmentFamilyPdu() {} -void SyntheticEnvironmentFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void SyntheticEnvironmentFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void SyntheticEnvironmentFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void SyntheticEnvironmentFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool SyntheticEnvironmentFamilyPdu::operator==( + const SyntheticEnvironmentFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool SyntheticEnvironmentFamilyPdu::operator ==(const SyntheticEnvironmentFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int SyntheticEnvironmentFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int SyntheticEnvironmentFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int SyntheticEnvironmentFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SyntheticEnvironmentFamilyPdu.h b/src/dis6/SyntheticEnvironmentFamilyPdu.h index b9e2b779..68dea8cb 100644 --- a/src/dis6/SyntheticEnvironmentFamilyPdu.h +++ b/src/dis6/SyntheticEnvironmentFamilyPdu.h @@ -1,41 +1,37 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.11: Abstract superclass for synthetic environment PDUs -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SyntheticEnvironmentFamilyPdu : public Pdu -{ -protected: - +class OPENDIS6_EXPORT SyntheticEnvironmentFamilyPdu : public Pdu { + protected: public: - SyntheticEnvironmentFamilyPdu(); - virtual ~SyntheticEnvironmentFamilyPdu(); + SyntheticEnvironmentFamilyPdu(); + virtual ~SyntheticEnvironmentFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SyntheticEnvironmentFamilyPdu& rhs) const; + bool operator==(const SyntheticEnvironmentFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SystemID.cpp b/src/dis6/SystemID.cpp index 938521c8..71a9824b 100644 --- a/src/dis6/SystemID.cpp +++ b/src/dis6/SystemID.cpp @@ -2,104 +2,67 @@ using namespace DIS; +SystemID::SystemID() + : _systemType(0), _systemName(0), _systemMode(0), _changeOptions(0) {} -SystemID::SystemID(): - _systemType(0), - _systemName(0), - _systemMode(0), - _changeOptions(0) -{ -} +SystemID::~SystemID() {} -SystemID::~SystemID() -{ -} +unsigned short SystemID::getSystemType() const { return _systemType; } -unsigned short SystemID::getSystemType() const -{ - return _systemType; -} +void SystemID::setSystemType(unsigned short pX) { _systemType = pX; } -void SystemID::setSystemType(unsigned short pX) -{ - _systemType = pX; -} +unsigned short SystemID::getSystemName() const { return _systemName; } -unsigned short SystemID::getSystemName() const -{ - return _systemName; -} +void SystemID::setSystemName(unsigned short pX) { _systemName = pX; } -void SystemID::setSystemName(unsigned short pX) -{ - _systemName = pX; -} +unsigned char SystemID::getSystemMode() const { return _systemMode; } -unsigned char SystemID::getSystemMode() const -{ - return _systemMode; -} +void SystemID::setSystemMode(unsigned char pX) { _systemMode = pX; } -void SystemID::setSystemMode(unsigned char pX) -{ - _systemMode = pX; -} - -unsigned char SystemID::getChangeOptions() const -{ - return _changeOptions; -} +unsigned char SystemID::getChangeOptions() const { return _changeOptions; } -void SystemID::setChangeOptions(unsigned char pX) -{ - _changeOptions = pX; -} +void SystemID::setChangeOptions(unsigned char pX) { _changeOptions = pX; } -void SystemID::marshal(DataStream& dataStream) const -{ - dataStream << _systemType; - dataStream << _systemName; - dataStream << _systemMode; - dataStream << _changeOptions; +void SystemID::marshal(DataStream& dataStream) const { + dataStream << _systemType; + dataStream << _systemName; + dataStream << _systemMode; + dataStream << _changeOptions; } -void SystemID::unmarshal(DataStream& dataStream) -{ - dataStream >> _systemType; - dataStream >> _systemName; - dataStream >> _systemMode; - dataStream >> _changeOptions; +void SystemID::unmarshal(DataStream& dataStream) { + dataStream >> _systemType; + dataStream >> _systemName; + dataStream >> _systemMode; + dataStream >> _changeOptions; } +bool SystemID::operator==(const SystemID& rhs) const { + bool ivarsEqual = true; -bool SystemID::operator ==(const SystemID& rhs) const - { - bool ivarsEqual = true; - - if( ! (_systemType == rhs._systemType) ) ivarsEqual = false; - if( ! (_systemName == rhs._systemName) ) ivarsEqual = false; - if( ! (_systemMode == rhs._systemMode) ) ivarsEqual = false; - if( ! (_changeOptions == rhs._changeOptions) ) ivarsEqual = false; + if (!(_systemType == rhs._systemType)) ivarsEqual = false; + if (!(_systemName == rhs._systemName)) ivarsEqual = false; + if (!(_systemMode == rhs._systemMode)) ivarsEqual = false; + if (!(_changeOptions == rhs._changeOptions)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int SystemID::getMarshalledSize() const -{ - int marshalSize = 0; +int SystemID::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _systemType - marshalSize = marshalSize + 2; // _systemName - marshalSize = marshalSize + 1; // _systemMode - marshalSize = marshalSize + 1; // _changeOptions - return marshalSize; + marshalSize = marshalSize + 2; // _systemType + marshalSize = marshalSize + 2; // _systemName + marshalSize = marshalSize + 1; // _systemMode + marshalSize = marshalSize + 1; // _changeOptions + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +75,7 @@ int SystemID::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/SystemID.h b/src/dis6/SystemID.h index c4e26627..26159894 100644 --- a/src/dis6/SystemID.h +++ b/src/dis6/SystemID.h @@ -1,64 +1,60 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 5.2.58. Used in IFF ATC PDU -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT SystemID -{ -protected: +class OPENDIS6_EXPORT SystemID { + protected: /** System Type */ - unsigned short _systemType; + unsigned short _systemType; /** System name, an enumeration */ - unsigned short _systemName; + unsigned short _systemName; /** System mode */ - unsigned char _systemMode; + unsigned char _systemMode; /** Change Options */ - unsigned char _changeOptions; - + unsigned char _changeOptions; public: - SystemID(); - virtual ~SystemID(); + SystemID(); + virtual ~SystemID(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSystemType() const; - void setSystemType(unsigned short pX); + unsigned short getSystemType() const; + void setSystemType(unsigned short pX); - unsigned short getSystemName() const; - void setSystemName(unsigned short pX); + unsigned short getSystemName() const; + void setSystemName(unsigned short pX); - unsigned char getSystemMode() const; - void setSystemMode(unsigned char pX); + unsigned char getSystemMode() const; + void setSystemMode(unsigned char pX); - unsigned char getChangeOptions() const; - void setChangeOptions(unsigned char pX); + unsigned char getChangeOptions() const; + void setChangeOptions(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SystemID& rhs) const; + bool operator==(const SystemID& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +67,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TrackJamTarget.cpp b/src/dis6/TrackJamTarget.cpp index 837b5833..0eef5e35 100644 --- a/src/dis6/TrackJamTarget.cpp +++ b/src/dis6/TrackJamTarget.cpp @@ -2,94 +2,60 @@ using namespace DIS; +TrackJamTarget::TrackJamTarget() : _trackJam(), _emitterID(0), _beamID(0) {} -TrackJamTarget::TrackJamTarget(): - _trackJam(), - _emitterID(0), - _beamID(0) -{ -} - -TrackJamTarget::~TrackJamTarget() -{ -} +TrackJamTarget::~TrackJamTarget() {} -EntityID& TrackJamTarget::getTrackJam() -{ - return _trackJam; -} +EntityID& TrackJamTarget::getTrackJam() { return _trackJam; } -const EntityID& TrackJamTarget::getTrackJam() const -{ - return _trackJam; -} +const EntityID& TrackJamTarget::getTrackJam() const { return _trackJam; } -void TrackJamTarget::setTrackJam(const EntityID &pX) -{ - _trackJam = pX; -} +void TrackJamTarget::setTrackJam(const EntityID& pX) { _trackJam = pX; } -unsigned char TrackJamTarget::getEmitterID() const -{ - return _emitterID; -} +unsigned char TrackJamTarget::getEmitterID() const { return _emitterID; } -void TrackJamTarget::setEmitterID(unsigned char pX) -{ - _emitterID = pX; -} +void TrackJamTarget::setEmitterID(unsigned char pX) { _emitterID = pX; } -unsigned char TrackJamTarget::getBeamID() const -{ - return _beamID; -} +unsigned char TrackJamTarget::getBeamID() const { return _beamID; } -void TrackJamTarget::setBeamID(unsigned char pX) -{ - _beamID = pX; -} +void TrackJamTarget::setBeamID(unsigned char pX) { _beamID = pX; } -void TrackJamTarget::marshal(DataStream& dataStream) const -{ - _trackJam.marshal(dataStream); - dataStream << _emitterID; - dataStream << _beamID; +void TrackJamTarget::marshal(DataStream& dataStream) const { + _trackJam.marshal(dataStream); + dataStream << _emitterID; + dataStream << _beamID; } -void TrackJamTarget::unmarshal(DataStream& dataStream) -{ - _trackJam.unmarshal(dataStream); - dataStream >> _emitterID; - dataStream >> _beamID; +void TrackJamTarget::unmarshal(DataStream& dataStream) { + _trackJam.unmarshal(dataStream); + dataStream >> _emitterID; + dataStream >> _beamID; } +bool TrackJamTarget::operator==(const TrackJamTarget& rhs) const { + bool ivarsEqual = true; -bool TrackJamTarget::operator ==(const TrackJamTarget& rhs) const - { - bool ivarsEqual = true; - - if( ! (_trackJam == rhs._trackJam) ) ivarsEqual = false; - if( ! (_emitterID == rhs._emitterID) ) ivarsEqual = false; - if( ! (_beamID == rhs._beamID) ) ivarsEqual = false; + if (!(_trackJam == rhs._trackJam)) ivarsEqual = false; + if (!(_emitterID == rhs._emitterID)) ivarsEqual = false; + if (!(_beamID == rhs._beamID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int TrackJamTarget::getMarshalledSize() const -{ - int marshalSize = 0; +int TrackJamTarget::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _trackJam.getMarshalledSize(); // _trackJam - marshalSize = marshalSize + 1; // _emitterID - marshalSize = marshalSize + 1; // _beamID - return marshalSize; + marshalSize = marshalSize + _trackJam.getMarshalledSize(); // _trackJam + marshalSize = marshalSize + 1; // _emitterID + marshalSize = marshalSize + 1; // _beamID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -102,7 +68,7 @@ int TrackJamTarget::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TrackJamTarget.h b/src/dis6/TrackJamTarget.h index 5bde9629..154b440f 100644 --- a/src/dis6/TrackJamTarget.h +++ b/src/dis6/TrackJamTarget.h @@ -1,60 +1,56 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // One track/jam target -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT TrackJamTarget -{ -protected: +class OPENDIS6_EXPORT TrackJamTarget { + protected: /** track/jam target */ - EntityID _trackJam; + EntityID _trackJam; /** Emitter ID */ - unsigned char _emitterID; + unsigned char _emitterID; /** beam ID */ - unsigned char _beamID; - + unsigned char _beamID; public: - TrackJamTarget(); - virtual ~TrackJamTarget(); + TrackJamTarget(); + virtual ~TrackJamTarget(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getTrackJam(); - const EntityID& getTrackJam() const; - void setTrackJam(const EntityID &pX); + EntityID& getTrackJam(); + const EntityID& getTrackJam() const; + void setTrackJam(const EntityID& pX); - unsigned char getEmitterID() const; - void setEmitterID(unsigned char pX); + unsigned char getEmitterID() const; + void setEmitterID(unsigned char pX); - unsigned char getBeamID() const; - void setBeamID(unsigned char pX); + unsigned char getBeamID() const; + void setBeamID(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const TrackJamTarget& rhs) const; + bool operator==(const TrackJamTarget& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TransferControlRequestPdu.cpp b/src/dis6/TransferControlRequestPdu.cpp index 0d98ee3d..7571c536 100644 --- a/src/dis6/TransferControlRequestPdu.cpp +++ b/src/dis6/TransferControlRequestPdu.cpp @@ -2,208 +2,183 @@ using namespace DIS; - -TransferControlRequestPdu::TransferControlRequestPdu() : EntityManagementFamilyPdu(), - _orginatingEntityID(), - _recevingEntityID(), - _requestID(0), - _requiredReliabilityService(0), - _tranferType(0), - _transferEntityID(), - _numberOfRecordSets(0) -{ - setPduType( 35 ); +TransferControlRequestPdu::TransferControlRequestPdu() + : EntityManagementFamilyPdu(), + _orginatingEntityID(), + _recevingEntityID(), + _requestID(0), + _requiredReliabilityService(0), + _tranferType(0), + _transferEntityID(), + _numberOfRecordSets(0) { + setPduType(35); } -TransferControlRequestPdu::~TransferControlRequestPdu() -{ - _recordSets.clear(); -} +TransferControlRequestPdu::~TransferControlRequestPdu() { _recordSets.clear(); } -EntityID& TransferControlRequestPdu::getOrginatingEntityID() -{ - return _orginatingEntityID; +EntityID& TransferControlRequestPdu::getOrginatingEntityID() { + return _orginatingEntityID; } -const EntityID& TransferControlRequestPdu::getOrginatingEntityID() const -{ - return _orginatingEntityID; +const EntityID& TransferControlRequestPdu::getOrginatingEntityID() const { + return _orginatingEntityID; } -void TransferControlRequestPdu::setOrginatingEntityID(const EntityID &pX) -{ - _orginatingEntityID = pX; +void TransferControlRequestPdu::setOrginatingEntityID(const EntityID& pX) { + _orginatingEntityID = pX; } -EntityID& TransferControlRequestPdu::getRecevingEntityID() -{ - return _recevingEntityID; +EntityID& TransferControlRequestPdu::getRecevingEntityID() { + return _recevingEntityID; } -const EntityID& TransferControlRequestPdu::getRecevingEntityID() const -{ - return _recevingEntityID; +const EntityID& TransferControlRequestPdu::getRecevingEntityID() const { + return _recevingEntityID; } -void TransferControlRequestPdu::setRecevingEntityID(const EntityID &pX) -{ - _recevingEntityID = pX; +void TransferControlRequestPdu::setRecevingEntityID(const EntityID& pX) { + _recevingEntityID = pX; } -unsigned int TransferControlRequestPdu::getRequestID() const -{ - return _requestID; +unsigned int TransferControlRequestPdu::getRequestID() const { + return _requestID; } -void TransferControlRequestPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; +void TransferControlRequestPdu::setRequestID(unsigned int pX) { + _requestID = pX; } -unsigned char TransferControlRequestPdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char TransferControlRequestPdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void TransferControlRequestPdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void TransferControlRequestPdu::setRequiredReliabilityService( + unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned char TransferControlRequestPdu::getTranferType() const -{ - return _tranferType; +unsigned char TransferControlRequestPdu::getTranferType() const { + return _tranferType; } -void TransferControlRequestPdu::setTranferType(unsigned char pX) -{ - _tranferType = pX; +void TransferControlRequestPdu::setTranferType(unsigned char pX) { + _tranferType = pX; } -EntityID& TransferControlRequestPdu::getTransferEntityID() -{ - return _transferEntityID; +EntityID& TransferControlRequestPdu::getTransferEntityID() { + return _transferEntityID; } -const EntityID& TransferControlRequestPdu::getTransferEntityID() const -{ - return _transferEntityID; +const EntityID& TransferControlRequestPdu::getTransferEntityID() const { + return _transferEntityID; } -void TransferControlRequestPdu::setTransferEntityID(const EntityID &pX) -{ - _transferEntityID = pX; +void TransferControlRequestPdu::setTransferEntityID(const EntityID& pX) { + _transferEntityID = pX; } -unsigned char TransferControlRequestPdu::getNumberOfRecordSets() const -{ - return _recordSets.size(); +unsigned char TransferControlRequestPdu::getNumberOfRecordSets() const { + return _recordSets.size(); } -std::vector& TransferControlRequestPdu::getRecordSets() -{ - return _recordSets; +std::vector& TransferControlRequestPdu::getRecordSets() { + return _recordSets; } -const std::vector& TransferControlRequestPdu::getRecordSets() const -{ - return _recordSets; +const std::vector& TransferControlRequestPdu::getRecordSets() const { + return _recordSets; } -void TransferControlRequestPdu::setRecordSets(const std::vector& pX) -{ - _recordSets = pX; +void TransferControlRequestPdu::setRecordSets( + const std::vector& pX) { + _recordSets = pX; } -void TransferControlRequestPdu::marshal(DataStream& dataStream) const -{ - EntityManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _orginatingEntityID.marshal(dataStream); - _recevingEntityID.marshal(dataStream); - dataStream << _requestID; - dataStream << _requiredReliabilityService; - dataStream << _tranferType; - _transferEntityID.marshal(dataStream); - dataStream << ( unsigned char )_recordSets.size(); - - for(size_t idx = 0; idx < _recordSets.size(); idx++) - { - RecordSet x = _recordSets[idx]; - x.marshal(dataStream); - } +void TransferControlRequestPdu::marshal(DataStream& dataStream) const { + EntityManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _orginatingEntityID.marshal(dataStream); + _recevingEntityID.marshal(dataStream); + dataStream << _requestID; + dataStream << _requiredReliabilityService; + dataStream << _tranferType; + _transferEntityID.marshal(dataStream); + dataStream << (unsigned char)_recordSets.size(); + for (size_t idx = 0; idx < _recordSets.size(); idx++) { + RecordSet x = _recordSets[idx]; + x.marshal(dataStream); + } } -void TransferControlRequestPdu::unmarshal(DataStream& dataStream) -{ - EntityManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _orginatingEntityID.unmarshal(dataStream); - _recevingEntityID.unmarshal(dataStream); - dataStream >> _requestID; - dataStream >> _requiredReliabilityService; - dataStream >> _tranferType; - _transferEntityID.unmarshal(dataStream); - dataStream >> _numberOfRecordSets; +void TransferControlRequestPdu::unmarshal(DataStream& dataStream) { + EntityManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _orginatingEntityID.unmarshal(dataStream); + _recevingEntityID.unmarshal(dataStream); + dataStream >> _requestID; + dataStream >> _requiredReliabilityService; + dataStream >> _tranferType; + _transferEntityID.unmarshal(dataStream); + dataStream >> _numberOfRecordSets; - _recordSets.clear(); - for(size_t idx = 0; idx < _numberOfRecordSets; idx++) - { - RecordSet x; - x.unmarshal(dataStream); - _recordSets.push_back(x); - } + _recordSets.clear(); + for (size_t idx = 0; idx < _numberOfRecordSets; idx++) { + RecordSet x; + x.unmarshal(dataStream); + _recordSets.push_back(x); + } } +bool TransferControlRequestPdu::operator==( + const TransferControlRequestPdu& rhs) const { + bool ivarsEqual = true; -bool TransferControlRequestPdu::operator ==(const TransferControlRequestPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); - ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); + if (!(_orginatingEntityID == rhs._orginatingEntityID)) ivarsEqual = false; + if (!(_recevingEntityID == rhs._recevingEntityID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_tranferType == rhs._tranferType)) ivarsEqual = false; + if (!(_transferEntityID == rhs._transferEntityID)) ivarsEqual = false; - if( ! (_orginatingEntityID == rhs._orginatingEntityID) ) ivarsEqual = false; - if( ! (_recevingEntityID == rhs._recevingEntityID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_tranferType == rhs._tranferType) ) ivarsEqual = false; - if( ! (_transferEntityID == rhs._transferEntityID) ) ivarsEqual = false; + for (size_t idx = 0; idx < _recordSets.size(); idx++) { + if (!(_recordSets[idx] == rhs._recordSets[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _recordSets.size(); idx++) - { - if( ! ( _recordSets[idx] == rhs._recordSets[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int TransferControlRequestPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int TransferControlRequestPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID - marshalSize = marshalSize + _recevingEntityID.getMarshalledSize(); // _recevingEntityID - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 1; // _tranferType - marshalSize = marshalSize + _transferEntityID.getMarshalledSize(); // _transferEntityID - marshalSize = marshalSize + 1; // _numberOfRecordSets + marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID + marshalSize = + marshalSize + _recevingEntityID.getMarshalledSize(); // _recevingEntityID + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 1; // _tranferType + marshalSize = + marshalSize + _transferEntityID.getMarshalledSize(); // _transferEntityID + marshalSize = marshalSize + 1; // _numberOfRecordSets - for(unsigned long long idx=0; idx < _recordSets.size(); idx++) - { - RecordSet listElement = _recordSets[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _recordSets.size(); idx++) { + RecordSet listElement = _recordSets[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -216,7 +191,7 @@ int TransferControlRequestPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TransferControlRequestPdu.h b/src/dis6/TransferControlRequestPdu.h index 53770a7d..1cf0fe2e 100644 --- a/src/dis6/TransferControlRequestPdu.h +++ b/src/dis6/TransferControlRequestPdu.h @@ -1,97 +1,95 @@ #pragma once -#include -#include -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.9.3 Information initiating the dyanic allocation and control of +// simulation entities between two simulation applications. Requires +// manual cleanup. The padding between record sets is variable. UNFINISHED -namespace DIS -{ -// Section 5.3.9.3 Information initiating the dyanic allocation and control of simulation entities between two simulation applications. Requires manual cleanup. The padding between record sets is variable. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT TransferControlRequestPdu : public EntityManagementFamilyPdu -{ -protected: +class OPENDIS6_EXPORT TransferControlRequestPdu + : public EntityManagementFamilyPdu { + protected: /** ID of entity originating request */ - EntityID _orginatingEntityID; + EntityID _orginatingEntityID; /** ID of entity receiving request */ - EntityID _recevingEntityID; + EntityID _recevingEntityID; /** ID ofrequest */ - unsigned int _requestID; + unsigned int _requestID; /** required level of reliabliity service. */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** type of transfer desired */ - unsigned char _tranferType; + unsigned char _tranferType; /** The entity for which control is being requested to transfer */ - EntityID _transferEntityID; + EntityID _transferEntityID; /** number of record sets to transfer */ - unsigned char _numberOfRecordSets; + unsigned char _numberOfRecordSets; /** ^^^This is wrong--the RecordSet class needs more work */ - std::vector _recordSets; - + std::vector _recordSets; public: - TransferControlRequestPdu(); - virtual ~TransferControlRequestPdu(); + TransferControlRequestPdu(); + virtual ~TransferControlRequestPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOrginatingEntityID(); - const EntityID& getOrginatingEntityID() const; - void setOrginatingEntityID(const EntityID &pX); + EntityID& getOrginatingEntityID(); + const EntityID& getOrginatingEntityID() const; + void setOrginatingEntityID(const EntityID& pX); - EntityID& getRecevingEntityID(); - const EntityID& getRecevingEntityID() const; - void setRecevingEntityID(const EntityID &pX); + EntityID& getRecevingEntityID(); + const EntityID& getRecevingEntityID() const; + void setRecevingEntityID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned char getTranferType() const; - void setTranferType(unsigned char pX); + unsigned char getTranferType() const; + void setTranferType(unsigned char pX); - EntityID& getTransferEntityID(); - const EntityID& getTransferEntityID() const; - void setTransferEntityID(const EntityID &pX); + EntityID& getTransferEntityID(); + const EntityID& getTransferEntityID() const; + void setTransferEntityID(const EntityID& pX); - unsigned char getNumberOfRecordSets() const; + unsigned char getNumberOfRecordSets() const; - std::vector& getRecordSets(); - const std::vector& getRecordSets() const; - void setRecordSets(const std::vector& pX); + std::vector& getRecordSets(); + const std::vector& getRecordSets() const; + void setRecordSets(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const TransferControlRequestPdu& rhs) const; + bool operator==(const TransferControlRequestPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -104,7 +102,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TransmitterPdu.cpp b/src/dis6/TransmitterPdu.cpp index b8d455fe..f5982bdc 100644 --- a/src/dis6/TransmitterPdu.cpp +++ b/src/dis6/TransmitterPdu.cpp @@ -2,401 +2,316 @@ using namespace DIS; - -TransmitterPdu::TransmitterPdu() : RadioCommunicationsFamilyPdu(), - _radioEntityType(), - _transmitState(0), - _inputSource(0), - _padding1(0), - _antennaLocation(), - _relativeAntennaLocation(), - _antennaPatternType(0), - _antennaPatternCount(0), - _frequency(0), - _transmitFrequencyBandwidth(0.0), - _power(0.0), - _modulationType(), - _cryptoSystem(0), - _cryptoKeyId(0), - _modulationParameterCount(0), - _padding2(0), - _padding3(0) -{ - setPduType( 25 ); +TransmitterPdu::TransmitterPdu() + : RadioCommunicationsFamilyPdu(), + _radioEntityType(), + _transmitState(0), + _inputSource(0), + _padding1(0), + _antennaLocation(), + _relativeAntennaLocation(), + _antennaPatternType(0), + _antennaPatternCount(0), + _frequency(0), + _transmitFrequencyBandwidth(0.0), + _power(0.0), + _modulationType(), + _cryptoSystem(0), + _cryptoKeyId(0), + _modulationParameterCount(0), + _padding2(0), + _padding3(0) { + setPduType(25); } -TransmitterPdu::~TransmitterPdu() -{ - _modulationParametersList.clear(); - _antennaPatternList.clear(); +TransmitterPdu::~TransmitterPdu() { + _modulationParametersList.clear(); + _antennaPatternList.clear(); } -RadioEntityType& TransmitterPdu::getRadioEntityType() -{ - return _radioEntityType; +RadioEntityType& TransmitterPdu::getRadioEntityType() { + return _radioEntityType; } -const RadioEntityType& TransmitterPdu::getRadioEntityType() const -{ - return _radioEntityType; +const RadioEntityType& TransmitterPdu::getRadioEntityType() const { + return _radioEntityType; } -void TransmitterPdu::setRadioEntityType(const RadioEntityType &pX) -{ - _radioEntityType = pX; +void TransmitterPdu::setRadioEntityType(const RadioEntityType& pX) { + _radioEntityType = pX; } -unsigned char TransmitterPdu::getTransmitState() const -{ - return _transmitState; +unsigned char TransmitterPdu::getTransmitState() const { + return _transmitState; } -void TransmitterPdu::setTransmitState(unsigned char pX) -{ - _transmitState = pX; -} +void TransmitterPdu::setTransmitState(unsigned char pX) { _transmitState = pX; } -unsigned char TransmitterPdu::getInputSource() const -{ - return _inputSource; -} +unsigned char TransmitterPdu::getInputSource() const { return _inputSource; } -void TransmitterPdu::setInputSource(unsigned char pX) -{ - _inputSource = pX; -} +void TransmitterPdu::setInputSource(unsigned char pX) { _inputSource = pX; } -unsigned short TransmitterPdu::getPadding1() const -{ - return _padding1; -} +unsigned short TransmitterPdu::getPadding1() const { return _padding1; } -void TransmitterPdu::setPadding1(unsigned short pX) -{ - _padding1 = pX; -} +void TransmitterPdu::setPadding1(unsigned short pX) { _padding1 = pX; } -Vector3Double& TransmitterPdu::getAntennaLocation() -{ - return _antennaLocation; -} +Vector3Double& TransmitterPdu::getAntennaLocation() { return _antennaLocation; } -const Vector3Double& TransmitterPdu::getAntennaLocation() const -{ - return _antennaLocation; +const Vector3Double& TransmitterPdu::getAntennaLocation() const { + return _antennaLocation; } -void TransmitterPdu::setAntennaLocation(const Vector3Double &pX) -{ - _antennaLocation = pX; +void TransmitterPdu::setAntennaLocation(const Vector3Double& pX) { + _antennaLocation = pX; } -Vector3Float& TransmitterPdu::getRelativeAntennaLocation() -{ - return _relativeAntennaLocation; +Vector3Float& TransmitterPdu::getRelativeAntennaLocation() { + return _relativeAntennaLocation; } -const Vector3Float& TransmitterPdu::getRelativeAntennaLocation() const -{ - return _relativeAntennaLocation; +const Vector3Float& TransmitterPdu::getRelativeAntennaLocation() const { + return _relativeAntennaLocation; } -void TransmitterPdu::setRelativeAntennaLocation(const Vector3Float &pX) -{ - _relativeAntennaLocation = pX; +void TransmitterPdu::setRelativeAntennaLocation(const Vector3Float& pX) { + _relativeAntennaLocation = pX; } -unsigned short TransmitterPdu::getAntennaPatternType() const -{ - return _antennaPatternType; +unsigned short TransmitterPdu::getAntennaPatternType() const { + return _antennaPatternType; } -void TransmitterPdu::setAntennaPatternType(unsigned short pX) -{ - _antennaPatternType = pX; +void TransmitterPdu::setAntennaPatternType(unsigned short pX) { + _antennaPatternType = pX; } -unsigned short TransmitterPdu::getAntennaPatternCount() const -{ - return _antennaPatternList.size(); +unsigned short TransmitterPdu::getAntennaPatternCount() const { + return _antennaPatternList.size(); } -unsigned long long TransmitterPdu::getFrequency() const -{ - return _frequency; -} +unsigned long long TransmitterPdu::getFrequency() const { return _frequency; } -void TransmitterPdu::setFrequency(unsigned long long pX) -{ - _frequency = pX; -} +void TransmitterPdu::setFrequency(unsigned long long pX) { _frequency = pX; } -float TransmitterPdu::getTransmitFrequencyBandwidth() const -{ - return _transmitFrequencyBandwidth; +float TransmitterPdu::getTransmitFrequencyBandwidth() const { + return _transmitFrequencyBandwidth; } -void TransmitterPdu::setTransmitFrequencyBandwidth(float pX) -{ - _transmitFrequencyBandwidth = pX; +void TransmitterPdu::setTransmitFrequencyBandwidth(float pX) { + _transmitFrequencyBandwidth = pX; } -float TransmitterPdu::getPower() const -{ - return _power; -} +float TransmitterPdu::getPower() const { return _power; } -void TransmitterPdu::setPower(float pX) -{ - _power = pX; -} +void TransmitterPdu::setPower(float pX) { _power = pX; } -ModulationType& TransmitterPdu::getModulationType() -{ - return _modulationType; -} +ModulationType& TransmitterPdu::getModulationType() { return _modulationType; } -const ModulationType& TransmitterPdu::getModulationType() const -{ - return _modulationType; +const ModulationType& TransmitterPdu::getModulationType() const { + return _modulationType; } -void TransmitterPdu::setModulationType(const ModulationType &pX) -{ - _modulationType = pX; +void TransmitterPdu::setModulationType(const ModulationType& pX) { + _modulationType = pX; } -unsigned short TransmitterPdu::getCryptoSystem() const -{ - return _cryptoSystem; -} +unsigned short TransmitterPdu::getCryptoSystem() const { return _cryptoSystem; } -void TransmitterPdu::setCryptoSystem(unsigned short pX) -{ - _cryptoSystem = pX; -} +void TransmitterPdu::setCryptoSystem(unsigned short pX) { _cryptoSystem = pX; } -unsigned short TransmitterPdu::getCryptoKeyId() const -{ - return _cryptoKeyId; -} +unsigned short TransmitterPdu::getCryptoKeyId() const { return _cryptoKeyId; } -void TransmitterPdu::setCryptoKeyId(unsigned short pX) -{ - _cryptoKeyId = pX; -} +void TransmitterPdu::setCryptoKeyId(unsigned short pX) { _cryptoKeyId = pX; } -unsigned char TransmitterPdu::getModulationParameterCount() const -{ - return _modulationParametersList.size(); +unsigned char TransmitterPdu::getModulationParameterCount() const { + return _modulationParametersList.size(); } -unsigned short TransmitterPdu::getPadding2() const -{ - return _padding2; -} +unsigned short TransmitterPdu::getPadding2() const { return _padding2; } -void TransmitterPdu::setPadding2(unsigned short pX) -{ - _padding2 = pX; -} +void TransmitterPdu::setPadding2(unsigned short pX) { _padding2 = pX; } -unsigned char TransmitterPdu::getPadding3() const -{ - return _padding3; -} +unsigned char TransmitterPdu::getPadding3() const { return _padding3; } -void TransmitterPdu::setPadding3(unsigned char pX) -{ - _padding3 = pX; -} +void TransmitterPdu::setPadding3(unsigned char pX) { _padding3 = pX; } -std::vector& TransmitterPdu::getModulationParametersList() -{ - return _modulationParametersList; +std::vector& TransmitterPdu::getModulationParametersList() { + return _modulationParametersList; } -const std::vector& TransmitterPdu::getModulationParametersList() const -{ - return _modulationParametersList; +const std::vector& TransmitterPdu::getModulationParametersList() + const { + return _modulationParametersList; } -void TransmitterPdu::setModulationParametersList(const std::vector& pX) -{ - _modulationParametersList = pX; +void TransmitterPdu::setModulationParametersList( + const std::vector& pX) { + _modulationParametersList = pX; } -std::vector& TransmitterPdu::getAntennaPatternList() -{ - return _antennaPatternList; +std::vector& TransmitterPdu::getAntennaPatternList() { + return _antennaPatternList; } -const std::vector& TransmitterPdu::getAntennaPatternList() const -{ - return _antennaPatternList; +const std::vector& TransmitterPdu::getAntennaPatternList() const { + return _antennaPatternList; } -void TransmitterPdu::setAntennaPatternList(const std::vector& pX) -{ - _antennaPatternList = pX; +void TransmitterPdu::setAntennaPatternList( + const std::vector& pX) { + _antennaPatternList = pX; } -void TransmitterPdu::marshal(DataStream& dataStream) const -{ - RadioCommunicationsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _radioEntityType.marshal(dataStream); - dataStream << _transmitState; - dataStream << _inputSource; - dataStream << _padding1; - _antennaLocation.marshal(dataStream); - _relativeAntennaLocation.marshal(dataStream); - dataStream << _antennaPatternType; - dataStream << ( unsigned short )_antennaPatternList.size(); - dataStream << _frequency; - dataStream << _transmitFrequencyBandwidth; - dataStream << _power; - _modulationType.marshal(dataStream); - dataStream << _cryptoSystem; - dataStream << _cryptoKeyId; - dataStream << ( unsigned char )_modulationParametersList.size(); - dataStream << _padding2; - dataStream << _padding3; - - for(size_t idx = 0; idx < _modulationParametersList.size(); idx++) - { - Vector3Float x = _modulationParametersList[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _antennaPatternList.size(); idx++) - { - Vector3Float x = _antennaPatternList[idx]; - x.marshal(dataStream); - } +void TransmitterPdu::marshal(DataStream& dataStream) const { + RadioCommunicationsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _radioEntityType.marshal(dataStream); + dataStream << _transmitState; + dataStream << _inputSource; + dataStream << _padding1; + _antennaLocation.marshal(dataStream); + _relativeAntennaLocation.marshal(dataStream); + dataStream << _antennaPatternType; + dataStream << (unsigned short)_antennaPatternList.size(); + dataStream << _frequency; + dataStream << _transmitFrequencyBandwidth; + dataStream << _power; + _modulationType.marshal(dataStream); + dataStream << _cryptoSystem; + dataStream << _cryptoKeyId; + dataStream << (unsigned char)_modulationParametersList.size(); + dataStream << _padding2; + dataStream << _padding3; -} + for (size_t idx = 0; idx < _modulationParametersList.size(); idx++) { + Vector3Float x = _modulationParametersList[idx]; + x.marshal(dataStream); + } -void TransmitterPdu::unmarshal(DataStream& dataStream) -{ - RadioCommunicationsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _radioEntityType.unmarshal(dataStream); - dataStream >> _transmitState; - dataStream >> _inputSource; - dataStream >> _padding1; - _antennaLocation.unmarshal(dataStream); - _relativeAntennaLocation.unmarshal(dataStream); - dataStream >> _antennaPatternType; - dataStream >> _antennaPatternCount; - dataStream >> _frequency; - dataStream >> _transmitFrequencyBandwidth; - dataStream >> _power; - _modulationType.unmarshal(dataStream); - dataStream >> _cryptoSystem; - dataStream >> _cryptoKeyId; - dataStream >> _modulationParameterCount; - dataStream >> _padding2; - dataStream >> _padding3; - - _modulationParametersList.clear(); - for(size_t idx = 0; idx < _modulationParameterCount; idx++) - { - Vector3Float x; - x.unmarshal(dataStream); - _modulationParametersList.push_back(x); - } - - _antennaPatternList.clear(); - for(size_t idx = 0; idx < _antennaPatternCount; idx++) - { - Vector3Float x; - x.unmarshal(dataStream); - _antennaPatternList.push_back(x); - } + for (size_t idx = 0; idx < _antennaPatternList.size(); idx++) { + Vector3Float x = _antennaPatternList[idx]; + x.marshal(dataStream); + } } - -bool TransmitterPdu::operator ==(const TransmitterPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); - - if( ! (_radioEntityType == rhs._radioEntityType) ) ivarsEqual = false; - if( ! (_transmitState == rhs._transmitState) ) ivarsEqual = false; - if( ! (_inputSource == rhs._inputSource) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_antennaLocation == rhs._antennaLocation) ) ivarsEqual = false; - if( ! (_relativeAntennaLocation == rhs._relativeAntennaLocation) ) ivarsEqual = false; - if( ! (_antennaPatternType == rhs._antennaPatternType) ) ivarsEqual = false; - if( ! (_frequency == rhs._frequency) ) ivarsEqual = false; - if( ! (_transmitFrequencyBandwidth == rhs._transmitFrequencyBandwidth) ) ivarsEqual = false; - if( ! (_power == rhs._power) ) ivarsEqual = false; - if( ! (_modulationType == rhs._modulationType) ) ivarsEqual = false; - if( ! (_cryptoSystem == rhs._cryptoSystem) ) ivarsEqual = false; - if( ! (_cryptoKeyId == rhs._cryptoKeyId) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_padding3 == rhs._padding3) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _modulationParametersList.size(); idx++) - { - if( ! ( _modulationParametersList[idx] == rhs._modulationParametersList[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _antennaPatternList.size(); idx++) - { - if( ! ( _antennaPatternList[idx] == rhs._antennaPatternList[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int TransmitterPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _radioEntityType.getMarshalledSize(); // _radioEntityType - marshalSize = marshalSize + 1; // _transmitState - marshalSize = marshalSize + 1; // _inputSource - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + _antennaLocation.getMarshalledSize(); // _antennaLocation - marshalSize = marshalSize + _relativeAntennaLocation.getMarshalledSize(); // _relativeAntennaLocation - marshalSize = marshalSize + 2; // _antennaPatternType - marshalSize = marshalSize + 2; // _antennaPatternCount - marshalSize = marshalSize + 8; // _frequency - marshalSize = marshalSize + 4; // _transmitFrequencyBandwidth - marshalSize = marshalSize + 4; // _power - marshalSize = marshalSize + _modulationType.getMarshalledSize(); // _modulationType - marshalSize = marshalSize + 2; // _cryptoSystem - marshalSize = marshalSize + 2; // _cryptoKeyId - marshalSize = marshalSize + 1; // _modulationParameterCount - marshalSize = marshalSize + 2; // _padding2 - marshalSize = marshalSize + 1; // _padding3 - - for(unsigned long long idx=0; idx < _modulationParametersList.size(); idx++) - { - Vector3Float listElement = _modulationParametersList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - - for(unsigned long long idx=0; idx < _antennaPatternList.size(); idx++) - { - Vector3Float listElement = _antennaPatternList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; +void TransmitterPdu::unmarshal(DataStream& dataStream) { + RadioCommunicationsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _radioEntityType.unmarshal(dataStream); + dataStream >> _transmitState; + dataStream >> _inputSource; + dataStream >> _padding1; + _antennaLocation.unmarshal(dataStream); + _relativeAntennaLocation.unmarshal(dataStream); + dataStream >> _antennaPatternType; + dataStream >> _antennaPatternCount; + dataStream >> _frequency; + dataStream >> _transmitFrequencyBandwidth; + dataStream >> _power; + _modulationType.unmarshal(dataStream); + dataStream >> _cryptoSystem; + dataStream >> _cryptoKeyId; + dataStream >> _modulationParameterCount; + dataStream >> _padding2; + dataStream >> _padding3; + + _modulationParametersList.clear(); + for (size_t idx = 0; idx < _modulationParameterCount; idx++) { + Vector3Float x; + x.unmarshal(dataStream); + _modulationParametersList.push_back(x); + } + + _antennaPatternList.clear(); + for (size_t idx = 0; idx < _antennaPatternCount; idx++) { + Vector3Float x; + x.unmarshal(dataStream); + _antennaPatternList.push_back(x); + } +} + +bool TransmitterPdu::operator==(const TransmitterPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); + + if (!(_radioEntityType == rhs._radioEntityType)) ivarsEqual = false; + if (!(_transmitState == rhs._transmitState)) ivarsEqual = false; + if (!(_inputSource == rhs._inputSource)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_antennaLocation == rhs._antennaLocation)) ivarsEqual = false; + if (!(_relativeAntennaLocation == rhs._relativeAntennaLocation)) + ivarsEqual = false; + if (!(_antennaPatternType == rhs._antennaPatternType)) ivarsEqual = false; + if (!(_frequency == rhs._frequency)) ivarsEqual = false; + if (!(_transmitFrequencyBandwidth == rhs._transmitFrequencyBandwidth)) + ivarsEqual = false; + if (!(_power == rhs._power)) ivarsEqual = false; + if (!(_modulationType == rhs._modulationType)) ivarsEqual = false; + if (!(_cryptoSystem == rhs._cryptoSystem)) ivarsEqual = false; + if (!(_cryptoKeyId == rhs._cryptoKeyId)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_padding3 == rhs._padding3)) ivarsEqual = false; + + for (size_t idx = 0; idx < _modulationParametersList.size(); idx++) { + if (!(_modulationParametersList[idx] == rhs._modulationParametersList[idx])) + ivarsEqual = false; + } + + for (size_t idx = 0; idx < _antennaPatternList.size(); idx++) { + if (!(_antennaPatternList[idx] == rhs._antennaPatternList[idx])) + ivarsEqual = false; + } + + return ivarsEqual; +} + +int TransmitterPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _radioEntityType.getMarshalledSize(); // _radioEntityType + marshalSize = marshalSize + 1; // _transmitState + marshalSize = marshalSize + 1; // _inputSource + marshalSize = marshalSize + 2; // _padding1 + marshalSize = + marshalSize + _antennaLocation.getMarshalledSize(); // _antennaLocation + marshalSize = + marshalSize + + _relativeAntennaLocation.getMarshalledSize(); // _relativeAntennaLocation + marshalSize = marshalSize + 2; // _antennaPatternType + marshalSize = marshalSize + 2; // _antennaPatternCount + marshalSize = marshalSize + 8; // _frequency + marshalSize = marshalSize + 4; // _transmitFrequencyBandwidth + marshalSize = marshalSize + 4; // _power + marshalSize = + marshalSize + _modulationType.getMarshalledSize(); // _modulationType + marshalSize = marshalSize + 2; // _cryptoSystem + marshalSize = marshalSize + 2; // _cryptoKeyId + marshalSize = marshalSize + 1; // _modulationParameterCount + marshalSize = marshalSize + 2; // _padding2 + marshalSize = marshalSize + 1; // _padding3 + + for (unsigned long long idx = 0; idx < _modulationParametersList.size(); + idx++) { + Vector3Float listElement = _modulationParametersList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _antennaPatternList.size(); idx++) { + Vector3Float listElement = _antennaPatternList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -409,7 +324,7 @@ int TransmitterPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TransmitterPdu.h b/src/dis6/TransmitterPdu.h index 72c399a2..aba507c4 100644 --- a/src/dis6/TransmitterPdu.h +++ b/src/dis6/TransmitterPdu.h @@ -1,166 +1,163 @@ #pragma once +#include + +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU +// requires manually written code to complete, since the modulation +// parameters are of variable length. UNFINISHED -namespace DIS -{ -// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU requires manually written code to complete, since the modulation parameters are of variable length. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { + protected: /** linear accelleration of entity */ - RadioEntityType _radioEntityType; + RadioEntityType _radioEntityType; /** transmit state */ - unsigned char _transmitState; + unsigned char _transmitState; /** input source */ - unsigned char _inputSource; + unsigned char _inputSource; /** padding */ - unsigned short _padding1; + unsigned short _padding1; /** Location of antenna */ - Vector3Double _antennaLocation; + Vector3Double _antennaLocation; /** relative location of antenna */ - Vector3Float _relativeAntennaLocation; + Vector3Float _relativeAntennaLocation; /** antenna pattern type */ - unsigned short _antennaPatternType; + unsigned short _antennaPatternType; /** atenna pattern length */ - unsigned short _antennaPatternCount; + unsigned short _antennaPatternCount; /** frequency */ unsigned long long _frequency; /** transmit frequency Bandwidth */ - float _transmitFrequencyBandwidth; + float _transmitFrequencyBandwidth; /** transmission power */ - float _power; + float _power; /** modulation */ - ModulationType _modulationType; + ModulationType _modulationType; /** crypto system enumeration */ - unsigned short _cryptoSystem; + unsigned short _cryptoSystem; /** crypto system key identifer */ - unsigned short _cryptoKeyId; + unsigned short _cryptoKeyId; /** how many modulation parameters we have */ - unsigned char _modulationParameterCount; + unsigned char _modulationParameterCount; /** padding2 */ - unsigned short _padding2; + unsigned short _padding2; /** padding3 */ - unsigned char _padding3; + unsigned char _padding3; /** variable length list of modulation parameters */ - std::vector _modulationParametersList; + std::vector _modulationParametersList; /** variable length list of antenna pattern records */ - std::vector _antennaPatternList; - + std::vector _antennaPatternList; public: - TransmitterPdu(); - virtual ~TransmitterPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + TransmitterPdu(); + virtual ~TransmitterPdu(); - RadioEntityType& getRadioEntityType(); - const RadioEntityType& getRadioEntityType() const; - void setRadioEntityType(const RadioEntityType &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getTransmitState() const; - void setTransmitState(unsigned char pX); + RadioEntityType& getRadioEntityType(); + const RadioEntityType& getRadioEntityType() const; + void setRadioEntityType(const RadioEntityType& pX); - unsigned char getInputSource() const; - void setInputSource(unsigned char pX); + unsigned char getTransmitState() const; + void setTransmitState(unsigned char pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + unsigned char getInputSource() const; + void setInputSource(unsigned char pX); - Vector3Double& getAntennaLocation(); - const Vector3Double& getAntennaLocation() const; - void setAntennaLocation(const Vector3Double &pX); + unsigned short getPadding1() const; + void setPadding1(unsigned short pX); - Vector3Float& getRelativeAntennaLocation(); - const Vector3Float& getRelativeAntennaLocation() const; - void setRelativeAntennaLocation(const Vector3Float &pX); + Vector3Double& getAntennaLocation(); + const Vector3Double& getAntennaLocation() const; + void setAntennaLocation(const Vector3Double& pX); - unsigned short getAntennaPatternType() const; - void setAntennaPatternType(unsigned short pX); + Vector3Float& getRelativeAntennaLocation(); + const Vector3Float& getRelativeAntennaLocation() const; + void setRelativeAntennaLocation(const Vector3Float& pX); - unsigned short getAntennaPatternCount() const; + unsigned short getAntennaPatternType() const; + void setAntennaPatternType(unsigned short pX); - unsigned long long getFrequency() const; - void setFrequency(unsigned long long pX); + unsigned short getAntennaPatternCount() const; - float getTransmitFrequencyBandwidth() const; - void setTransmitFrequencyBandwidth(float pX); + unsigned long long getFrequency() const; + void setFrequency(unsigned long long pX); - float getPower() const; - void setPower(float pX); + float getTransmitFrequencyBandwidth() const; + void setTransmitFrequencyBandwidth(float pX); - ModulationType& getModulationType(); - const ModulationType& getModulationType() const; - void setModulationType(const ModulationType &pX); + float getPower() const; + void setPower(float pX); - unsigned short getCryptoSystem() const; - void setCryptoSystem(unsigned short pX); + ModulationType& getModulationType(); + const ModulationType& getModulationType() const; + void setModulationType(const ModulationType& pX); - unsigned short getCryptoKeyId() const; - void setCryptoKeyId(unsigned short pX); + unsigned short getCryptoSystem() const; + void setCryptoSystem(unsigned short pX); - unsigned char getModulationParameterCount() const; + unsigned short getCryptoKeyId() const; + void setCryptoKeyId(unsigned short pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + unsigned char getModulationParameterCount() const; - unsigned char getPadding3() const; - void setPadding3(unsigned char pX); + unsigned short getPadding2() const; + void setPadding2(unsigned short pX); - std::vector& getModulationParametersList(); - const std::vector& getModulationParametersList() const; - void setModulationParametersList(const std::vector& pX); + unsigned char getPadding3() const; + void setPadding3(unsigned char pX); - std::vector& getAntennaPatternList(); - const std::vector& getAntennaPatternList() const; - void setAntennaPatternList(const std::vector& pX); + std::vector& getModulationParametersList(); + const std::vector& getModulationParametersList() const; + void setModulationParametersList(const std::vector& pX); + std::vector& getAntennaPatternList(); + const std::vector& getAntennaPatternList() const; + void setAntennaPatternList(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const TransmitterPdu& rhs) const; + bool operator==(const TransmitterPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -173,7 +170,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TwoByteChunk.cpp b/src/dis6/TwoByteChunk.cpp index 325b95a9..2e3e0d8b 100644 --- a/src/dis6/TwoByteChunk.cpp +++ b/src/dis6/TwoByteChunk.cpp @@ -2,87 +2,63 @@ using namespace DIS; - -TwoByteChunk::TwoByteChunk() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 2; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +TwoByteChunk::TwoByteChunk() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 2; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -TwoByteChunk::~TwoByteChunk() -{ -} +TwoByteChunk::~TwoByteChunk() {} -char* TwoByteChunk::getOtherParameters() -{ - return _otherParameters; -} +char* TwoByteChunk::getOtherParameters() { return _otherParameters; } -const char* TwoByteChunk::getOtherParameters() const -{ - return _otherParameters; +const char* TwoByteChunk::getOtherParameters() const { + return _otherParameters; } -void TwoByteChunk::setOtherParameters(const char* x) -{ - for(int i = 0; i < 2; i++) - { - _otherParameters[i] = x[i]; - } +void TwoByteChunk::setOtherParameters(const char* x) { + for (int i = 0; i < 2; i++) { + _otherParameters[i] = x[i]; + } } -void TwoByteChunk::marshal(DataStream& dataStream) const -{ - - for(size_t idx = 0; idx < 2; idx++) - { - dataStream << _otherParameters[idx]; - } - +void TwoByteChunk::marshal(DataStream& dataStream) const { + for (size_t idx = 0; idx < 2; idx++) { + dataStream << _otherParameters[idx]; + } } -void TwoByteChunk::unmarshal(DataStream& dataStream) -{ - - for(size_t idx = 0; idx < 2; idx++) - { - dataStream >> _otherParameters[idx]; - } - +void TwoByteChunk::unmarshal(DataStream& dataStream) { + for (size_t idx = 0; idx < 2; idx++) { + dataStream >> _otherParameters[idx]; + } } +bool TwoByteChunk::operator==(const TwoByteChunk& rhs) const { + bool ivarsEqual = true; -bool TwoByteChunk::operator ==(const TwoByteChunk& rhs) const - { - bool ivarsEqual = true; - + for (unsigned char idx = 0; idx < 2; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - for(unsigned char idx = 0; idx < 2; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int TwoByteChunk::getMarshalledSize() const -{ - int marshalSize = 0; +int TwoByteChunk::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2 * 1; // _otherParameters - return marshalSize; + marshalSize = marshalSize + 2 * 1; // _otherParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +71,7 @@ int TwoByteChunk::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/TwoByteChunk.h b/src/dis6/TwoByteChunk.h index ef773f0e..34de345d 100644 --- a/src/dis6/TwoByteChunk.h +++ b/src/dis6/TwoByteChunk.h @@ -1,47 +1,43 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 16 bit piece of data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT TwoByteChunk -{ -protected: +class OPENDIS6_EXPORT TwoByteChunk { + protected: /** two bytes of arbitrary data */ - char _otherParameters[2]; - + char _otherParameters[2]; public: - TwoByteChunk(); - virtual ~TwoByteChunk(); + TwoByteChunk(); + virtual ~TwoByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const TwoByteChunk& rhs) const; + bool operator==(const TwoByteChunk& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/UaPdu.cpp b/src/dis6/UaPdu.cpp index ef2d5fb8..0c67a0e3 100644 --- a/src/dis6/UaPdu.cpp +++ b/src/dis6/UaPdu.cpp @@ -2,309 +2,226 @@ using namespace DIS; - -UaPdu::UaPdu() : DistributedEmissionsFamilyPdu(), - _emittingEntityID(), - _eventID(), - _stateChangeIndicator(0), - _pad(0), - _passiveParameterIndex(0), - _propulsionPlantConfiguration(0), - _numberOfShafts(0), - _numberOfAPAs(0), - _numberOfUAEmitterSystems(0) -{ - setPduType( 29 ); +UaPdu::UaPdu() + : DistributedEmissionsFamilyPdu(), + _emittingEntityID(), + _eventID(), + _stateChangeIndicator(0), + _pad(0), + _passiveParameterIndex(0), + _propulsionPlantConfiguration(0), + _numberOfShafts(0), + _numberOfAPAs(0), + _numberOfUAEmitterSystems(0) { + setPduType(29); } -UaPdu::~UaPdu() -{ - _shaftRPMs.clear(); - _apaData.clear(); - _emitterSystems.clear(); +UaPdu::~UaPdu() { + _shaftRPMs.clear(); + _apaData.clear(); + _emitterSystems.clear(); } -EntityID& UaPdu::getEmittingEntityID() -{ - return _emittingEntityID; -} +EntityID& UaPdu::getEmittingEntityID() { return _emittingEntityID; } -const EntityID& UaPdu::getEmittingEntityID() const -{ - return _emittingEntityID; -} +const EntityID& UaPdu::getEmittingEntityID() const { return _emittingEntityID; } -void UaPdu::setEmittingEntityID(const EntityID &pX) -{ - _emittingEntityID = pX; -} +void UaPdu::setEmittingEntityID(const EntityID& pX) { _emittingEntityID = pX; } -EventID& UaPdu::getEventID() -{ - return _eventID; -} +EventID& UaPdu::getEventID() { return _eventID; } -const EventID& UaPdu::getEventID() const -{ - return _eventID; -} +const EventID& UaPdu::getEventID() const { return _eventID; } -void UaPdu::setEventID(const EventID &pX) -{ - _eventID = pX; -} +void UaPdu::setEventID(const EventID& pX) { _eventID = pX; } -char UaPdu::getStateChangeIndicator() const -{ - return _stateChangeIndicator; -} +char UaPdu::getStateChangeIndicator() const { return _stateChangeIndicator; } -void UaPdu::setStateChangeIndicator(char pX) -{ - _stateChangeIndicator = pX; -} +void UaPdu::setStateChangeIndicator(char pX) { _stateChangeIndicator = pX; } -char UaPdu::getPad() const -{ - return _pad; -} - -void UaPdu::setPad(char pX) -{ - _pad = pX; -} - -unsigned short UaPdu::getPassiveParameterIndex() const -{ - return _passiveParameterIndex; -} +char UaPdu::getPad() const { return _pad; } -void UaPdu::setPassiveParameterIndex(unsigned short pX) -{ - _passiveParameterIndex = pX; -} +void UaPdu::setPad(char pX) { _pad = pX; } -unsigned char UaPdu::getPropulsionPlantConfiguration() const -{ - return _propulsionPlantConfiguration; +unsigned short UaPdu::getPassiveParameterIndex() const { + return _passiveParameterIndex; } -void UaPdu::setPropulsionPlantConfiguration(unsigned char pX) -{ - _propulsionPlantConfiguration = pX; +void UaPdu::setPassiveParameterIndex(unsigned short pX) { + _passiveParameterIndex = pX; } -unsigned char UaPdu::getNumberOfShafts() const -{ - return _shaftRPMs.size(); +unsigned char UaPdu::getPropulsionPlantConfiguration() const { + return _propulsionPlantConfiguration; } -unsigned char UaPdu::getNumberOfAPAs() const -{ - return _apaData.size(); +void UaPdu::setPropulsionPlantConfiguration(unsigned char pX) { + _propulsionPlantConfiguration = pX; } -unsigned char UaPdu::getNumberOfUAEmitterSystems() const -{ - return _emitterSystems.size(); -} +unsigned char UaPdu::getNumberOfShafts() const { return _shaftRPMs.size(); } -std::vector& UaPdu::getShaftRPMs() -{ - return _shaftRPMs; -} +unsigned char UaPdu::getNumberOfAPAs() const { return _apaData.size(); } -const std::vector& UaPdu::getShaftRPMs() const -{ - return _shaftRPMs; +unsigned char UaPdu::getNumberOfUAEmitterSystems() const { + return _emitterSystems.size(); } -void UaPdu::setShaftRPMs(const std::vector& pX) -{ - _shaftRPMs = pX; -} +std::vector& UaPdu::getShaftRPMs() { return _shaftRPMs; } -std::vector& UaPdu::getApaData() -{ - return _apaData; -} +const std::vector& UaPdu::getShaftRPMs() const { return _shaftRPMs; } -const std::vector& UaPdu::getApaData() const -{ - return _apaData; -} +void UaPdu::setShaftRPMs(const std::vector& pX) { _shaftRPMs = pX; } -void UaPdu::setApaData(const std::vector& pX) -{ - _apaData = pX; -} +std::vector& UaPdu::getApaData() { return _apaData; } -std::vector& UaPdu::getEmitterSystems() -{ - return _emitterSystems; -} +const std::vector& UaPdu::getApaData() const { return _apaData; } -const std::vector& UaPdu::getEmitterSystems() const -{ - return _emitterSystems; -} +void UaPdu::setApaData(const std::vector& pX) { _apaData = pX; } -void UaPdu::setEmitterSystems(const std::vector& pX) -{ - _emitterSystems = pX; +std::vector& UaPdu::getEmitterSystems() { + return _emitterSystems; } -void UaPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _emittingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _stateChangeIndicator; - dataStream << _pad; - dataStream << _passiveParameterIndex; - dataStream << _propulsionPlantConfiguration; - dataStream << ( unsigned char )_shaftRPMs.size(); - dataStream << ( unsigned char )_apaData.size(); - dataStream << ( unsigned char )_emitterSystems.size(); - - for(size_t idx = 0; idx < _shaftRPMs.size(); idx++) - { - ShaftRPMs x = _shaftRPMs[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _apaData.size(); idx++) - { - ApaData x = _apaData[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _emitterSystems.size(); idx++) - { - AcousticEmitterSystemData x = _emitterSystems[idx]; - x.marshal(dataStream); - } - +const std::vector& UaPdu::getEmitterSystems() const { + return _emitterSystems; } -void UaPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _emittingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _stateChangeIndicator; - dataStream >> _pad; - dataStream >> _passiveParameterIndex; - dataStream >> _propulsionPlantConfiguration; - dataStream >> _numberOfShafts; - dataStream >> _numberOfAPAs; - dataStream >> _numberOfUAEmitterSystems; - - _shaftRPMs.clear(); - for(size_t idx = 0; idx < _numberOfShafts; idx++) - { - ShaftRPMs x; - x.unmarshal(dataStream); - _shaftRPMs.push_back(x); - } - - _apaData.clear(); - for(size_t idx = 0; idx < _numberOfAPAs; idx++) - { - ApaData x; - x.unmarshal(dataStream); - _apaData.push_back(x); - } - - _emitterSystems.clear(); - for(size_t idx = 0; idx < _numberOfUAEmitterSystems; idx++) - { - AcousticEmitterSystemData x; - x.unmarshal(dataStream); - _emitterSystems.push_back(x); - } +void UaPdu::setEmitterSystems( + const std::vector& pX) { + _emitterSystems = pX; } +void UaPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _emittingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _stateChangeIndicator; + dataStream << _pad; + dataStream << _passiveParameterIndex; + dataStream << _propulsionPlantConfiguration; + dataStream << (unsigned char)_shaftRPMs.size(); + dataStream << (unsigned char)_apaData.size(); + dataStream << (unsigned char)_emitterSystems.size(); -bool UaPdu::operator ==(const UaPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - - if( ! (_emittingEntityID == rhs._emittingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_stateChangeIndicator == rhs._stateChangeIndicator) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - if( ! (_passiveParameterIndex == rhs._passiveParameterIndex) ) ivarsEqual = false; - if( ! (_propulsionPlantConfiguration == rhs._propulsionPlantConfiguration) ) ivarsEqual = false; + for (size_t idx = 0; idx < _shaftRPMs.size(); idx++) { + ShaftRPMs x = _shaftRPMs[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _shaftRPMs.size(); idx++) - { - if( ! ( _shaftRPMs[idx] == rhs._shaftRPMs[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _apaData.size(); idx++) { + ApaData x = _apaData[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _emitterSystems.size(); idx++) { + AcousticEmitterSystemData x = _emitterSystems[idx]; + x.marshal(dataStream); + } +} - for(size_t idx = 0; idx < _apaData.size(); idx++) - { - if( ! ( _apaData[idx] == rhs._apaData[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _emitterSystems.size(); idx++) - { - if( ! ( _emitterSystems[idx] == rhs._emitterSystems[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int UaPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 1; // _stateChangeIndicator - marshalSize = marshalSize + 1; // _pad - marshalSize = marshalSize + 2; // _passiveParameterIndex - marshalSize = marshalSize + 1; // _propulsionPlantConfiguration - marshalSize = marshalSize + 1; // _numberOfShafts - marshalSize = marshalSize + 1; // _numberOfAPAs - marshalSize = marshalSize + 1; // _numberOfUAEmitterSystems +void UaPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _emittingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _stateChangeIndicator; + dataStream >> _pad; + dataStream >> _passiveParameterIndex; + dataStream >> _propulsionPlantConfiguration; + dataStream >> _numberOfShafts; + dataStream >> _numberOfAPAs; + dataStream >> _numberOfUAEmitterSystems; - for(unsigned long long idx=0; idx < _shaftRPMs.size(); idx++) - { - ShaftRPMs listElement = _shaftRPMs[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + _shaftRPMs.clear(); + for (size_t idx = 0; idx < _numberOfShafts; idx++) { + ShaftRPMs x; + x.unmarshal(dataStream); + _shaftRPMs.push_back(x); + } + _apaData.clear(); + for (size_t idx = 0; idx < _numberOfAPAs; idx++) { + ApaData x; + x.unmarshal(dataStream); + _apaData.push_back(x); + } - for(unsigned long long idx=0; idx < _apaData.size(); idx++) - { - ApaData listElement = _apaData[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + _emitterSystems.clear(); + for (size_t idx = 0; idx < _numberOfUAEmitterSystems; idx++) { + AcousticEmitterSystemData x; + x.unmarshal(dataStream); + _emitterSystems.push_back(x); + } +} +bool UaPdu::operator==(const UaPdu& rhs) const { + bool ivarsEqual = true; - for(unsigned long long idx=0; idx < _emitterSystems.size(); idx++) - { - AcousticEmitterSystemData listElement = _emitterSystems[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - return marshalSize; + if (!(_emittingEntityID == rhs._emittingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_stateChangeIndicator == rhs._stateChangeIndicator)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + if (!(_passiveParameterIndex == rhs._passiveParameterIndex)) + ivarsEqual = false; + if (!(_propulsionPlantConfiguration == rhs._propulsionPlantConfiguration)) + ivarsEqual = false; + + for (size_t idx = 0; idx < _shaftRPMs.size(); idx++) { + if (!(_shaftRPMs[idx] == rhs._shaftRPMs[idx])) ivarsEqual = false; + } + + for (size_t idx = 0; idx < _apaData.size(); idx++) { + if (!(_apaData[idx] == rhs._apaData[idx])) ivarsEqual = false; + } + + for (size_t idx = 0; idx < _emitterSystems.size(); idx++) { + if (!(_emitterSystems[idx] == rhs._emitterSystems[idx])) ivarsEqual = false; + } + + return ivarsEqual; +} + +int UaPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 1; // _stateChangeIndicator + marshalSize = marshalSize + 1; // _pad + marshalSize = marshalSize + 2; // _passiveParameterIndex + marshalSize = marshalSize + 1; // _propulsionPlantConfiguration + marshalSize = marshalSize + 1; // _numberOfShafts + marshalSize = marshalSize + 1; // _numberOfAPAs + marshalSize = marshalSize + 1; // _numberOfUAEmitterSystems + + for (unsigned long long idx = 0; idx < _shaftRPMs.size(); idx++) { + ShaftRPMs listElement = _shaftRPMs[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _apaData.size(); idx++) { + ApaData listElement = _apaData[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _emitterSystems.size(); idx++) { + AcousticEmitterSystemData listElement = _emitterSystems[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -317,7 +234,7 @@ int UaPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/UaPdu.h b/src/dis6/UaPdu.h index a92b8719..32e6f56f 100644 --- a/src/dis6/UaPdu.h +++ b/src/dis6/UaPdu.h @@ -1,120 +1,129 @@ #pragma once +#include + +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.7.3. Information about underwater acoustic emmissions. This +// requires manual cleanup. The beam data records should ALL be a the finish, +// rather than attached to each emitter system. UNFINISHED -namespace DIS -{ -// Section 5.3.7.3. Information about underwater acoustic emmissions. This requires manual cleanup. The beam data records should ALL be a the finish, rather than attached to each emitter system. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity that is the source of the emission */ - EntityID _emittingEntityID; + EntityID _emittingEntityID; /** ID of event */ - EventID _eventID; + EventID _eventID; - /** This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU */ - char _stateChangeIndicator; + /** This field shall be used to indicate whether the data in the UA PDU + * represent a state update or data that have changed since issuance of the + * last UA PDU */ + char _stateChangeIndicator; /** padding */ - char _pad; + char _pad; - /** This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or file) shall define all noise generated as a function of propulsion plant configurations and associated auxiliaries. */ - unsigned short _passiveParameterIndex; + /** This field indicates which database record (or file) shall be used in the + * definition of passive signature (unintentional) emissions of the entity. + * The indicated database record (or file) shall define all noise generated + * as a function of propulsion plant configurations and associated + * auxiliaries. */ + unsigned short _passiveParameterIndex; - /** This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity. */ - unsigned char _propulsionPlantConfiguration; + /** This field shall specify the entity propulsion plant configuration. This + * field is used to determine the passive signature characteristics of an + * entity. */ + unsigned char _propulsionPlantConfiguration; /** This field shall represent the number of shafts on a platform */ - unsigned char _numberOfShafts; + unsigned char _numberOfShafts; - /** This field shall indicate the number of APAs described in the current UA PDU */ - unsigned char _numberOfAPAs; + /** This field shall indicate the number of APAs described in the current UA + * PDU */ + unsigned char _numberOfAPAs; - /** This field shall specify the number of UA emitter systems being described in the current UA PDU */ - unsigned char _numberOfUAEmitterSystems; + /** This field shall specify the number of UA emitter systems being described + * in the current UA PDU */ + unsigned char _numberOfUAEmitterSystems; /** shaft RPM values */ - std::vector _shaftRPMs; + std::vector _shaftRPMs; /** apaData */ - std::vector _apaData; - - std::vector _emitterSystems; + std::vector _apaData; + std::vector _emitterSystems; public: - UaPdu(); - virtual ~UaPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + UaPdu(); + virtual ~UaPdu(); - EntityID& getEmittingEntityID(); - const EntityID& getEmittingEntityID() const; - void setEmittingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EventID& getEventID(); - const EventID& getEventID() const; - void setEventID(const EventID &pX); + EntityID& getEmittingEntityID(); + const EntityID& getEmittingEntityID() const; + void setEmittingEntityID(const EntityID& pX); - char getStateChangeIndicator() const; - void setStateChangeIndicator(char pX); + EventID& getEventID(); + const EventID& getEventID() const; + void setEventID(const EventID& pX); - char getPad() const; - void setPad(char pX); + char getStateChangeIndicator() const; + void setStateChangeIndicator(char pX); - unsigned short getPassiveParameterIndex() const; - void setPassiveParameterIndex(unsigned short pX); + char getPad() const; + void setPad(char pX); - unsigned char getPropulsionPlantConfiguration() const; - void setPropulsionPlantConfiguration(unsigned char pX); + unsigned short getPassiveParameterIndex() const; + void setPassiveParameterIndex(unsigned short pX); - unsigned char getNumberOfShafts() const; + unsigned char getPropulsionPlantConfiguration() const; + void setPropulsionPlantConfiguration(unsigned char pX); - unsigned char getNumberOfAPAs() const; + unsigned char getNumberOfShafts() const; - unsigned char getNumberOfUAEmitterSystems() const; + unsigned char getNumberOfAPAs() const; - std::vector& getShaftRPMs(); - const std::vector& getShaftRPMs() const; - void setShaftRPMs(const std::vector& pX); + unsigned char getNumberOfUAEmitterSystems() const; - std::vector& getApaData(); - const std::vector& getApaData() const; - void setApaData(const std::vector& pX); + std::vector& getShaftRPMs(); + const std::vector& getShaftRPMs() const; + void setShaftRPMs(const std::vector& pX); - std::vector& getEmitterSystems(); - const std::vector& getEmitterSystems() const; - void setEmitterSystems(const std::vector& pX); + std::vector& getApaData(); + const std::vector& getApaData() const; + void setApaData(const std::vector& pX); + std::vector& getEmitterSystems(); + const std::vector& getEmitterSystems() const; + void setEmitterSystems(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const UaPdu& rhs) const; + bool operator==(const UaPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +136,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/VariableDatum.cpp b/src/dis6/VariableDatum.cpp index 0873890b..517bc949 100644 --- a/src/dis6/VariableDatum.cpp +++ b/src/dis6/VariableDatum.cpp @@ -1,156 +1,143 @@ -#include #include -using namespace DIS; +#include +using namespace DIS; -VariableDatum::VariableDatum(): - _variableDatumID(0), - _variableDatumLength(0), - _variableDatums(static_cast(STATIC_ARRAY_LENGTH), char(0)), // can (theoretically) throw - _arrayLength(0) -{ +VariableDatum::VariableDatum() + : _variableDatumID(0), + _variableDatumLength(0), + _variableDatums(static_cast(STATIC_ARRAY_LENGTH), + char(0)), // can (theoretically) throw + _arrayLength(0) {} +VariableDatum::~VariableDatum() { + // delete [] _variableDatums; } -VariableDatum::~VariableDatum() -{ - //delete [] _variableDatums; +unsigned int VariableDatum::getVariableDatumID() const { + return _variableDatumID; } -unsigned int VariableDatum::getVariableDatumID() const -{ - return _variableDatumID; +void VariableDatum::setVariableDatumID(unsigned int pX) { + _variableDatumID = pX; } -void VariableDatum::setVariableDatumID(unsigned int pX) -{ - _variableDatumID = pX; +unsigned int VariableDatum::getVariableDatumLength() const { + return _variableDatumLength; } -unsigned int VariableDatum::getVariableDatumLength() const -{ - return _variableDatumLength; +void VariableDatum::setVariableDatumLength(unsigned int pX) { + _variableDatumLength = pX; } -void VariableDatum::setVariableDatumLength(unsigned int pX) +char* VariableDatum::getVariableDatums() // a bit dangerous. we could just + // return a ref to _variableDatums { - _variableDatumLength = pX; + return _variableDatums.data(); } -char* VariableDatum::getVariableDatums() // a bit dangerous. we could just return a ref to _variableDatums -{ - return _variableDatums.data(); +const char* VariableDatum::getVariableDatums() const { + return _variableDatums.data(); } -const char* VariableDatum::getVariableDatums() const -{ - return _variableDatums.data(); +void VariableDatum::setVariableDatums(const char* x, + const unsigned int length) { + // convert and store length as bits + _variableDatumLength = length * 8; + + // Figure out _arrayLength (including padding to force whole 8 byte chunks) + unsigned int chunks = length / 8; + int remainder = length % 8; + if (remainder > 0) chunks++; + _arrayLength = chunks * 8; + + // .resize() might (theoretically) throw. want to catch? : what to do? zombie + // datum? + if (_variableDatums.size() < length) _variableDatums.resize(length); + + for (unsigned int i = 0; i < length; i++) { + _variableDatums[i] = x[i]; + } + for (unsigned long i = length; i < _variableDatums.size(); i++) { + _variableDatums[i] = 0; + } } -void VariableDatum::setVariableDatums(const char* x, const unsigned int length) -{ - // convert and store length as bits - _variableDatumLength = length * 8; - - // Figure out _arrayLength (including padding to force whole 8 byte chunks) - unsigned int chunks = length / 8; - int remainder = length % 8; - if(remainder > 0) - chunks++; - _arrayLength = chunks * 8; - - // .resize() might (theoretically) throw. want to catch? : what to do? zombie datum? - if(_variableDatums.size() < length) - _variableDatums.resize(length); - - for(unsigned int i = 0; i < length; i++) - { - _variableDatums[i] = x[i]; - } - for(unsigned long i = length; i < _variableDatums.size(); i++) - { - _variableDatums[i] = 0; - } -} - -void VariableDatum::marshal(DataStream& dataStream) const -{ - dataStream << _variableDatumID; - dataStream << _variableDatumLength; - - for(unsigned int idx = 0; idx < _arrayLength; idx++) - { - dataStream << _variableDatums[idx]; - } +void VariableDatum::marshal(DataStream& dataStream) const { + dataStream << _variableDatumID; + dataStream << _variableDatumLength; + for (unsigned int idx = 0; idx < _arrayLength; idx++) { + dataStream << _variableDatums[idx]; + } } -void VariableDatum::unmarshal(DataStream& dataStream) -{ - dataStream >> _variableDatumID; - dataStream >> _variableDatumLength; - - int byteLength = _variableDatumLength / 8; - int chunks = byteLength / 8; - if(byteLength % 8 > 0) - chunks++; - _arrayLength = chunks * 8; - - //std::cout << "Variable datum #" << (int)_variableDatumID << " arrayLength=" << (int)_arrayLength << " "; - - // .resize() might (theoretically) throw. want to catch? : what to do? zombie datum? - if(_variableDatums.size() < _arrayLength) - _variableDatums.resize(_arrayLength); - - for(unsigned int idx = 0; idx < _arrayLength; idx++) - { - dataStream >> _variableDatums[idx]; - //std::cout << (int)_variableDatums[idx] << " "; - } - //std::cout << std::endl; - for(unsigned long long idx = _arrayLength; idx < _variableDatums.size(); idx++) - { - _variableDatums[idx] = 0; - } - //std::cout << " Created and copied data to new _variableDatums array" << std::endl; - +void VariableDatum::unmarshal(DataStream& dataStream) { + dataStream >> _variableDatumID; + dataStream >> _variableDatumLength; + + int byteLength = _variableDatumLength / 8; + int chunks = byteLength / 8; + if (byteLength % 8 > 0) chunks++; + _arrayLength = chunks * 8; + + // std::cout << "Variable datum #" << (int)_variableDatumID << " arrayLength=" + // << (int)_arrayLength << " "; + + // .resize() might (theoretically) throw. want to catch? : what to do? zombie + // datum? + if (_variableDatums.size() < _arrayLength) + _variableDatums.resize(_arrayLength); + + for (unsigned int idx = 0; idx < _arrayLength; idx++) { + dataStream >> _variableDatums[idx]; + // std::cout << (int)_variableDatums[idx] << " "; + } + // std::cout << std::endl; + for (unsigned long long idx = _arrayLength; idx < _variableDatums.size(); + idx++) { + _variableDatums[idx] = 0; + } + // std::cout << " Created and copied data to new _variableDatums array" << + // std::endl; } -bool VariableDatum::operator ==(const VariableDatum& rhs) const -{ - bool ivarsEqual = true; - - if( ! (_variableDatumID == rhs._variableDatumID) ) ivarsEqual = false; - if( ! (_variableDatumLength == rhs._variableDatumLength) ) ivarsEqual = false; - if( ! (_variableDatums.size() == rhs._variableDatums.size()) ) ivarsEqual = false; - else { - for(std::size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if(!(_variableDatums[idx] == rhs._variableDatums[idx]) ) {ivarsEqual = false; break; } - } +bool VariableDatum::operator==(const VariableDatum& rhs) const { + bool ivarsEqual = true; + + if (!(_variableDatumID == rhs._variableDatumID)) ivarsEqual = false; + if (!(_variableDatumLength == rhs._variableDatumLength)) ivarsEqual = false; + if (!(_variableDatums.size() == rhs._variableDatums.size())) + ivarsEqual = false; + else { + for (std::size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) { + ivarsEqual = false; + break; + } } + } - return ivarsEqual; + return ivarsEqual; } -unsigned int VariableDatum::getMarshalledSize() const -{ - unsigned int marshalSize = 0; +unsigned int VariableDatum::getMarshalledSize() const { + unsigned int marshalSize = 0; - marshalSize = marshalSize + 4; // _variableDatumID - marshalSize = marshalSize + 4; // _variableDatumLength + marshalSize = marshalSize + 4; // _variableDatumID + marshalSize = marshalSize + 4; // _variableDatumLength - marshalSize = marshalSize + _arrayLength; + marshalSize = marshalSize + _arrayLength; - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -163,7 +150,7 @@ unsigned int VariableDatum::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/VariableDatum.h b/src/dis6/VariableDatum.h index f78249fa..8b5df1da 100644 --- a/src/dis6/VariableDatum.h +++ b/src/dis6/VariableDatum.h @@ -1,23 +1,24 @@ #pragma once -#include -#include #include -// length in bytes for the variable data. This should be a dynamically allocated array. +#include +#include + +// length in bytes for the variable data. This should be a dynamically allocated +// array. #define STATIC_ARRAY_LENGTH 128 -namespace DIS -{ +namespace DIS { // Section 5.2.32. Variable Datum Record -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT VariableDatum -{ -protected: +class OPENDIS6_EXPORT VariableDatum { + protected: /** ID of the variable datum */ unsigned int _variableDatumID; @@ -28,30 +29,28 @@ class OPENDIS6_EXPORT VariableDatum std::vector _variableDatums; unsigned int _arrayLength; - public: - VariableDatum(); - virtual ~VariableDatum(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + VariableDatum(); + virtual ~VariableDatum(); - unsigned int getVariableDatumID() const; - void setVariableDatumID(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getVariableDatumLength() const; - void setVariableDatumLength(unsigned int pX); + unsigned int getVariableDatumID() const; + void setVariableDatumID(unsigned int pX); - char* getVariableDatums(); - const char* getVariableDatums() const; - void setVariableDatums(const char* pX, const unsigned int length); + unsigned int getVariableDatumLength() const; + void setVariableDatumLength(unsigned int pX); + char* getVariableDatums(); + const char* getVariableDatums() const; + void setVariableDatums(const char* pX, const unsigned int length); -virtual unsigned int getMarshalledSize() const; + virtual unsigned int getMarshalledSize() const; - bool operator ==(const VariableDatum& rhs) const; + bool operator==(const VariableDatum& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/Vector3Double.cpp b/src/dis6/Vector3Double.cpp index 9c9ad740..24d6d22c 100644 --- a/src/dis6/Vector3Double.cpp +++ b/src/dis6/Vector3Double.cpp @@ -2,89 +2,58 @@ using namespace DIS; +Vector3Double::Vector3Double() : _x(0.0), _y(0.0), _z(0.0) {} -Vector3Double::Vector3Double(): - _x(0.0), - _y(0.0), - _z(0.0) -{ -} +Vector3Double::~Vector3Double() {} -Vector3Double::~Vector3Double() -{ -} +double Vector3Double::getX() const { return _x; } -double Vector3Double::getX() const -{ - return _x; -} +void Vector3Double::setX(double pX) { _x = pX; } -void Vector3Double::setX(double pX) -{ - _x = pX; -} +double Vector3Double::getY() const { return _y; } -double Vector3Double::getY() const -{ - return _y; -} +void Vector3Double::setY(double pX) { _y = pX; } -void Vector3Double::setY(double pX) -{ - _y = pX; -} +double Vector3Double::getZ() const { return _z; } -double Vector3Double::getZ() const -{ - return _z; -} - -void Vector3Double::setZ(double pX) -{ - _z = pX; -} +void Vector3Double::setZ(double pX) { _z = pX; } -void Vector3Double::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; - dataStream << _z; +void Vector3Double::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; + dataStream << _z; } -void Vector3Double::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; +void Vector3Double::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; + dataStream >> _z; } +bool Vector3Double::operator==(const Vector3Double& rhs) const { + bool ivarsEqual = true; -bool Vector3Double::operator ==(const Vector3Double& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; + if (!(_z == rhs._z)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - if( ! (_z == rhs._z) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Vector3Double::getMarshalledSize() const -{ - int marshalSize = 0; +int Vector3Double::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 8; // _x - marshalSize = marshalSize + 8; // _y - marshalSize = marshalSize + 8; // _z - return marshalSize; + marshalSize = marshalSize + 8; // _x + marshalSize = marshalSize + 8; // _y + marshalSize = marshalSize + 8; // _z + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int Vector3Double::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Vector3Double.h b/src/dis6/Vector3Double.h index 417d3459..aed484d0 100644 --- a/src/dis6/Vector3Double.h +++ b/src/dis6/Vector3Double.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.34. Three double precision floating point values, x, y, and z -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Vector3Double -{ -protected: +class OPENDIS6_EXPORT Vector3Double { + protected: /** X value */ - double _x; + double _x; /** Y value */ - double _y; + double _y; /** Z value */ - double _z; - + double _z; public: - Vector3Double(); - virtual ~Vector3Double(); + Vector3Double(); + virtual ~Vector3Double(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - double getX() const; - void setX(double pX); + double getX() const; + void setX(double pX); - double getY() const; - void setY(double pX); + double getY() const; + void setY(double pX); - double getZ() const; - void setZ(double pX); + double getZ() const; + void setZ(double pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Vector3Double& rhs) const; + bool operator==(const Vector3Double& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Vector3Float.cpp b/src/dis6/Vector3Float.cpp index 5988f06a..4ad36c71 100644 --- a/src/dis6/Vector3Float.cpp +++ b/src/dis6/Vector3Float.cpp @@ -2,89 +2,58 @@ using namespace DIS; +Vector3Float::Vector3Float() : _x(0.0), _y(0.0), _z(0.0) {} -Vector3Float::Vector3Float(): - _x(0.0), - _y(0.0), - _z(0.0) -{ -} +Vector3Float::~Vector3Float() {} -Vector3Float::~Vector3Float() -{ -} +float Vector3Float::getX() const { return _x; } -float Vector3Float::getX() const -{ - return _x; -} +void Vector3Float::setX(float pX) { _x = pX; } -void Vector3Float::setX(float pX) -{ - _x = pX; -} +float Vector3Float::getY() const { return _y; } -float Vector3Float::getY() const -{ - return _y; -} +void Vector3Float::setY(float pX) { _y = pX; } -void Vector3Float::setY(float pX) -{ - _y = pX; -} +float Vector3Float::getZ() const { return _z; } -float Vector3Float::getZ() const -{ - return _z; -} - -void Vector3Float::setZ(float pX) -{ - _z = pX; -} +void Vector3Float::setZ(float pX) { _z = pX; } -void Vector3Float::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; - dataStream << _z; +void Vector3Float::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; + dataStream << _z; } -void Vector3Float::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; +void Vector3Float::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; + dataStream >> _z; } +bool Vector3Float::operator==(const Vector3Float& rhs) const { + bool ivarsEqual = true; -bool Vector3Float::operator ==(const Vector3Float& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; + if (!(_z == rhs._z)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - if( ! (_z == rhs._z) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Vector3Float::getMarshalledSize() const -{ - int marshalSize = 0; +int Vector3Float::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - marshalSize = marshalSize + 4; // _z - return marshalSize; + marshalSize = marshalSize + 4; // _x + marshalSize = marshalSize + 4; // _y + marshalSize = marshalSize + 4; // _z + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int Vector3Float::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/Vector3Float.h b/src/dis6/Vector3Float.h index 47f4e16d..c603ab28 100644 --- a/src/dis6/Vector3Float.h +++ b/src/dis6/Vector3Float.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.2.33. Three floating point values, x, y, and z -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT Vector3Float -{ -protected: +class OPENDIS6_EXPORT Vector3Float { + protected: /** X value */ - float _x; + float _x; /** y Value */ - float _y; + float _y; /** Z value */ - float _z; - + float _z; public: - Vector3Float(); - virtual ~Vector3Float(); + Vector3Float(); + virtual ~Vector3Float(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getX() const; - void setX(float pX); + float getX() const; + void setX(float pX); - float getY() const; - void setY(float pX); + float getY() const; + void setY(float pX); - float getZ() const; - void setZ(float pX); + float getZ() const; + void setZ(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Vector3Float& rhs) const; + bool operator==(const Vector3Float& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/VectoringNozzleSystemData.cpp b/src/dis6/VectoringNozzleSystemData.cpp index 1b12b8cf..8fefa072 100644 --- a/src/dis6/VectoringNozzleSystemData.cpp +++ b/src/dis6/VectoringNozzleSystemData.cpp @@ -2,74 +2,62 @@ using namespace DIS; +VectoringNozzleSystemData::VectoringNozzleSystemData() + : _horizontalDeflectionAngle(0.0), _verticalDeflectionAngle(0.0) {} -VectoringNozzleSystemData::VectoringNozzleSystemData(): - _horizontalDeflectionAngle(0.0), - _verticalDeflectionAngle(0.0) -{ -} - -VectoringNozzleSystemData::~VectoringNozzleSystemData() -{ -} +VectoringNozzleSystemData::~VectoringNozzleSystemData() {} -float VectoringNozzleSystemData::getHorizontalDeflectionAngle() const -{ - return _horizontalDeflectionAngle; +float VectoringNozzleSystemData::getHorizontalDeflectionAngle() const { + return _horizontalDeflectionAngle; } -void VectoringNozzleSystemData::setHorizontalDeflectionAngle(float pX) -{ - _horizontalDeflectionAngle = pX; +void VectoringNozzleSystemData::setHorizontalDeflectionAngle(float pX) { + _horizontalDeflectionAngle = pX; } -float VectoringNozzleSystemData::getVerticalDeflectionAngle() const -{ - return _verticalDeflectionAngle; +float VectoringNozzleSystemData::getVerticalDeflectionAngle() const { + return _verticalDeflectionAngle; } -void VectoringNozzleSystemData::setVerticalDeflectionAngle(float pX) -{ - _verticalDeflectionAngle = pX; +void VectoringNozzleSystemData::setVerticalDeflectionAngle(float pX) { + _verticalDeflectionAngle = pX; } -void VectoringNozzleSystemData::marshal(DataStream& dataStream) const -{ - dataStream << _horizontalDeflectionAngle; - dataStream << _verticalDeflectionAngle; +void VectoringNozzleSystemData::marshal(DataStream& dataStream) const { + dataStream << _horizontalDeflectionAngle; + dataStream << _verticalDeflectionAngle; } -void VectoringNozzleSystemData::unmarshal(DataStream& dataStream) -{ - dataStream >> _horizontalDeflectionAngle; - dataStream >> _verticalDeflectionAngle; +void VectoringNozzleSystemData::unmarshal(DataStream& dataStream) { + dataStream >> _horizontalDeflectionAngle; + dataStream >> _verticalDeflectionAngle; } +bool VectoringNozzleSystemData::operator==( + const VectoringNozzleSystemData& rhs) const { + bool ivarsEqual = true; -bool VectoringNozzleSystemData::operator ==(const VectoringNozzleSystemData& rhs) const - { - bool ivarsEqual = true; + if (!(_horizontalDeflectionAngle == rhs._horizontalDeflectionAngle)) + ivarsEqual = false; + if (!(_verticalDeflectionAngle == rhs._verticalDeflectionAngle)) + ivarsEqual = false; - if( ! (_horizontalDeflectionAngle == rhs._horizontalDeflectionAngle) ) ivarsEqual = false; - if( ! (_verticalDeflectionAngle == rhs._verticalDeflectionAngle) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int VectoringNozzleSystemData::getMarshalledSize() const -{ - int marshalSize = 0; +int VectoringNozzleSystemData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _horizontalDeflectionAngle - marshalSize = marshalSize + 4; // _verticalDeflectionAngle - return marshalSize; + marshalSize = marshalSize + 4; // _horizontalDeflectionAngle + marshalSize = marshalSize + 4; // _verticalDeflectionAngle + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +70,7 @@ int VectoringNozzleSystemData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/VectoringNozzleSystemData.h b/src/dis6/VectoringNozzleSystemData.h index 837b4d22..70045d54 100644 --- a/src/dis6/VectoringNozzleSystemData.h +++ b/src/dis6/VectoringNozzleSystemData.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Data about a vectoring nozzle system -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT VectoringNozzleSystemData -{ -protected: +class OPENDIS6_EXPORT VectoringNozzleSystemData { + protected: /** horizontal deflection angle */ - float _horizontalDeflectionAngle; + float _horizontalDeflectionAngle; /** vertical deflection angle */ - float _verticalDeflectionAngle; - + float _verticalDeflectionAngle; public: - VectoringNozzleSystemData(); - virtual ~VectoringNozzleSystemData(); + VectoringNozzleSystemData(); + virtual ~VectoringNozzleSystemData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getHorizontalDeflectionAngle() const; - void setHorizontalDeflectionAngle(float pX); + float getHorizontalDeflectionAngle() const; + void setHorizontalDeflectionAngle(float pX); - float getVerticalDeflectionAngle() const; - void setVerticalDeflectionAngle(float pX); + float getVerticalDeflectionAngle() const; + void setVerticalDeflectionAngle(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const VectoringNozzleSystemData& rhs) const; + bool operator==(const VectoringNozzleSystemData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/WarfareFamilyPdu.cpp b/src/dis6/WarfareFamilyPdu.cpp index 21365978..7aa37326 100644 --- a/src/dis6/WarfareFamilyPdu.cpp +++ b/src/dis6/WarfareFamilyPdu.cpp @@ -2,90 +2,72 @@ using namespace DIS; - -WarfareFamilyPdu::WarfareFamilyPdu() : Pdu(), - _firingEntityID(), - _targetEntityID() -{ - setProtocolFamily( 2 ); +WarfareFamilyPdu::WarfareFamilyPdu() + : Pdu(), _firingEntityID(), _targetEntityID() { + setProtocolFamily(2); } -WarfareFamilyPdu::~WarfareFamilyPdu() -{ -} +WarfareFamilyPdu::~WarfareFamilyPdu() {} -EntityID& WarfareFamilyPdu::getFiringEntityID() -{ - return _firingEntityID; -} +EntityID& WarfareFamilyPdu::getFiringEntityID() { return _firingEntityID; } -const EntityID& WarfareFamilyPdu::getFiringEntityID() const -{ - return _firingEntityID; +const EntityID& WarfareFamilyPdu::getFiringEntityID() const { + return _firingEntityID; } -void WarfareFamilyPdu::setFiringEntityID(const EntityID &pX) -{ - _firingEntityID = pX; +void WarfareFamilyPdu::setFiringEntityID(const EntityID& pX) { + _firingEntityID = pX; } -EntityID& WarfareFamilyPdu::getTargetEntityID() -{ - return _targetEntityID; -} +EntityID& WarfareFamilyPdu::getTargetEntityID() { return _targetEntityID; } -const EntityID& WarfareFamilyPdu::getTargetEntityID() const -{ - return _targetEntityID; +const EntityID& WarfareFamilyPdu::getTargetEntityID() const { + return _targetEntityID; } -void WarfareFamilyPdu::setTargetEntityID(const EntityID &pX) -{ - _targetEntityID = pX; +void WarfareFamilyPdu::setTargetEntityID(const EntityID& pX) { + _targetEntityID = pX; } -void WarfareFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _firingEntityID.marshal(dataStream); - _targetEntityID.marshal(dataStream); +void WarfareFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _firingEntityID.marshal(dataStream); + _targetEntityID.marshal(dataStream); } -void WarfareFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _firingEntityID.unmarshal(dataStream); - _targetEntityID.unmarshal(dataStream); +void WarfareFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _firingEntityID.unmarshal(dataStream); + _targetEntityID.unmarshal(dataStream); } +bool WarfareFamilyPdu::operator==(const WarfareFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool WarfareFamilyPdu::operator ==(const WarfareFamilyPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = Pdu::operator==(rhs); + ivarsEqual = Pdu::operator==(rhs); - if( ! (_firingEntityID == rhs._firingEntityID) ) ivarsEqual = false; - if( ! (_targetEntityID == rhs._targetEntityID) ) ivarsEqual = false; + if (!(_firingEntityID == rhs._firingEntityID)) ivarsEqual = false; + if (!(_targetEntityID == rhs._targetEntityID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int WarfareFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int WarfareFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _firingEntityID.getMarshalledSize(); // _firingEntityID - marshalSize = marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = + marshalSize + _firingEntityID.getMarshalledSize(); // _firingEntityID + marshalSize = + marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +80,7 @@ int WarfareFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/WarfareFamilyPdu.h b/src/dis6/WarfareFamilyPdu.h index 6fda81b9..556721ae 100644 --- a/src/dis6/WarfareFamilyPdu.h +++ b/src/dis6/WarfareFamilyPdu.h @@ -1,57 +1,53 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// Section 5.3.4. abstract superclass for fire and detonation pdus that have +// shared information. COMPLETE -namespace DIS -{ -// Section 5.3.4. abstract superclass for fire and detonation pdus that have shared information. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS6_EXPORT WarfareFamilyPdu : public Pdu -{ -protected: +class OPENDIS6_EXPORT WarfareFamilyPdu : public Pdu { + protected: /** ID of the entity that shot */ - EntityID _firingEntityID; + EntityID _firingEntityID; /** ID of the entity that is being shot at */ - EntityID _targetEntityID; - + EntityID _targetEntityID; public: - WarfareFamilyPdu(); - virtual ~WarfareFamilyPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + WarfareFamilyPdu(); + virtual ~WarfareFamilyPdu(); - EntityID& getFiringEntityID(); - const EntityID& getFiringEntityID() const; - void setFiringEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getTargetEntityID(); - const EntityID& getTargetEntityID() const; - void setTargetEntityID(const EntityID &pX); + EntityID& getFiringEntityID(); + const EntityID& getFiringEntityID() const; + void setFiringEntityID(const EntityID& pX); + EntityID& getTargetEntityID(); + const EntityID& getTargetEntityID() const; + void setTargetEntityID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const WarfareFamilyPdu& rhs) const; + bool operator==(const WarfareFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis6/symbolic_names.h b/src/dis6/symbolic_names.h index 37376534..0e1b08d4 100644 --- a/src/dis6/symbolic_names.h +++ b/src/dis6/symbolic_names.h @@ -6,79 +6,82 @@ * Symbolic names as defined in 5.1.4 */ namespace DIS { -const unsigned int AGG_HRT_BEAT_TIMER = 30U; //s -const unsigned int AGG_RESPONSE_DFLT = 10U; //s -const unsigned short ALL_AGGS = 0xFFFFU; -const unsigned short ALL_APPLIC = 0xFFFFU; -const unsigned short ALL_ENTITIES = 0xFFFFU; -const unsigned short ALL_OBJECTS = 0xFFFFU; -const unsigned short ALL_SITES = 0xFFFFU; -const unsigned int APPEAR_HRT_BEAT_TIMER = 60U; //se -const unsigned int COLLISION_ELASTIC_TO = 5U; //s -const unsigned int COLLISION_THRSH_DFLT = 1U; //m/s +const unsigned int AGG_HRT_BEAT_TIMER = 30U; // s +const unsigned int AGG_RESPONSE_DFLT = 10U; // s +const unsigned short ALL_AGGS = 0xFFFFU; +const unsigned short ALL_APPLIC = 0xFFFFU; +const unsigned short ALL_ENTITIES = 0xFFFFU; +const unsigned short ALL_OBJECTS = 0xFFFFU; +const unsigned short ALL_SITES = 0xFFFFU; +const unsigned int APPEAR_HRT_BEAT_TIMER = 60U; // se +const unsigned int COLLISION_ELASTIC_TO = 5U; // s +const unsigned int COLLISION_THRSH_DFLT = 1U; // m/s -const unsigned int DRA_ORIENT_THRSH_DFLT = 3U; //degrees -const unsigned int DRA_POS_THRSH_DFLT = 1U; //m -const unsigned int EE_AZ_THRSH_DFLT = 1U; //degrees -const unsigned int EE_EL_THRSH_DFLT = 1U; //degrees +const unsigned int DRA_ORIENT_THRSH_DFLT = 3U; // degrees +const unsigned int DRA_POS_THRSH_DFLT = 1U; // m +const unsigned int EE_AZ_THRSH_DFLT = 1U; // degrees +const unsigned int EE_EL_THRSH_DFLT = 1U; // degrees -const unsigned int EP_DIMENSION_THRSH_DFLT = 1U; //m -const unsigned short EP_NO_SEQUENCE = 0xFFFFU; -const unsigned int EP_POS_THRSH_DFLT = 1U; //m shift -const unsigned int EP_STATE_THRSH_DFLT = 10U; //% -const unsigned int GD_HRT_BEAT_TIMER = 15U; //min -const unsigned int HRT_BEAT_MOVE_TIMER = 2U; //s -const float HRT_BEAT_MPLIER = 2.4f; -const unsigned int HRT_BEAT_TIMER = 5U; //s -const unsigned int IFF_ATC_NAVAIDS_DFLT = 10U; //s -const unsigned int IFF_ATC_NAVAIDS_CLAT = 2U; //s -const unsigned int LE_HRT_BEAT_TIMER = 30; //s -//MINEFIELD_CHANGE_DFLT between 0 and MINEFIELD_DATA_DFLT -const unsigned int MINEFIELD_DATA_DFLT = 5U; //s -const unsigned int MINEFIELD_DATA_TIMEOUT_DLFT = 5U; //s -const unsigned int MINEFIELD_DFLT = 5U; //s -const unsigned int MINEFIELD_RESPONSE_DFLT = 1U; //s +const unsigned int EP_DIMENSION_THRSH_DFLT = 1U; // m +const unsigned short EP_NO_SEQUENCE = 0xFFFFU; +const unsigned int EP_POS_THRSH_DFLT = 1U; // m shift +const unsigned int EP_STATE_THRSH_DFLT = 10U; //% +const unsigned int GD_HRT_BEAT_TIMER = 15U; // min +const unsigned int HRT_BEAT_MOVE_TIMER = 2U; // s +const float HRT_BEAT_MPLIER = 2.4f; +const unsigned int HRT_BEAT_TIMER = 5U; // s +const unsigned int IFF_ATC_NAVAIDS_DFLT = 10U; // s +const unsigned int IFF_ATC_NAVAIDS_CLAT = 2U; // s +const unsigned int LE_HRT_BEAT_TIMER = 30; // s +// MINEFIELD_CHANGE_DFLT between 0 and MINEFIELD_DATA_DFLT +const unsigned int MINEFIELD_DATA_DFLT = 5U; // s +const unsigned int MINEFIELD_DATA_TIMEOUT_DLFT = 5U; // s +const unsigned int MINEFIELD_DFLT = 5U; // s +const unsigned int MINEFIELD_RESPONSE_DFLT = 1U; // s -const unsigned short NO_AGG = 0U; +const unsigned short NO_AGG = 0U; const unsigned short NO_APPLIC = 0U; const unsigned short NO_ENTITY = 0U; -const unsigned int NO_FIRE_MISSION = 0U; +const unsigned int NO_FIRE_MISSION = 0U; const unsigned short NO_OBJECT = 0U; -const unsigned short NO_SITE = 0U; +const unsigned short NO_SITE = 0U; -const unsigned int REPAR_REC_T1_DFLT = 5U; //s -const unsigned int REPAR_SUP_T1_DFLT = 12U; //s -const unsigned int REPAR_SUP_T2_DFLT = 12U; //s -const unsigned int RESUP_REC_T1_DFLT = 5U; //s -const unsigned int RESUP_REC_T2_DFLT = 55U; //s -const unsigned int RESUP_SUP_T1_DFLT = 1U; //min -const unsigned short RQST_ASSIGN_ID = 0xFFFEU; -const unsigned int SEES_NDA_THRSH_DFLT = 2U; //degrees in the axis of deflection -const unsigned int SEES_PS_THRSH_DFLT = 10U; //% of the maximum value of the Power Setting -const unsigned int SEES_RPM_DELTA_THRSH_DFLT = 5U; //% of the maximum engine speed in RPM -const unsigned int SEES_STATE_UPDATE_DFLT = 3U; //min -const unsigned int SM_REL_RETRY_CNT_DFLT = 3U; -const unsigned int SM_REL_RETRY_DELAY_DFLT = 2U; //s - -const unsigned int TARGETS_IN_TJ_FIELD_DFLT = 10U; -const unsigned int TI_TIMER1_DFLT = 2U; //s -const unsigned int TI_TIMER2_DFLT = 12U; //s -const unsigned int TR_TIMER1_DFLT = 5U; //s -const unsigned int TR_TIMER2_DFLT = 60U; //s -const unsigned int TRANS_ORIENT_THRSH_DFLT = 180U; //degrees -const unsigned int TRANS_POS_THRSH_DFLT = 500U; //m -const unsigned int UA_LOCATION_CHANGE_DELTA = 10U; //m -const unsigned int UA_ORIENTATION_CHANGE_DELTA = 2U; //degrees -const unsigned int UA_SRPM_CHANGE_DELTA = 5U; //% of maximum shaft speed in RPM -const unsigned int UA_SRPM_ROC_CHANGE_DELTA = 10U; //% of maximum rate of change -const unsigned int UA_STATE_UPDATE_HRT_BEAT_TIMER = 3U; //min +const unsigned int REPAR_REC_T1_DFLT = 5U; // s +const unsigned int REPAR_SUP_T1_DFLT = 12U; // s +const unsigned int REPAR_SUP_T2_DFLT = 12U; // s +const unsigned int RESUP_REC_T1_DFLT = 5U; // s +const unsigned int RESUP_REC_T2_DFLT = 55U; // s +const unsigned int RESUP_SUP_T1_DFLT = 1U; // min +const unsigned short RQST_ASSIGN_ID = 0xFFFEU; +const unsigned int SEES_NDA_THRSH_DFLT = + 2U; // degrees in the axis of deflection +const unsigned int SEES_PS_THRSH_DFLT = + 10U; //% of the maximum value of the Power Setting +const unsigned int SEES_RPM_DELTA_THRSH_DFLT = + 5U; //% of the maximum engine speed in RPM +const unsigned int SEES_STATE_UPDATE_DFLT = 3U; // min +const unsigned int SM_REL_RETRY_CNT_DFLT = 3U; +const unsigned int SM_REL_RETRY_DELAY_DFLT = 2U; // s +const unsigned int TARGETS_IN_TJ_FIELD_DFLT = 10U; +const unsigned int TI_TIMER1_DFLT = 2U; // s +const unsigned int TI_TIMER2_DFLT = 12U; // s +const unsigned int TR_TIMER1_DFLT = 5U; // s +const unsigned int TR_TIMER2_DFLT = 60U; // s +const unsigned int TRANS_ORIENT_THRSH_DFLT = 180U; // degrees +const unsigned int TRANS_POS_THRSH_DFLT = 500U; // m +const unsigned int UA_LOCATION_CHANGE_DELTA = 10U; // m +const unsigned int UA_ORIENTATION_CHANGE_DELTA = 2U; // degrees +const unsigned int UA_SRPM_CHANGE_DELTA = 5U; //% of maximum shaft speed in RPM +const unsigned int UA_SRPM_ROC_CHANGE_DELTA = + 10U; //% of maximum rate of change +const unsigned int UA_STATE_UPDATE_HRT_BEAT_TIMER = 3U; // min /** If you want to have the EntityID constants below, you - * need to add the constructor EntityID(unsigned short,unsigned short,unsigned short) - * and recompile open-dis + * need to add the constructor EntityID(unsigned short,unsigned short,unsigned + * short) and recompile open-dis * */ /* @@ -90,5 +93,4 @@ const DIS::EntityID NO_LOCATION(NO_SITE, NO_APPLIC, NO_ENTITY); const DIS::EntityID NO_SPECIFIC_ENTITY(NO_SITE, NO_APPLIC, NO_ENTITY); const DIS::EntityID TARGET_ID_UNKNOWN(NO_SITE, NO_APPLIC, NO_ENTITY); */ -} - +} // namespace DIS diff --git a/src/dis6/utils/Conversion.cpp b/src/dis6/utils/Conversion.cpp index ea066aef..57da99a0 100644 --- a/src/dis6/utils/Conversion.cpp +++ b/src/dis6/utils/Conversion.cpp @@ -3,28 +3,25 @@ using namespace DIS; -//const unsigned char Convert::ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; +// const unsigned char +// Convert::ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; +int Convert::MakeArticulationParameterType(int typeclass, int typemetric) { + // enforce a ceiling on typemetric + typemetric = typemetric & ARTICULATION_PARAMETER_TYPE_METRIC_MASK; -int Convert::MakeArticulationParameterType(int typeclass, int typemetric) -{ - // enforce a ceiling on typemetric - typemetric = typemetric & ARTICULATION_PARAMETER_TYPE_METRIC_MASK; - - // shift the typeclass bits to the left by the precision amount of typemetric - // and then add the typemetric bits - return( (typeclass << ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS) - + typemetric ); + // shift the typeclass bits to the left by the precision amount of typemetric + // and then add the typemetric bits + return ((typeclass << ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS) + + typemetric); } -int Convert::GetArticulationTypeMetric(int parametertype) -{ - // wipe off the typeclass bits and return the typemetric bits - return( parametertype & ARTICULATION_PARAMETER_TYPE_METRIC_MASK); +int Convert::GetArticulationTypeMetric(int parametertype) { + // wipe off the typeclass bits and return the typemetric bits + return (parametertype & ARTICULATION_PARAMETER_TYPE_METRIC_MASK); } -int Convert::GetArticulationTypeClass(int parametertype) -{ - // wipe off the typemetric bits and return the typeclass bits - return( parametertype >> ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS ); +int Convert::GetArticulationTypeClass(int parametertype) { + // wipe off the typemetric bits and return the typeclass bits + return (parametertype >> ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS); } diff --git a/src/dis6/utils/Conversion.h b/src/dis6/utils/Conversion.h index 0486334b..c4ff7b70 100644 --- a/src/dis6/utils/Conversion.h +++ b/src/dis6/utils/Conversion.h @@ -6,38 +6,45 @@ #ifndef _dcl_dis_conversion_h_ #define _dcl_dis_conversion_h_ -#include // for library symbols +#include // for library symbols -namespace DIS -{ - /// a name-scope for conversion functions. - struct OPENDIS6_EXPORT Convert - { - /// the number of bits used to store the type metric value - /// within the Articulation Parameter's parameter type value. - /// this mask is based on the IEEE Std 1278.1-1995 - static const unsigned char ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; +namespace DIS { +/// a name-scope for conversion functions. +struct OPENDIS6_EXPORT Convert { + /// the number of bits used to store the type metric value + /// within the Articulation Parameter's parameter type value. + /// this mask is based on the IEEE Std 1278.1-1995 + static const unsigned char ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = + 5; - /// make the value needed for the ArticulationParameter's Parameter Type. - /// @param typeclass the enumeration for the articulated part. - /// This must have less precision than ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS. - /// @param typemetric the enumeration for the motion description. - /// this must have less precision than 32 - ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS. - /// @return the value to be used as the Parameter Type, with 32 bits precision. - static int MakeArticulationParameterType(int typeclass, int typemetric); + /// make the value needed for the ArticulationParameter's Parameter Type. + /// @param typeclass the enumeration for the articulated part. + /// This must have less precision than + /// ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS. + /// @param typemetric the enumeration for the motion description. + /// this must have less precision than 32 - + /// ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS. + /// @return the value to be used as the Parameter Type, with 32 bits + /// precision. + static int MakeArticulationParameterType(int typeclass, int typemetric); - /// extract the data for the type metric value stored within the parameter type value. - /// this an inverse to the function, MakeArticulationParameterType. - /// @param parametertype the value storing the type metric and type class values. - /// @return the type metric value, with ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision. - static int GetArticulationTypeMetric(int parametertype); + /// extract the data for the type metric value stored within the parameter + /// type value. this an inverse to the function, + /// MakeArticulationParameterType. + /// @param parametertype the value storing the type metric and type class + /// values. + /// @return the type metric value, with + /// ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision. + static int GetArticulationTypeMetric(int parametertype); - /// extract the data for the type class value stored within the parameter type value. - /// this an inverse to the function, MakeArticulationParameterType. - /// @param parametertype the value storing the type metric and type class values. - /// @return the type class value, with ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision - static int GetArticulationTypeClass(int parametertype); - }; -} + /// extract the data for the type class value stored within the parameter type + /// value. this an inverse to the function, MakeArticulationParameterType. + /// @param parametertype the value storing the type metric and type class + /// values. + /// @return the type class value, with + /// ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision + static int GetArticulationTypeClass(int parametertype); +}; +} // namespace DIS -#endif // _dcl_dis_conversion_h_ +#endif // _dcl_dis_conversion_h_ diff --git a/src/dis6/utils/DataStream.cpp b/src/dis6/utils/DataStream.cpp index b9f5600e..7a5bb6b3 100644 --- a/src/dis6/utils/DataStream.cpp +++ b/src/dis6/utils/DataStream.cpp @@ -1,284 +1,225 @@ -#include +#include // for debug output -#include // for debug output +#include using namespace DIS; DataStream::DataStream(Endian stream) - : _buffer() - , _read_pos(0) - , _write_pos(0) - , _stream_endian(stream) - , _machine_endian(LITTLE) -{ - long one(1); - char e = (reinterpret_cast( &one ))[0]; - - if( e == (char)1 ) - { - _machine_endian = LITTLE; - } - else - { - _machine_endian = BIG; - } + : _buffer(), + _read_pos(0), + _write_pos(0), + _stream_endian(stream), + _machine_endian(LITTLE) { + long one(1); + char e = (reinterpret_cast(&one))[0]; + + if (e == (char)1) { + _machine_endian = LITTLE; + } else { + _machine_endian = BIG; + } } DataStream::DataStream(const char* buffer, size_t length, Endian stream) - : _buffer() - , _read_pos(0) - , _write_pos(0) - , _stream_endian(stream) - , _machine_endian(LITTLE) -{ - long one(1); - char e = (reinterpret_cast( &one ))[0]; - - if( e == (char)1 ) - { - _machine_endian = LITTLE; - } - else - { - _machine_endian = BIG; - } - - SetStream( buffer, length, stream ); -} -DataStream::~DataStream() -{ + : _buffer(), + _read_pos(0), + _write_pos(0), + _stream_endian(stream), + _machine_endian(LITTLE) { + long one(1); + char e = (reinterpret_cast(&one))[0]; + + if (e == (char)1) { + _machine_endian = LITTLE; + } else { + _machine_endian = BIG; + } + + SetStream(buffer, length, stream); } +DataStream::~DataStream() {} -//const DataStream::BufferType& DataStream::GetBuffer() const +// const DataStream::BufferType& DataStream::GetBuffer() const //{ -// return _buffer; -//} +// return _buffer; +// } -Endian DataStream::GetStreamEndian() const -{ - return _stream_endian; -} +Endian DataStream::GetStreamEndian() const { return _stream_endian; } -Endian DataStream::GetMachineEndian() const -{ - return _machine_endian; -} +Endian DataStream::GetMachineEndian() const { return _machine_endian; } -size_t DataStream::GetWritePos() const -{ - return _write_pos; -} +size_t DataStream::GetWritePos() const { return _write_pos; } -size_t DataStream::GetReadPos() const -{ - return _read_pos; -} +size_t DataStream::GetReadPos() const { return _read_pos; } -size_t DataStream::size() const -{ - return _buffer.size(); -} +size_t DataStream::size() const { return _buffer.size(); } -void DataStream::clear() -{ - _write_pos = 0; - _read_pos = 0; - _buffer.clear(); +void DataStream::clear() { + _write_pos = 0; + _read_pos = 0; + _buffer.clear(); } -bool DataStream::empty() const -{ - return _buffer.empty(); -} +bool DataStream::empty() const { return _buffer.empty(); } -const char& DataStream::operator [](unsigned int offset) const -{ - return _buffer[_read_pos+offset]; +const char& DataStream::operator[](unsigned int offset) const { + return _buffer[_read_pos + offset]; } // currently copies the source data. -void DataStream::SetStream(const char* buffer, size_t length, Endian stream) -{ - // reassign the endian - _stream_endian = stream; - - _write_pos = length; - _read_pos = 0; - - // resize the array - if( _buffer.size() < length ) - { - _buffer.resize( length ); - } - - // take ownership of the data - // copy the data, expensive! - for(unsigned int i=0; i>(char& c) -{ - ReadAlgorithm( c ); - return *this; +DataStream& DataStream::operator>>(char& c) { + ReadAlgorithm(c); + return *this; } -DataStream& DataStream::operator >>(unsigned char& c) -{ - ReadAlgorithm( c ); - return *this; +DataStream& DataStream::operator>>(unsigned char& c) { + ReadAlgorithm(c); + return *this; } -DataStream& DataStream::operator >>(float& f) -{ - ReadAlgorithm( f ); - return *this; +DataStream& DataStream::operator>>(float& f) { + ReadAlgorithm(f); + return *this; } -DataStream& DataStream::operator >>(double& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(double& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(int& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(int& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(unsigned int& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(unsigned int& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(long long& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(long long& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(unsigned long long& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(unsigned long long& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(unsigned short& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(unsigned short& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(short& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(short& d) { + ReadAlgorithm(d); + return *this; } diff --git a/src/dis6/utils/DataStream.h b/src/dis6/utils/DataStream.h index 60d2c7ea..4d3c6ffe 100644 --- a/src/dis6/utils/DataStream.h +++ b/src/dis6/utils/DataStream.h @@ -6,148 +6,142 @@ #define _dcl_dis_data_stream_h_ // the class member, DataStream::BufferType is causing warnign 4251. -// disable it until a proper fix is found, as instructed from the enlightening article: -// http://www.unknownroad.com/rtfm/VisualStudio/warningC4251.html +// disable it until a proper fix is found, as instructed from the enlightening +// article: http://www.unknownroad.com/rtfm/VisualStudio/warningC4251.html #if _MSC_VER -#pragma warning( push ) -#pragma warning( disable : 4251 ) +#pragma warning(push) +#pragma warning(disable : 4251) #endif -#include // for typedef, member -#include // for typedef, member -#include // for enum -#include // for library symbols -#include // for size_t and NULL definition -#include // for memcpy - -namespace DIS -{ - /// a class to support managing a network buffer. - /// the clients are responsible for managing the char buffer memory. - /// this class explicitly defines operators for expected types. - class OPENDIS6_EXPORT DataStream - { - public: - /// Setup the internal buffer's Endian type. - /// @param stream the Endian type to use for the internal buffer, - /// which will be used for network socket writes. - DataStream(Endian stream); - - /// Setup the internal buffer. - /// @param buffer the data to copy and manage. - /// @param length the number of bytes in the buffer. - /// @param stream the Endian type to use for the internal buffer, - DataStream(const char* buffer, size_t length, Endian stream); - ~DataStream(); - - /// a method for reading the stored buffer data. - /// @param offset the index distance with respect to the current read point. - const char& operator [](unsigned int offset) const; - - /// take ownership of the data buffer. - void SetStream(const char* buffer, size_t length, Endian order); - - // write operations - DataStream& operator <<(bool c); - DataStream& operator <<(char c); - DataStream& operator <<(unsigned char c); - DataStream& operator <<(float c); - DataStream& operator <<(double c); - DataStream& operator <<(int c); - DataStream& operator <<(unsigned int c); - DataStream& operator <<(long long c); - DataStream& operator <<(unsigned long long c); - DataStream& operator <<(unsigned short c); - DataStream& operator <<(short c); - - // read operations - DataStream& operator >>(bool& c); - DataStream& operator >>(char& c); - DataStream& operator >>(unsigned char& c); - DataStream& operator >>(float& c); - DataStream& operator >>(double& c); - DataStream& operator >>(int& c); - DataStream& operator >>(unsigned int& c); - DataStream& operator >>(long long& c); - DataStream& operator >>(unsigned long long& c); - DataStream& operator >>(unsigned short& c); - DataStream& operator >>(short& c); - - Endian GetStreamEndian() const; - Endian GetMachineEndian() const; - - size_t GetWritePos() const; - size_t GetReadPos() const; - - size_t size() const; - - void clear(); - - bool empty() const; - - private: - template - void IncrementPointer(IterT& iter) - { - iter += sizeof(T); - } - - template - void DecrementPointer(IterT& iter) - { - iter -= sizeof(T); - } - - /// this algorithm should only be used for primitive types, - /// because the class size takes into account the virtual function table. - template - void WriteAlgorithm(T t) - { - char* ch = reinterpret_cast( &t ); - DoFlip( ch , sizeof(T) ); - DoWrite( ch , sizeof(T) ); - IncrementPointer( _write_pos ); - } - - /// this algorithm should only be used for primitive types, - /// because the class size takes into account the virtual function table. - template - void ReadAlgorithm(T& t) - { - char ch[sizeof(T)]; - DoRead( ch , sizeof(T) ); - DoFlip( ch , sizeof(T) ); - memcpy(&t, ch, sizeof(t)); - IncrementPointer( _read_pos ); - } - - /// will flip the buffer if the buffer endian is different than the machine's. - void DoFlip(char* buf, size_t bufsize); - - void DoWrite(const char* buf, size_t bufsize); - - void DoRead(char* ch, size_t bufsize); - - - typedef std::vector BufferType; - //const BufferType& GetBuffer() const; - - BufferType _buffer; - - /// the location of the read/write. - size_t _read_pos; - size_t _write_pos; - - /// the requirement for the managed buffer - Endian _stream_endian; - - /// the native endian type - Endian _machine_endian; - }; -} +#include // for size_t and NULL definition +#include // for memcpy +#include // for typedef, member +#include // for typedef, member + +#include // for library symbols +#include // for enum + +namespace DIS { +/// a class to support managing a network buffer. +/// the clients are responsible for managing the char buffer memory. +/// this class explicitly defines operators for expected types. +class OPENDIS6_EXPORT DataStream { + public: + /// Setup the internal buffer's Endian type. + /// @param stream the Endian type to use for the internal buffer, + /// which will be used for network socket writes. + DataStream(Endian stream); + + /// Setup the internal buffer. + /// @param buffer the data to copy and manage. + /// @param length the number of bytes in the buffer. + /// @param stream the Endian type to use for the internal buffer, + DataStream(const char* buffer, size_t length, Endian stream); + ~DataStream(); + + /// a method for reading the stored buffer data. + /// @param offset the index distance with respect to the current read point. + const char& operator[](unsigned int offset) const; + + /// take ownership of the data buffer. + void SetStream(const char* buffer, size_t length, Endian order); + + // write operations + DataStream& operator<<(bool c); + DataStream& operator<<(char c); + DataStream& operator<<(unsigned char c); + DataStream& operator<<(float c); + DataStream& operator<<(double c); + DataStream& operator<<(int c); + DataStream& operator<<(unsigned int c); + DataStream& operator<<(long long c); + DataStream& operator<<(unsigned long long c); + DataStream& operator<<(unsigned short c); + DataStream& operator<<(short c); + + // read operations + DataStream& operator>>(bool& c); + DataStream& operator>>(char& c); + DataStream& operator>>(unsigned char& c); + DataStream& operator>>(float& c); + DataStream& operator>>(double& c); + DataStream& operator>>(int& c); + DataStream& operator>>(unsigned int& c); + DataStream& operator>>(long long& c); + DataStream& operator>>(unsigned long long& c); + DataStream& operator>>(unsigned short& c); + DataStream& operator>>(short& c); + + Endian GetStreamEndian() const; + Endian GetMachineEndian() const; + + size_t GetWritePos() const; + size_t GetReadPos() const; + + size_t size() const; + + void clear(); + + bool empty() const; + + private: + template + void IncrementPointer(IterT& iter) { + iter += sizeof(T); + } + + template + void DecrementPointer(IterT& iter) { + iter -= sizeof(T); + } + + /// this algorithm should only be used for primitive types, + /// because the class size takes into account the virtual function table. + template + void WriteAlgorithm(T t) { + char* ch = reinterpret_cast(&t); + DoFlip(ch, sizeof(T)); + DoWrite(ch, sizeof(T)); + IncrementPointer(_write_pos); + } + + /// this algorithm should only be used for primitive types, + /// because the class size takes into account the virtual function table. + template + void ReadAlgorithm(T& t) { + char ch[sizeof(T)]; + DoRead(ch, sizeof(T)); + DoFlip(ch, sizeof(T)); + memcpy(&t, ch, sizeof(t)); + IncrementPointer(_read_pos); + } + + /// will flip the buffer if the buffer endian is different than the machine's. + void DoFlip(char* buf, size_t bufsize); + + void DoWrite(const char* buf, size_t bufsize); + + void DoRead(char* ch, size_t bufsize); + + typedef std::vector BufferType; + // const BufferType& GetBuffer() const; + + BufferType _buffer; + + /// the location of the read/write. + size_t _read_pos; + size_t _write_pos; + + /// the requirement for the managed buffer + Endian _stream_endian; + + /// the native endian type + Endian _machine_endian; +}; +} // namespace DIS #if _MSC_VER -#pragma warning( pop ) +#pragma warning(pop) #endif #endif // _dcl_dis_data_stream_h_ diff --git a/src/dis6/utils/Endian.h b/src/dis6/utils/Endian.h index c0bd5e5f..abf07433 100644 --- a/src/dis6/utils/Endian.h +++ b/src/dis6/utils/Endian.h @@ -1,16 +1,14 @@ #ifndef _dcl_dis_endian_h_ #define _dcl_dis_endian_h_ -#include // for library symbols +#include // for library symbols -namespace DIS -{ - /// the order of bytes that are on the left - enum OPENDIS6_EXPORT Endian - { - LITTLE=1, - BIG=0, - }; -} +namespace DIS { +/// the order of bytes that are on the left +enum OPENDIS6_EXPORT Endian { + LITTLE = 1, + BIG = 0, +}; +} // namespace DIS -#endif // _dcl_dis_endian_h_ +#endif // _dcl_dis_endian_h_ diff --git a/src/dis6/utils/IBufferProcessor.h b/src/dis6/utils/IBufferProcessor.h index 6b098a84..a18c4db5 100644 --- a/src/dis6/utils/IBufferProcessor.h +++ b/src/dis6/utils/IBufferProcessor.h @@ -7,15 +7,13 @@ #include -namespace DIS -{ - /// the interface class for handling read operations. - class IBufferProcessor - { - public: - virtual ~IBufferProcessor() {} - virtual void Process(const char* buf, unsigned int size, Endian e)=0; - }; -} +namespace DIS { +/// the interface class for handling read operations. +class IBufferProcessor { + public: + virtual ~IBufferProcessor() {} + virtual void Process(const char* buf, unsigned int size, Endian e) = 0; +}; +} // namespace DIS #endif // _dcl_dis_i_buffer_processor_h_ diff --git a/src/dis6/utils/IPacketProcessor.h b/src/dis6/utils/IPacketProcessor.h index 347bc89b..9f84a31c 100644 --- a/src/dis6/utils/IPacketProcessor.h +++ b/src/dis6/utils/IPacketProcessor.h @@ -5,19 +5,17 @@ #ifndef _dcl_dis_i_packet_processor_h_ #define _dcl_dis_i_packet_processor_h_ -namespace DIS -{ - class Pdu; +namespace DIS { +class Pdu; - /// it is the responsibility of the processor to use the packet - /// because it will be deleted after this call. - class IPacketProcessor - { - public: - virtual ~IPacketProcessor() {} - virtual void Process(const Pdu& p)=0; - }; +/// it is the responsibility of the processor to use the packet +/// because it will be deleted after this call. +class IPacketProcessor { + public: + virtual ~IPacketProcessor() {} + virtual void Process(const Pdu& p) = 0; +}; -} +} // namespace DIS -#endif // _dcl_dis_i_packet_processor_h_ +#endif // _dcl_dis_i_packet_processor_h_ diff --git a/src/dis6/utils/IPduBank.h b/src/dis6/utils/IPduBank.h index c8b9fa7c..b308be93 100644 --- a/src/dis6/utils/IPduBank.h +++ b/src/dis6/utils/IPduBank.h @@ -3,20 +3,16 @@ #include #include -namespace DIS -{ - /// houses instances for the set of known PDU classes to be returned - /// when provided with the PDU type's identifier value. - class IPduBank - { - public: - ~IPduBank(){} - - /// finds the PDU instance corresponding to the identifier - /// @param pdu_type the 8-bit PDU type identifier - /// @return NULL when the pdu_type is unknown. - virtual Pdu* GetStaticPDU( unsigned char pdu_type, DataStream& ds ) = 0; - }; -} - +namespace DIS { +/// houses instances for the set of known PDU classes to be returned +/// when provided with the PDU type's identifier value. +class IPduBank { + public: + ~IPduBank() {} + /// finds the PDU instance corresponding to the identifier + /// @param pdu_type the 8-bit PDU type identifier + /// @return NULL when the pdu_type is unknown. + virtual Pdu* GetStaticPDU(unsigned char pdu_type, DataStream& ds) = 0; +}; +} // namespace DIS diff --git a/src/dis6/utils/IncomingMessage.cpp b/src/dis6/utils/IncomingMessage.cpp index b824639d..b7343d63 100644 --- a/src/dis6/utils/IncomingMessage.cpp +++ b/src/dis6/utils/IncomingMessage.cpp @@ -1,207 +1,180 @@ -#include -#include -#include -#include -#include #include #include - -#include +#include +#include +#include +#include +#include using namespace DIS; -// the DIS specification says the type is known for all PDUs at the 3rd byte of the PDU buffer. +// the DIS specification says the type is known for all PDUs at the 3rd byte of +// the PDU buffer. const unsigned int PDU_TYPE_POSITION = 2; -IncomingMessage::IncomingMessage() -: _processors(), _pduBanks() -{ -} +IncomingMessage::IncomingMessage() : _processors(), _pduBanks() {} -IncomingMessage::~IncomingMessage() -{ -} +IncomingMessage::~IncomingMessage() {} -void IncomingMessage::Process(const char* buf, unsigned int size, Endian e) -{ - if( size < 1 ) - { - return; - } +void IncomingMessage::Process(const char* buf, unsigned int size, Endian e) { + if (size < 1) { + return; + } - DataStream ds( buf , size , e ); + DataStream ds(buf, size, e); - while( ds.GetReadPos() < ds.size() ) - { - unsigned char pdu_type = ds[PDU_TYPE_POSITION]; - SwitchOnType( static_cast(pdu_type), ds ); - } + while (ds.GetReadPos() < ds.size()) { + unsigned char pdu_type = ds[PDU_TYPE_POSITION]; + SwitchOnType(static_cast(pdu_type), ds); + } } -void IncomingMessage::SwitchOnType(DIS::PDUType pdu_type, DataStream& ds) -{ - Pdu *pdu = NULL; - - PduBankContainer::iterator containerIter; - - // first, check if any custom PDU bank registered - PduBankContainer::iterator pduBankIt = _pduBanks.find(pdu_type); - if (pduBankIt != _pduBanks.end()) - { - pdu = pduBankIt->second->GetStaticPDU(pdu_type, ds); - } else - { - pdu = PduBank::GetStaticPDU(pdu_type); - } - - // if valid pdu point, and at least 1 processor - if (pdu && (_processors.count(pdu_type) > 0)) - { - pdu->unmarshal( ds ); - - // assumes the location in the buffer is the packet id. - typedef std::pair RangePair; - RangePair rangepair = _processors.equal_range( pdu_type ); - PacketProcessorContainer::iterator processor_iter = rangepair.first; - PacketProcessorContainer::iterator processor_end = rangepair.second; - while( processor_iter != processor_end ) - { - (processor_iter->second)->Process( *pdu ); - ++processor_iter; - } - } - else - { - ds.clear(); - } +void IncomingMessage::SwitchOnType(DIS::PDUType pdu_type, DataStream& ds) { + Pdu* pdu = NULL; + + PduBankContainer::iterator containerIter; + + // first, check if any custom PDU bank registered + PduBankContainer::iterator pduBankIt = _pduBanks.find(pdu_type); + if (pduBankIt != _pduBanks.end()) { + pdu = pduBankIt->second->GetStaticPDU(pdu_type, ds); + } else { + pdu = PduBank::GetStaticPDU(pdu_type); + } + + // if valid pdu point, and at least 1 processor + if (pdu && (_processors.count(pdu_type) > 0)) { + pdu->unmarshal(ds); + + // assumes the location in the buffer is the packet id. + typedef std::pair + RangePair; + RangePair rangepair = _processors.equal_range(pdu_type); + PacketProcessorContainer::iterator processor_iter = rangepair.first; + PacketProcessorContainer::iterator processor_end = rangepair.second; + while (processor_iter != processor_end) { + (processor_iter->second)->Process(*pdu); + ++processor_iter; + } + } else { + ds.clear(); + } } +bool IncomingMessage::AddProcessor(unsigned char id, IPacketProcessor* pp) { + PacketProcessorContainer::value_type candidate(id, pp); + PacketProcessorContainer::iterator containerIter; -bool IncomingMessage::AddProcessor(unsigned char id, IPacketProcessor* pp) -{ - PacketProcessorContainer::value_type candidate(id,pp); - PacketProcessorContainer::iterator containerIter; - - // If this id doesn't already have this processor (it shouldn't) - if (!FindProccessorContainer(id, pp, containerIter)) - { - _processors.insert( candidate ); - return true; - } + // If this id doesn't already have this processor (it shouldn't) + if (!FindProccessorContainer(id, pp, containerIter)) { + _processors.insert(candidate); + return true; + } - return false; + return false; } ///\todo add proper support for erasing from a multimap. ///\warning erases any processor registered for the id -bool IncomingMessage::RemoveProcessor(unsigned char id, const IPacketProcessor* pp) -{ - PacketProcessorContainer::iterator containerIter; - - if (FindProccessorContainer(id, pp, containerIter)) - { - // Erases only the single pair found in the interator - _processors.erase( containerIter ); - return true; - } - - // The pair doesn't exist - return false; +bool IncomingMessage::RemoveProcessor(unsigned char id, + const IPacketProcessor* pp) { + PacketProcessorContainer::iterator containerIter; + + if (FindProccessorContainer(id, pp, containerIter)) { + // Erases only the single pair found in the interator + _processors.erase(containerIter); + return true; + } + + // The pair doesn't exist + return false; } -bool IncomingMessage::AddPduBank(unsigned char id, IPduBank* pduBank) -{ - PduBankContainer::value_type candidate(id,pduBank); - PduBankContainer::iterator containerIter; +bool IncomingMessage::AddPduBank(unsigned char id, IPduBank* pduBank) { + PduBankContainer::value_type candidate(id, pduBank); + PduBankContainer::iterator containerIter; - // If this id doesn't already have this PDU bank (it shouldn't) - if (!FindPduBankContainer(id, pduBank, containerIter)) - { - _pduBanks.insert( candidate ); - return true; - } + // If this id doesn't already have this PDU bank (it shouldn't) + if (!FindPduBankContainer(id, pduBank, containerIter)) { + _pduBanks.insert(candidate); + return true; + } - return false; + return false; } ///\todo add proper support for erasing from a multimap. ///\warning erases any PDU bank registered PDU type -bool IncomingMessage::RemovePduBank(unsigned char id, const IPduBank* pduBank) -{ - PduBankContainer::iterator containerIter; - - if (FindPduBankContainer(id, pduBank, containerIter)) - { - // Erases only the single pair found in the interator - _pduBanks.erase( containerIter ); - return true; - } +bool IncomingMessage::RemovePduBank(unsigned char id, const IPduBank* pduBank) { + PduBankContainer::iterator containerIter; - // The pair doesn't exist - return false; -} + if (FindPduBankContainer(id, pduBank, containerIter)) { + // Erases only the single pair found in the interator + _pduBanks.erase(containerIter); + return true; + } -IncomingMessage::PacketProcessorContainer& IncomingMessage::GetProcessors() -{ - return _processors; + // The pair doesn't exist + return false; } -const IncomingMessage::PacketProcessorContainer& IncomingMessage::GetProcessors() const -{ - return _processors; +IncomingMessage::PacketProcessorContainer& IncomingMessage::GetProcessors() { + return _processors; } -IncomingMessage::PduBankContainer& IncomingMessage::GetPduBanks() -{ - return _pduBanks; +const IncomingMessage::PacketProcessorContainer& +IncomingMessage::GetProcessors() const { + return _processors; } -const IncomingMessage::PduBankContainer& IncomingMessage::GetPduBanks() const -{ - return _pduBanks; +IncomingMessage::PduBankContainer& IncomingMessage::GetPduBanks() { + return _pduBanks; } +const IncomingMessage::PduBankContainer& IncomingMessage::GetPduBanks() const { + return _pduBanks; +} -bool IncomingMessage::FindProccessorContainer(unsigned char id, const IPacketProcessor* pp, PacketProcessorContainer::iterator &containerIter) -{ - PacketProcessIteratorPair iterPair = _processors.equal_range(id); - - // Check to make sure that the processor we're trying to add is not already there - while (iterPair.first != iterPair.second) - { - // If this processor with a matching id has a the exact same processor, bail - if ((iterPair.first)->second == pp) - { - containerIter = iterPair.first; - return true; - } +bool IncomingMessage::FindProccessorContainer( + unsigned char id, const IPacketProcessor* pp, + PacketProcessorContainer::iterator& containerIter) { + PacketProcessIteratorPair iterPair = _processors.equal_range(id); + + // Check to make sure that the processor we're trying to add is not already + // there + while (iterPair.first != iterPair.second) { + // If this processor with a matching id has a the exact same processor, bail + if ((iterPair.first)->second == pp) { + containerIter = iterPair.first; + return true; + } - iterPair.first++; - } + iterPair.first++; + } - // No matches were found in the loop - return false; + // No matches were found in the loop + return false; } +bool IncomingMessage::FindPduBankContainer( + unsigned char pdu_type, const IPduBank* pduBank, + PduBankContainer::iterator& containerIter) { + PduBankIteratorPair iterPair = _pduBanks.equal_range(pdu_type); + + // Check to make sure that the PDU bank we're trying to add is not already + // there + while (iterPair.first != iterPair.second) { + // If this PDU bank with a matching id has a the exact same PDU bank, bail + if ((iterPair.first)->second == pduBank) { + containerIter = iterPair.first; + return true; + } -bool IncomingMessage::FindPduBankContainer(unsigned char pdu_type, const IPduBank* pduBank, PduBankContainer::iterator &containerIter) -{ - PduBankIteratorPair iterPair = _pduBanks.equal_range(pdu_type); - - // Check to make sure that the PDU bank we're trying to add is not already there - while (iterPair.first != iterPair.second) - { - // If this PDU bank with a matching id has a the exact same PDU bank, bail - if ((iterPair.first)->second == pduBank) - { - containerIter = iterPair.first; - return true; - } - - iterPair.first++; - } + iterPair.first++; + } - // No matches were found in the loop - return false; + // No matches were found in the loop + return false; } diff --git a/src/dis6/utils/IncomingMessage.h b/src/dis6/utils/IncomingMessage.h index 190a1194..8c563c24 100644 --- a/src/dis6/utils/IncomingMessage.h +++ b/src/dis6/utils/IncomingMessage.h @@ -5,73 +5,85 @@ #ifndef _dcl_dis_incoming_message_ #define _dcl_dis_incoming_message_ -#include // for base class -#include -#include // for member -#include // for internal type +#include // for member + #include // for library symbols +#include // for internal type +#include // for base class +#include #include -namespace DIS -{ - class Pdu; - class IPacketProcessor; - class DataStream; +namespace DIS { +class Pdu; +class IPacketProcessor; +class DataStream; - /// A framework for routing the packet to the correct processor. - class OPENDIS6_EXPORT IncomingMessage : public IBufferProcessor - { - public: - /// the container type for supporting processors. - typedef std::multimap PacketProcessorContainer; - - /// the container type for supporting PDU banks. - typedef std::multimap PduBankContainer; +/// A framework for routing the packet to the correct processor. +class OPENDIS6_EXPORT IncomingMessage : public IBufferProcessor { + public: + /// the container type for supporting processors. + typedef std::multimap + PacketProcessorContainer; - IncomingMessage(); - ~IncomingMessage(); + /// the container type for supporting PDU banks. + typedef std::multimap PduBankContainer; - void Process(const char* buf, unsigned int size, Endian e); + IncomingMessage(); + ~IncomingMessage(); - /// registers the ipp instance to process packets with the id - /// @return 'true' if the pair of parameters were not found in the container and were addded. 'false' if the pair was found. - bool AddProcessor(unsigned char id, IPacketProcessor* pp); + void Process(const char* buf, unsigned int size, Endian e); - /// unregisters the ipp instance for packets with the id. it does not clean up the delete the ipp. - /// @return 'true' if the pair of parameters were found in the container and removed. 'false' if the pair was not found. - bool RemoveProcessor(unsigned char id, const IPacketProcessor* pp); + /// registers the ipp instance to process packets with the id + /// @return 'true' if the pair of parameters were not found in the container + /// and were addded. 'false' if the pair was found. + bool AddProcessor(unsigned char id, IPacketProcessor* pp); - /// registers the PDU bank instance to provide the PDU object - /// @return 'true' if the pair of parameters were not found in the container and were addded. 'false' if the pair was found. - bool AddPduBank(unsigned char pdu_type, IPduBank* pduBank); + /// unregisters the ipp instance for packets with the id. it does not clean + /// up the delete the ipp. + /// @return 'true' if the pair of parameters were found in the container and + /// removed. 'false' if the pair was not found. + bool RemoveProcessor(unsigned char id, const IPacketProcessor* pp); - /// unregisters the PDU bank instance - /// @return 'true' if the pair of parameters were found in the container and removed. 'false' if the pair was not found. - bool RemovePduBank(unsigned char pdu_type, const IPduBank* pduBank); + /// registers the PDU bank instance to provide the PDU object + /// @return 'true' if the pair of parameters were not found in the container + /// and were addded. 'false' if the pair was found. + bool AddPduBank(unsigned char pdu_type, IPduBank* pduBank); - PacketProcessorContainer& GetProcessors(); - const PacketProcessorContainer& GetProcessors() const; + /// unregisters the PDU bank instance + /// @return 'true' if the pair of parameters were found in the container and + /// removed. 'false' if the pair was not found. + bool RemovePduBank(unsigned char pdu_type, const IPduBank* pduBank); - PduBankContainer& GetPduBanks(); - const PduBankContainer& GetPduBanks() const; + PacketProcessorContainer& GetProcessors(); + const PacketProcessorContainer& GetProcessors() const; - private: - typedef std::pair PacketProcessIteratorPair; - PacketProcessorContainer _processors; - - typedef std::pair PduBankIteratorPair; - PduBankContainer _pduBanks; + PduBankContainer& GetPduBanks(); + const PduBankContainer& GetPduBanks() const; - void SwitchOnType(DIS::PDUType pdu_type, DataStream& ds); + private: + typedef std::pair + PacketProcessIteratorPair; + PacketProcessorContainer _processors; - /// Searches the proccesor container multimap for a matching container and returns the iterator - bool FindProccessorContainer(unsigned char id, const IPacketProcessor* pp, PacketProcessorContainer::iterator &containerIter); + typedef std::pair + PduBankIteratorPair; + PduBankContainer _pduBanks; - /// Searches the PDU bank container multimap for a matching container and returns the iterator - bool FindPduBankContainer(unsigned char pdu_type, const IPduBank* pduBank, PduBankContainer::iterator &containerIter); - }; + void SwitchOnType(DIS::PDUType pdu_type, DataStream& ds); -} + /// Searches the proccesor container multimap for a matching container and + /// returns the iterator + bool FindProccessorContainer( + unsigned char id, const IPacketProcessor* pp, + PacketProcessorContainer::iterator& containerIter); -#endif // _dcl_dis_incoming_message_ + /// Searches the PDU bank container multimap for a matching container and + /// returns the iterator + bool FindPduBankContainer(unsigned char pdu_type, const IPduBank* pduBank, + PduBankContainer::iterator& containerIter); +}; +} // namespace DIS + +#endif // _dcl_dis_incoming_message_ diff --git a/src/dis6/utils/Masks.h b/src/dis6/utils/Masks.h index 7e6a1b65..c29ef947 100644 --- a/src/dis6/utils/Masks.h +++ b/src/dis6/utils/Masks.h @@ -5,14 +5,13 @@ #ifndef _dcl_dis_masks_h_ #define _dcl_dis_masks_h_ -#include // for library symbols +#include // for library symbols -namespace DIS -{ - /// the mask that will leave only the typemetric - /// from an integer representing the Articulation Parameter's parameter type. - /// this mask is based on the IEEE Std 1278.1-1995 - const unsigned int ARTICULATION_PARAMETER_TYPE_METRIC_MASK = 0x001F; -} +namespace DIS { +/// the mask that will leave only the typemetric +/// from an integer representing the Articulation Parameter's parameter type. +/// this mask is based on the IEEE Std 1278.1-1995 +const unsigned int ARTICULATION_PARAMETER_TYPE_METRIC_MASK = 0x001F; +} // namespace DIS -#endif // _dcl_dis_masks_h_ +#endif // _dcl_dis_masks_h_ diff --git a/src/dis6/utils/PDUBank.cpp b/src/dis6/utils/PDUBank.cpp index f1a13094..7af9e25d 100644 --- a/src/dis6/utils/PDUBank.cpp +++ b/src/dis6/utils/PDUBank.cpp @@ -1,107 +1,167 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include using namespace DIS; -Pdu* PduBank::GetStaticPDU( DIS::PDUType pdu_type ) -{ - static EntityStatePdu entityStatePdu; - static FirePdu firePdu; - static DetonationPdu detonationPdu; - static CollisionPdu collisionPdu; - static ServiceRequestPdu ServiceRequestPdu; - static ResupplyOfferPdu resupplyOfferPdu; - static ResupplyReceivedPdu resupplyReceivedPdu; - static ResupplyCancelPdu resupplyCancelPdu; - static RepairCompletePdu repairCompletePdu; - static RepairResponsePdu repairResponsePdu; - static CreateEntityPdu createEntityPdu; - static RemoveEntityPdu removeEntityPdu; - static StartResumePdu startResumePdu; - static AcknowledgePdu acknowledgePdu; - static ActionRequestPdu actionRequestPdu; - static ActionResponsePdu actionResponsePdu; - static DataQueryPdu dataQueryPdu; - static SetDataPdu setDataPdu; - static EventReportPdu eventReportPdu; - static CommentPdu commentPdu; - static StopFreezePdu stopFreezePdu; - static ElectromagneticEmissionsPdu electromagneticEmissionsPdu; - static DesignatorPdu designatorPdu; - static TransmitterPdu transmitterPdu; - static SignalPdu signalPdu; - static ReceiverPdu receiverPdu; - static IntercomSignalPdu intercomSignalPdu; - static IntercomControlPdu intercomControlPdu; - static AggregateStatePdu aggregateStatePdu; - static IsGroupOfPdu isGroupOfPdu; - static TransferControlRequestPdu transferOwnershipPdu; +Pdu* PduBank::GetStaticPDU(DIS::PDUType pdu_type) { + static EntityStatePdu entityStatePdu; + static FirePdu firePdu; + static DetonationPdu detonationPdu; + static CollisionPdu collisionPdu; + static ServiceRequestPdu ServiceRequestPdu; + static ResupplyOfferPdu resupplyOfferPdu; + static ResupplyReceivedPdu resupplyReceivedPdu; + static ResupplyCancelPdu resupplyCancelPdu; + static RepairCompletePdu repairCompletePdu; + static RepairResponsePdu repairResponsePdu; + static CreateEntityPdu createEntityPdu; + static RemoveEntityPdu removeEntityPdu; + static StartResumePdu startResumePdu; + static AcknowledgePdu acknowledgePdu; + static ActionRequestPdu actionRequestPdu; + static ActionResponsePdu actionResponsePdu; + static DataQueryPdu dataQueryPdu; + static SetDataPdu setDataPdu; + static EventReportPdu eventReportPdu; + static CommentPdu commentPdu; + static StopFreezePdu stopFreezePdu; + static ElectromagneticEmissionsPdu electromagneticEmissionsPdu; + static DesignatorPdu designatorPdu; + static TransmitterPdu transmitterPdu; + static SignalPdu signalPdu; + static ReceiverPdu receiverPdu; + static IntercomSignalPdu intercomSignalPdu; + static IntercomControlPdu intercomControlPdu; + static AggregateStatePdu aggregateStatePdu; + static IsGroupOfPdu isGroupOfPdu; + static TransferControlRequestPdu transferOwnershipPdu; - switch(pdu_type) - { - case PDU_ENTITY_STATE: return &entityStatePdu; break; - case PDU_FIRE: return &firePdu; break; - case PDU_DETONATION: return &detonationPdu; break; - case PDU_COLLISION: return &collisionPdu; break; - case PDU_SERVICE_REQUEST: return &ServiceRequestPdu; break; - case PDU_RESUPPLY_OFFER: return &resupplyOfferPdu; break; - case PDU_RESUPPLY_RECEIVED: return &resupplyReceivedPdu; break; - case PDU_RESUPPLY_CANCEL: return &resupplyCancelPdu; break; - case PDU_REPAIR_COMPLETE: return &repairCompletePdu; break; - case PDU_REPAIR_RESPONSE: return &repairResponsePdu; break; - case PDU_CREATE_ENTITY: return &createEntityPdu; break; - case PDU_REMOVE_ENTITY: return &removeEntityPdu; break; - case PDU_START_RESUME: return &startResumePdu; break; - case PDU_ACKNOWLEDGE: return &acknowledgePdu; break; - case PDU_ACTION_REQUEST: return &actionRequestPdu; break; - case PDU_ACTION_RESPONSE: return &actionResponsePdu; break; - case PDU_DATA_QUERY: return &dataQueryPdu; break; - case PDU_SET_DATA: return &setDataPdu; break; - case PDU_EVENT_REPORT: return &eventReportPdu; break; - case PDU_COMMENT: return &commentPdu; break; - case PDU_STOP_FREEZE: return &stopFreezePdu; break; - case PDU_ELECTRONIC_EMMISIONS: return &electromagneticEmissionsPdu; break; - case PDU_DESIGNATOR: return &designatorPdu; break; - case PDU_TRANSMITTER: return &transmitterPdu; break; - case PDU_SIGNAL: return &signalPdu; break; - case PDU_RECEIVER: return &receiverPdu; break; - case PDU_INTERCOM_SIGNAL: return &intercomSignalPdu; break; - case PDU_INTERCOM_CONTROL: return &intercomControlPdu; break; - case PDU_AGGREGATE_STATE: return &aggregateStatePdu; break; - case PDU_ISGROUPOF: return &isGroupOfPdu; break; - case PDU_TRANSFER_OWNERSHIP: return &transferOwnershipPdu; break; - default: break; - } - return NULL; + switch (pdu_type) { + case PDU_ENTITY_STATE: + return &entityStatePdu; + break; + case PDU_FIRE: + return &firePdu; + break; + case PDU_DETONATION: + return &detonationPdu; + break; + case PDU_COLLISION: + return &collisionPdu; + break; + case PDU_SERVICE_REQUEST: + return &ServiceRequestPdu; + break; + case PDU_RESUPPLY_OFFER: + return &resupplyOfferPdu; + break; + case PDU_RESUPPLY_RECEIVED: + return &resupplyReceivedPdu; + break; + case PDU_RESUPPLY_CANCEL: + return &resupplyCancelPdu; + break; + case PDU_REPAIR_COMPLETE: + return &repairCompletePdu; + break; + case PDU_REPAIR_RESPONSE: + return &repairResponsePdu; + break; + case PDU_CREATE_ENTITY: + return &createEntityPdu; + break; + case PDU_REMOVE_ENTITY: + return &removeEntityPdu; + break; + case PDU_START_RESUME: + return &startResumePdu; + break; + case PDU_ACKNOWLEDGE: + return &acknowledgePdu; + break; + case PDU_ACTION_REQUEST: + return &actionRequestPdu; + break; + case PDU_ACTION_RESPONSE: + return &actionResponsePdu; + break; + case PDU_DATA_QUERY: + return &dataQueryPdu; + break; + case PDU_SET_DATA: + return &setDataPdu; + break; + case PDU_EVENT_REPORT: + return &eventReportPdu; + break; + case PDU_COMMENT: + return &commentPdu; + break; + case PDU_STOP_FREEZE: + return &stopFreezePdu; + break; + case PDU_ELECTRONIC_EMMISIONS: + return &electromagneticEmissionsPdu; + break; + case PDU_DESIGNATOR: + return &designatorPdu; + break; + case PDU_TRANSMITTER: + return &transmitterPdu; + break; + case PDU_SIGNAL: + return &signalPdu; + break; + case PDU_RECEIVER: + return &receiverPdu; + break; + case PDU_INTERCOM_SIGNAL: + return &intercomSignalPdu; + break; + case PDU_INTERCOM_CONTROL: + return &intercomControlPdu; + break; + case PDU_AGGREGATE_STATE: + return &aggregateStatePdu; + break; + case PDU_ISGROUPOF: + return &isGroupOfPdu; + break; + case PDU_TRANSFER_OWNERSHIP: + return &transferOwnershipPdu; + break; + default: + break; + } + return NULL; } - diff --git a/src/dis6/utils/PDUBank.h b/src/dis6/utils/PDUBank.h index fd207dcd..a4a6a6ce 100644 --- a/src/dis6/utils/PDUBank.h +++ b/src/dis6/utils/PDUBank.h @@ -3,19 +3,16 @@ #include #include -namespace DIS -{ - /// houses instances for the set of known PDU classes to be returned - /// when provided with the PDU type's identifier value. - class OPENDIS6_EXPORT PduBank - { - public: - /// finds the PDU instance corresponding to the identifier - /// @param pdu_type the 8-bit PDU type identifier - /// @return NULL when the pdu_type is unknown. - ///\todo make this parameter just 'unsigned char' since that will be easier to generate. - static Pdu* GetStaticPDU( DIS::PDUType pdu_type ); - }; -} - - +namespace DIS { +/// houses instances for the set of known PDU classes to be returned +/// when provided with the PDU type's identifier value. +class OPENDIS6_EXPORT PduBank { + public: + /// finds the PDU instance corresponding to the identifier + /// @param pdu_type the 8-bit PDU type identifier + /// @return NULL when the pdu_type is unknown. + ///\todo make this parameter just 'unsigned char' since that will be easier to + ///generate. + static Pdu* GetStaticPDU(DIS::PDUType pdu_type); +}; +} // namespace DIS diff --git a/src/dis6/utils/PDUType.h b/src/dis6/utils/PDUType.h index 62ae440f..60389377 100644 --- a/src/dis6/utils/PDUType.h +++ b/src/dis6/utils/PDUType.h @@ -1,60 +1,58 @@ #ifndef _dtdis_pdu_type_h_ #define _dtdis_pdu_type_h_ -namespace DIS -{ - enum PDUType - { - PDU_OTHER = 0, - PDU_ENTITY_STATE = 1, - PDU_FIRE = 2, - PDU_DETONATION = 3, - PDU_COLLISION = 4, - PDU_SERVICE_REQUEST = 5, - PDU_RESUPPLY_OFFER = 6, - PDU_RESUPPLY_RECEIVED = 7, - PDU_RESUPPLY_CANCEL = 8, - PDU_REPAIR_COMPLETE = 9, - PDU_REPAIR_RESPONSE = 10, - PDU_CREATE_ENTITY = 11, - PDU_REMOVE_ENTITY = 12, - PDU_START_RESUME = 13, - PDU_STOP_FREEZE = 14, - PDU_ACKNOWLEDGE = 15, - PDU_ACTION_REQUEST = 16, - PDU_ACTION_RESPONSE = 17, - PDU_DATA_QUERY = 18, - PDU_SET_DATA = 19, - PDU_DATA = 20, - PDU_EVENT_REPORT = 21, - PDU_COMMENT = 22, - PDU_ELECTRONIC_EMMISIONS = 23, - PDU_DESIGNATOR = 24, - PDU_TRANSMITTER = 25, - PDU_SIGNAL = 26, - PDU_RECEIVER = 27, - PDU_IFF = 28, - PDU_UNDERWATER_ACOUSTIC = 29, - PDU_SUPPLEMENTAL_EMISSION_ENTITY = 30, - PDU_INTERCOM_SIGNAL = 31, - PDU_INTERCOM_CONTROL = 32, - PDU_AGGREGATE_STATE = 33, - PDU_ISGROUPOF = 34, - PDU_TRANSFER_OWNERSHIP = 35, - PDU_ISPARTOF = 36, - PDU_MINEFIELD_STATE = 37, - PDU_MINEFIELD_QUERY = 38, - PDU_MINEFIELD_DATA = 39, - PDU_MINEFIELD_RESPONSE_NACK = 40, - PDU_ENVIRONMENTAL_PROCESS = 41, - PDU_GRIDDED_DATA = 42, - PDU_POINT_OBJECT_STATE = 43, - PDU_LINEAR_OBJECT_STATE = 44, - PDU_AREAL_OBJECT_STATE = 45, - PDU_TSPI = 46, - PDU_APPEARANCE = 47, - PDU_ARTICULATED_PARTS = 48 - }; +namespace DIS { +enum PDUType { + PDU_OTHER = 0, + PDU_ENTITY_STATE = 1, + PDU_FIRE = 2, + PDU_DETONATION = 3, + PDU_COLLISION = 4, + PDU_SERVICE_REQUEST = 5, + PDU_RESUPPLY_OFFER = 6, + PDU_RESUPPLY_RECEIVED = 7, + PDU_RESUPPLY_CANCEL = 8, + PDU_REPAIR_COMPLETE = 9, + PDU_REPAIR_RESPONSE = 10, + PDU_CREATE_ENTITY = 11, + PDU_REMOVE_ENTITY = 12, + PDU_START_RESUME = 13, + PDU_STOP_FREEZE = 14, + PDU_ACKNOWLEDGE = 15, + PDU_ACTION_REQUEST = 16, + PDU_ACTION_RESPONSE = 17, + PDU_DATA_QUERY = 18, + PDU_SET_DATA = 19, + PDU_DATA = 20, + PDU_EVENT_REPORT = 21, + PDU_COMMENT = 22, + PDU_ELECTRONIC_EMMISIONS = 23, + PDU_DESIGNATOR = 24, + PDU_TRANSMITTER = 25, + PDU_SIGNAL = 26, + PDU_RECEIVER = 27, + PDU_IFF = 28, + PDU_UNDERWATER_ACOUSTIC = 29, + PDU_SUPPLEMENTAL_EMISSION_ENTITY = 30, + PDU_INTERCOM_SIGNAL = 31, + PDU_INTERCOM_CONTROL = 32, + PDU_AGGREGATE_STATE = 33, + PDU_ISGROUPOF = 34, + PDU_TRANSFER_OWNERSHIP = 35, + PDU_ISPARTOF = 36, + PDU_MINEFIELD_STATE = 37, + PDU_MINEFIELD_QUERY = 38, + PDU_MINEFIELD_DATA = 39, + PDU_MINEFIELD_RESPONSE_NACK = 40, + PDU_ENVIRONMENTAL_PROCESS = 41, + PDU_GRIDDED_DATA = 42, + PDU_POINT_OBJECT_STATE = 43, + PDU_LINEAR_OBJECT_STATE = 44, + PDU_AREAL_OBJECT_STATE = 45, + PDU_TSPI = 46, + PDU_APPEARANCE = 47, + PDU_ARTICULATED_PARTS = 48 +}; } -#endif // _dtdis_pdu_type_h_ +#endif // _dtdis_pdu_type_h_ diff --git a/src/dis6/utils/PacketFactory.cpp b/src/dis6/utils/PacketFactory.cpp index 17637058..4fb7487f 100644 --- a/src/dis6/utils/PacketFactory.cpp +++ b/src/dis6/utils/PacketFactory.cpp @@ -1,27 +1,22 @@ -#include -#include #include +#include +#include + using namespace DIS; -Pdu* PacketFactory::CreatePacket(unsigned char id) -{ - FunctionMap::iterator iter =_fMap.find( id ); - if( iter != _fMap.end() ) - { - return (iter->second)(); - } +Pdu* PacketFactory::CreatePacket(unsigned char id) { + FunctionMap::iterator iter = _fMap.find(id); + if (iter != _fMap.end()) { + return (iter->second)(); + } - return NULL; + return NULL; } -void PacketFactory::DestroyPacket(Pdu* pdu) -{ - delete pdu; -} +void PacketFactory::DestroyPacket(Pdu* pdu) { delete pdu; } -bool PacketFactory::IsRegistered(unsigned char id) const -{ - FunctionMap::const_iterator iter = _fMap.find(id); - return( iter != _fMap.end() ); +bool PacketFactory::IsRegistered(unsigned char id) const { + FunctionMap::const_iterator iter = _fMap.find(id); + return (iter != _fMap.end()); } diff --git a/src/dis6/utils/PacketFactory.h b/src/dis6/utils/PacketFactory.h index f41bf9bc..48bd1ed5 100644 --- a/src/dis6/utils/PacketFactory.h +++ b/src/dis6/utils/PacketFactory.h @@ -4,68 +4,67 @@ #ifndef _dcl_dis_packet_factory_h_ #define _dcl_dis_packet_factory_h_ -#include // for member -#include // for library symbols +#include // for member -namespace DIS -{ - class Pdu; +#include // for library symbols - /// a utility to make functions - template - BaseT* CreateImplementation() - { - return new DerivedT(); - } +namespace DIS { +class Pdu; - /// responsible for mapping an ID value to a Pdu type. - class OPENDIS6_EXPORT PacketFactory - { - public: +/// a utility to make functions +template +BaseT* CreateImplementation() { + return new DerivedT(); +} - /// Create a Pdu. - /// @param id the value representing the "type" of the Pdu. The value will be stored in the 3rd position of the buffer, as defined by the DIS specification. - /// @return a dynamically allocated instance of a concrete Pdu. The value will be 'NULL' if no support for creating the concrete Pdu was registered. - Pdu* CreatePacket(unsigned char id); +/// responsible for mapping an ID value to a Pdu type. +class OPENDIS6_EXPORT PacketFactory { + public: + /// Create a Pdu. + /// @param id the value representing the "type" of the Pdu. The value will be + /// stored in the 3rd position of the buffer, as defined by the DIS + /// specification. + /// @return a dynamically allocated instance of a concrete Pdu. The value + /// will be 'NULL' if no support for creating the concrete Pdu was registered. + Pdu* CreatePacket(unsigned char id); - /// Clean up the memory for the Pdu. - /// @param pdu The packet to be deleted. - void DestroyPacket(Pdu* pdu); + /// Clean up the memory for the Pdu. + /// @param pdu The packet to be deleted. + void DestroyPacket(Pdu* pdu); - /// Add support for creating the Pdu. - /// @param id The value identifying the type of the Pdu. - /// @return 'false' if a packet id was already registered for the Pdu type. 'true' if support was added. - template - bool RegisterPacket(unsigned char id) - { - FunctionMap::value_type candidate(id,&CreateImplementation); - std::pair result = _fMap.insert( candidate ); - return result.second; - } + /// Add support for creating the Pdu. + /// @param id The value identifying the type of the Pdu. + /// @return 'false' if a packet id was already registered for the Pdu type. + /// 'true' if support was added. + template + bool RegisterPacket(unsigned char id) { + FunctionMap::value_type candidate(id, &CreateImplementation); + std::pair result = _fMap.insert(candidate); + return result.second; + } - /// Remove support for creating the Pdu. - /// @param id The value identifying the type of the Pdu. - /// @return 'false' if no support previously existed. 'true' if support was removed. - bool UnRegisterPacket(char id) - { - return( _fMap.erase( id )>0 ); - } + /// Remove support for creating the Pdu. + /// @param id The value identifying the type of the Pdu. + /// @return 'false' if no support previously existed. 'true' if support was + /// removed. + bool UnRegisterPacket(char id) { return (_fMap.erase(id) > 0); } - /// Check to know if the Pdu type is supported. - /// @param id The value representing the Pdu type. - /// @return 'true' if support for creating a Pdu was found, 'false' if not found. - bool IsRegistered(unsigned char id) const; + /// Check to know if the Pdu type is supported. + /// @param id The value representing the Pdu type. + /// @return 'true' if support for creating a Pdu was found, 'false' if not + /// found. + bool IsRegistered(unsigned char id) const; - private: - /// the function signature required for creating Pdu instances. - typedef Pdu* (*CREATE_FUNC)(); + private: + /// the function signature required for creating Pdu instances. + typedef Pdu* (*CREATE_FUNC)(); - /// the type to contain mappings to functions used to create Pdu instances. - typedef std::map FunctionMap; + /// the type to contain mappings to functions used to create Pdu instances. + typedef std::map FunctionMap; - /// instance of the storage mechanism for creating Pdu instances. - FunctionMap _fMap; - }; -} + /// instance of the storage mechanism for creating Pdu instances. + FunctionMap _fMap; +}; +} // namespace DIS -#endif // _dcl_dis_packet_factory_h_ +#endif // _dcl_dis_packet_factory_h_ diff --git a/src/dis6/utils/PduFactory.cpp b/src/dis6/utils/PduFactory.cpp index 84d330f8..d28e4d1d 100644 --- a/src/dis6/utils/PduFactory.cpp +++ b/src/dis6/utils/PduFactory.cpp @@ -1,35 +1,32 @@ #include "PduFactory.h" + +#include + +#include +#include +#include #include #include -#include -#include -#include +#include #include +#include +#include #include #include -#include -#include -#include -#include #include +#include #include #include -#include - using namespace DIS; -PduFactory::PduFactory(void) -{ -} +PduFactory::PduFactory(void) {} -PduFactory::~PduFactory(void) -{ -} +PduFactory::~PduFactory(void) {} /** * Converts data read from the wire--a byte array--to a DIS PDU language - * object. A new PDU is created for every data buffer. The consumer of this + * object. A new PDU is created for every data buffer. The consumer of this * object is responsible for freeing it. The PDUs can be up to MTU in size; * in some fairly rare instances, mostly involving multiple PDUs in a single * datagram packet, PDUs may be larger than this and this will fail horribly. @@ -37,89 +34,87 @@ PduFactory::~PduFactory(void) * returns NULL. The caller should check for this. */ -Pdu * PduFactory::createPdu(const char* data) -{ - int dataLength = 1500; // MTU, might fail for some very large PDUs - int pduType = data[2]; - - //std::cout << "Decoding PDU of type " << (int)pduType << std::endl; - - DataStream dataStream(data, dataLength, DIS::BIG); - - Pdu* pdu = NULL; - - switch(pduType) - { - case PDU_ENTITY_STATE: - pdu = new EntityStatePdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_FIRE: - pdu = new FirePdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_DETONATION: - pdu = new DetonationPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_SET_DATA: - pdu = new SetDataPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_CREATE_ENTITY: - pdu = new CreateEntityPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_REMOVE_ENTITY: - pdu = new RemoveEntityPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_START_RESUME: - pdu = new StartResumePdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_STOP_FREEZE: - pdu = new StopFreezePdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_ELECTRONIC_EMMISIONS: - pdu = new ElectromagneticEmissionsPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_TRANSMITTER: - pdu = new TransmitterPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_SIGNAL: - pdu = new SignalPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_RECEIVER: - pdu = new ReceiverPdu(); - pdu->unmarshal(dataStream); - break; - - case PDU_TRANSFER_OWNERSHIP: - pdu = new TransferControlRequestPdu(); - pdu->unmarshal(dataStream); - break; - - default: - std::cout << "Received Unrecognized PDU of type " << (int)pduType << " change PduFactory.cpp to add new PDUs" << std::endl; - break; - } - - return pdu; - +Pdu* PduFactory::createPdu(const char* data) { + int dataLength = 1500; // MTU, might fail for some very large PDUs + int pduType = data[2]; + + // std::cout << "Decoding PDU of type " << (int)pduType << std::endl; + + DataStream dataStream(data, dataLength, DIS::BIG); + + Pdu* pdu = NULL; + + switch (pduType) { + case PDU_ENTITY_STATE: + pdu = new EntityStatePdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_FIRE: + pdu = new FirePdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_DETONATION: + pdu = new DetonationPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_SET_DATA: + pdu = new SetDataPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_CREATE_ENTITY: + pdu = new CreateEntityPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_REMOVE_ENTITY: + pdu = new RemoveEntityPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_START_RESUME: + pdu = new StartResumePdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_STOP_FREEZE: + pdu = new StopFreezePdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_ELECTRONIC_EMMISIONS: + pdu = new ElectromagneticEmissionsPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_TRANSMITTER: + pdu = new TransmitterPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_SIGNAL: + pdu = new SignalPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_RECEIVER: + pdu = new ReceiverPdu(); + pdu->unmarshal(dataStream); + break; + + case PDU_TRANSFER_OWNERSHIP: + pdu = new TransferControlRequestPdu(); + pdu->unmarshal(dataStream); + break; + + default: + std::cout << "Received Unrecognized PDU of type " << (int)pduType + << " change PduFactory.cpp to add new PDUs" << std::endl; + break; + } + + return pdu; } diff --git a/src/dis6/utils/PduFactory.h b/src/dis6/utils/PduFactory.h index 0326d6dc..82294acc 100644 --- a/src/dis6/utils/PduFactory.h +++ b/src/dis6/utils/PduFactory.h @@ -1,29 +1,27 @@ #pragma once -#include // for library symbols #include +#include // for library symbols -namespace DIS -{ - /** - * PduFactory turns byte buffers in IEEE-1278.1 (DIS) format into - * C++ language objects. For example, if you read a datagram packet - * and extract a payload, and that payload is in DIS format, you can - * hand it off to this class and get back an EntityStatePdu, FirePdu, - * or whatever.

- * - * @author DMcG - */ +namespace DIS { +/** + * PduFactory turns byte buffers in IEEE-1278.1 (DIS) format into + * C++ language objects. For example, if you read a datagram packet + * and extract a payload, and that payload is in DIS format, you can + * hand it off to this class and get back an EntityStatePdu, FirePdu, + * or whatever.

+ * + * @author DMcG + */ -class OPENDIS6_EXPORT PduFactory -{ -public: - PduFactory(void); - ~PduFactory(void); +class OPENDIS6_EXPORT PduFactory { + public: + PduFactory(void); + ~PduFactory(void); - /** Returns a PDU of the appropriate concrete subclass. Returns NULL - * for failures or unrecognized PDU types. - */ - Pdu* createPdu(const char * data); + /** Returns a PDU of the appropriate concrete subclass. Returns NULL + * for failures or unrecognized PDU types. + */ + Pdu* createPdu(const char* data); }; -} +} // namespace DIS diff --git a/src/dis6/utils/StreamUtils.cpp b/src/dis6/utils/StreamUtils.cpp index 51aa38ff..15bec8bf 100644 --- a/src/dis6/utils/StreamUtils.cpp +++ b/src/dis6/utils/StreamUtils.cpp @@ -1,36 +1,27 @@ -#include - -#include -#include #include +#include +#include +#include -std::ostream& operator <<(std::ostream& lhs, const DIS::EntityType& rhs) -{ - lhs << "EntityType (" - << (unsigned int)rhs.getEntityKind() - << "," << (unsigned int)rhs.getDomain() - << "," << (unsigned int)rhs.getCountry() - << "," << (unsigned int)rhs.getCategory() - << "," << (unsigned int)rhs.getSubcategory() - << ") "; - return lhs; +std::ostream& operator<<(std::ostream& lhs, const DIS::EntityType& rhs) { + lhs << "EntityType (" << (unsigned int)rhs.getEntityKind() << "," + << (unsigned int)rhs.getDomain() << "," << (unsigned int)rhs.getCountry() + << "," << (unsigned int)rhs.getCategory() << "," + << (unsigned int)rhs.getSubcategory() << ") "; + return lhs; } -std::ostream& operator <<(std::ostream& lhs, const DIS::EntityID& rhs) -{ - lhs << "EntityID (" - << (unsigned int)rhs.getEntity() << ") "; - return lhs; +std::ostream& operator<<(std::ostream& lhs, const DIS::EntityID& rhs) { + lhs << "EntityID (" << (unsigned int)rhs.getEntity() << ") "; + return lhs; } -std::ostream& operator <<(std::ostream& lhs, const DIS::EntityStatePdu& rhs) -{ - lhs << "EntityStatePdu (" << rhs.getEntityID() << ") "; - return lhs; +std::ostream& operator<<(std::ostream& lhs, const DIS::EntityStatePdu& rhs) { + lhs << "EntityStatePdu (" << rhs.getEntityID() << ") "; + return lhs; } -std::ostream& operator <<(std::ostream& lhs, const DIS::DetonationPdu& rhs) -{ - lhs << "DetonationPDU (" << rhs.getFiringEntityID() << ") "; - return lhs; +std::ostream& operator<<(std::ostream& lhs, const DIS::DetonationPdu& rhs) { + lhs << "DetonationPDU (" << rhs.getFiringEntityID() << ") "; + return lhs; } diff --git a/src/dis6/utils/StreamUtils.h b/src/dis6/utils/StreamUtils.h index 53d2bc57..f57e9a2f 100644 --- a/src/dis6/utils/StreamUtils.h +++ b/src/dis6/utils/StreamUtils.h @@ -5,20 +5,24 @@ #ifndef _dis_stream_utils_h_ #define _dis_stream_utils_h_ -#include // for parameter type -#include // for library symbols +#include // for parameter type -namespace DIS -{ - class EntityStatePdu; - class EntityID; - class DetonationPdu; - class EntityType; -} +#include // for library symbols -OPENDIS6_EXPORT std::ostream& operator <<(std::ostream& lhs, const DIS::EntityType& rhs); -OPENDIS6_EXPORT std::ostream& operator <<(std::ostream& lhs, const DIS::EntityID& rhs); -OPENDIS6_EXPORT std::ostream& operator <<(std::ostream& lhs, const DIS::EntityStatePdu& rhs); -OPENDIS6_EXPORT std::ostream& operator <<(std::ostream& lhs, const DIS::DetonationPdu& rhs); +namespace DIS { +class EntityStatePdu; +class EntityID; +class DetonationPdu; +class EntityType; +} // namespace DIS -#endif // _dis_stream_utils_h_ +OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, + const DIS::EntityType& rhs); +OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, + const DIS::EntityID& rhs); +OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, + const DIS::EntityStatePdu& rhs); +OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, + const DIS::DetonationPdu& rhs); + +#endif // _dis_stream_utils_h_ diff --git a/src/dis7/AcknowledgePdu.cpp b/src/dis7/AcknowledgePdu.cpp index cb4de52b..679e24b0 100644 --- a/src/dis7/AcknowledgePdu.cpp +++ b/src/dis7/AcknowledgePdu.cpp @@ -2,135 +2,102 @@ using namespace DIS; - -AcknowledgePdu::AcknowledgePdu() : SimulationManagementFamilyPdu(), - _originatingID(), - _receivingID(), - _acknowledgeFlag(0), - _responseFlag(0), - _requestID(0) -{ - setPduType( 15 ); +AcknowledgePdu::AcknowledgePdu() + : SimulationManagementFamilyPdu(), + _originatingID(), + _receivingID(), + _acknowledgeFlag(0), + _responseFlag(0), + _requestID(0) { + setPduType(15); } -AcknowledgePdu::~AcknowledgePdu() -{ -} +AcknowledgePdu::~AcknowledgePdu() {} -EntityID& AcknowledgePdu::getOriginatingID() -{ - return _originatingID; -} +EntityID& AcknowledgePdu::getOriginatingID() { return _originatingID; } -const EntityID& AcknowledgePdu::getOriginatingID() const -{ - return _originatingID; +const EntityID& AcknowledgePdu::getOriginatingID() const { + return _originatingID; } -void AcknowledgePdu::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; +void AcknowledgePdu::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -EntityID& AcknowledgePdu::getReceivingID() -{ - return _receivingID; -} +EntityID& AcknowledgePdu::getReceivingID() { return _receivingID; } -const EntityID& AcknowledgePdu::getReceivingID() const -{ - return _receivingID; -} +const EntityID& AcknowledgePdu::getReceivingID() const { return _receivingID; } -void AcknowledgePdu::setReceivingID(const EntityID &pX) -{ - _receivingID = pX; -} +void AcknowledgePdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned short AcknowledgePdu::getAcknowledgeFlag() const -{ - return _acknowledgeFlag; +unsigned short AcknowledgePdu::getAcknowledgeFlag() const { + return _acknowledgeFlag; } -void AcknowledgePdu::setAcknowledgeFlag(unsigned short pX) -{ - _acknowledgeFlag = pX; +void AcknowledgePdu::setAcknowledgeFlag(unsigned short pX) { + _acknowledgeFlag = pX; } -unsigned short AcknowledgePdu::getResponseFlag() const -{ - return _responseFlag; -} +unsigned short AcknowledgePdu::getResponseFlag() const { return _responseFlag; } -void AcknowledgePdu::setResponseFlag(unsigned short pX) -{ - _responseFlag = pX; -} +void AcknowledgePdu::setResponseFlag(unsigned short pX) { _responseFlag = pX; } -unsigned int AcknowledgePdu::getRequestID() const -{ - return _requestID; -} +unsigned int AcknowledgePdu::getRequestID() const { return _requestID; } -void AcknowledgePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void AcknowledgePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void AcknowledgePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingID.marshal(dataStream); - _receivingID.marshal(dataStream); - dataStream << _acknowledgeFlag; - dataStream << _responseFlag; - dataStream << _requestID; +void AcknowledgePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingID.marshal(dataStream); + _receivingID.marshal(dataStream); + dataStream << _acknowledgeFlag; + dataStream << _responseFlag; + dataStream << _requestID; } -void AcknowledgePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - dataStream >> _acknowledgeFlag; - dataStream >> _responseFlag; - dataStream >> _requestID; +void AcknowledgePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + dataStream >> _acknowledgeFlag; + dataStream >> _responseFlag; + dataStream >> _requestID; } +bool AcknowledgePdu::operator==(const AcknowledgePdu& rhs) const { + bool ivarsEqual = true; -bool AcknowledgePdu::operator ==(const AcknowledgePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_acknowledgeFlag == rhs._acknowledgeFlag) ) ivarsEqual = false; - if( ! (_responseFlag == rhs._responseFlag) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_acknowledgeFlag == rhs._acknowledgeFlag)) ivarsEqual = false; + if (!(_responseFlag == rhs._responseFlag)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int AcknowledgePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int AcknowledgePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 2; // _acknowledgeFlag - marshalSize = marshalSize + 2; // _responseFlag - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + 2; // _acknowledgeFlag + marshalSize = marshalSize + 2; // _responseFlag + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -143,7 +110,7 @@ int AcknowledgePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AcknowledgePdu.h b/src/dis7/AcknowledgePdu.h index 4e350db8..2ebc2305 100644 --- a/src/dis7/AcknowledgePdu.h +++ b/src/dis7/AcknowledgePdu.h @@ -1,75 +1,71 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// Section 7.5.6. Acknowledge the receipt of a start/resume, stop/freeze, or +// RemoveEntityPDU. COMPLETE -namespace DIS -{ -// Section 7.5.6. Acknowledge the receipt of a start/resume, stop/freeze, or RemoveEntityPDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for originating entity(or simulation) */ - EntityID _originatingID; + EntityID _originatingID; /** Identifier for the receiving entity(or simulation) */ - EntityID _receivingID; + EntityID _receivingID; /** type of message being acknowledged */ - unsigned short _acknowledgeFlag; + unsigned short _acknowledgeFlag; /** Whether or not the receiving entity was able to comply with the request */ - unsigned short _responseFlag; + unsigned short _responseFlag; /** Request ID that is unique */ - unsigned int _requestID; - + unsigned int _requestID; public: - AcknowledgePdu(); - virtual ~AcknowledgePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + AcknowledgePdu(); + virtual ~AcknowledgePdu(); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingID(); - const EntityID& getReceivingID() const; - void setReceivingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + EntityID& getReceivingID(); + const EntityID& getReceivingID() const; + void setReceivingID(const EntityID& pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + unsigned short getAcknowledgeFlag() const; + void setAcknowledgeFlag(unsigned short pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned short getResponseFlag() const; + void setResponseFlag(unsigned short pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const AcknowledgePdu& rhs) const; + bool operator==(const AcknowledgePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +78,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AcknowledgeReliablePdu.cpp b/src/dis7/AcknowledgeReliablePdu.cpp index 57940d1a..bf814362 100644 --- a/src/dis7/AcknowledgeReliablePdu.cpp +++ b/src/dis7/AcknowledgeReliablePdu.cpp @@ -2,95 +2,81 @@ using namespace DIS; - -AcknowledgeReliablePdu::AcknowledgeReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _acknowledgeFlag(0), - _responseFlag(0), - _requestID(0) -{ - setPduType( 55 ); +AcknowledgeReliablePdu::AcknowledgeReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _acknowledgeFlag(0), + _responseFlag(0), + _requestID(0) { + setPduType(55); } -AcknowledgeReliablePdu::~AcknowledgeReliablePdu() -{ -} +AcknowledgeReliablePdu::~AcknowledgeReliablePdu() {} -unsigned short AcknowledgeReliablePdu::getAcknowledgeFlag() const -{ - return _acknowledgeFlag; +unsigned short AcknowledgeReliablePdu::getAcknowledgeFlag() const { + return _acknowledgeFlag; } -void AcknowledgeReliablePdu::setAcknowledgeFlag(unsigned short pX) -{ - _acknowledgeFlag = pX; +void AcknowledgeReliablePdu::setAcknowledgeFlag(unsigned short pX) { + _acknowledgeFlag = pX; } -unsigned short AcknowledgeReliablePdu::getResponseFlag() const -{ - return _responseFlag; +unsigned short AcknowledgeReliablePdu::getResponseFlag() const { + return _responseFlag; } -void AcknowledgeReliablePdu::setResponseFlag(unsigned short pX) -{ - _responseFlag = pX; +void AcknowledgeReliablePdu::setResponseFlag(unsigned short pX) { + _responseFlag = pX; } -unsigned int AcknowledgeReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int AcknowledgeReliablePdu::getRequestID() const { return _requestID; } -void AcknowledgeReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void AcknowledgeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void AcknowledgeReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _acknowledgeFlag; - dataStream << _responseFlag; - dataStream << _requestID; +void AcknowledgeReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _acknowledgeFlag; + dataStream << _responseFlag; + dataStream << _requestID; } -void AcknowledgeReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _acknowledgeFlag; - dataStream >> _responseFlag; - dataStream >> _requestID; +void AcknowledgeReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _acknowledgeFlag; + dataStream >> _responseFlag; + dataStream >> _requestID; } +bool AcknowledgeReliablePdu::operator==( + const AcknowledgeReliablePdu& rhs) const { + bool ivarsEqual = true; -bool AcknowledgeReliablePdu::operator ==(const AcknowledgeReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - if( ! (_acknowledgeFlag == rhs._acknowledgeFlag) ) ivarsEqual = false; - if( ! (_responseFlag == rhs._responseFlag) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + if (!(_acknowledgeFlag == rhs._acknowledgeFlag)) ivarsEqual = false; + if (!(_responseFlag == rhs._responseFlag)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int AcknowledgeReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int AcknowledgeReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _acknowledgeFlag - marshalSize = marshalSize + 2; // _responseFlag - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _acknowledgeFlag + marshalSize = marshalSize + 2; // _responseFlag + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -103,7 +89,7 @@ int AcknowledgeReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AcknowledgeReliablePdu.h b/src/dis7/AcknowledgeReliablePdu.h index 0d7dc9cd..f03a0cdc 100644 --- a/src/dis7/AcknowledgeReliablePdu.h +++ b/src/dis7/AcknowledgeReliablePdu.h @@ -1,59 +1,57 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity +// or remove enitty (reliable) pdus. COMPLETE -namespace DIS -{ -// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity or remove enitty (reliable) pdus. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AcknowledgeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT AcknowledgeReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** ack flags */ - unsigned short _acknowledgeFlag; + unsigned short _acknowledgeFlag; /** response flags */ - unsigned short _responseFlag; + unsigned short _responseFlag; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - AcknowledgeReliablePdu(); - virtual ~AcknowledgeReliablePdu(); + AcknowledgeReliablePdu(); + virtual ~AcknowledgeReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + unsigned short getAcknowledgeFlag() const; + void setAcknowledgeFlag(unsigned short pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + unsigned short getResponseFlag() const; + void setResponseFlag(unsigned short pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcknowledgeReliablePdu& rhs) const; + bool operator==(const AcknowledgeReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -66,7 +64,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AcousticEmitter.cpp b/src/dis7/AcousticEmitter.cpp index 1945bf24..9a0dc73b 100644 --- a/src/dis7/AcousticEmitter.cpp +++ b/src/dis7/AcousticEmitter.cpp @@ -2,89 +2,65 @@ using namespace DIS; +AcousticEmitter::AcousticEmitter() + : _acousticName(0), _function(0), _acousticIdNumber(0) {} -AcousticEmitter::AcousticEmitter(): - _acousticName(0), - _function(0), - _acousticIdNumber(0) -{ -} - -AcousticEmitter::~AcousticEmitter() -{ -} +AcousticEmitter::~AcousticEmitter() {} -unsigned short AcousticEmitter::getAcousticName() const -{ - return _acousticName; +unsigned short AcousticEmitter::getAcousticName() const { + return _acousticName; } -void AcousticEmitter::setAcousticName(unsigned short pX) -{ - _acousticName = pX; -} +void AcousticEmitter::setAcousticName(unsigned short pX) { _acousticName = pX; } -unsigned char AcousticEmitter::getFunction() const -{ - return _function; -} +unsigned char AcousticEmitter::getFunction() const { return _function; } -void AcousticEmitter::setFunction(unsigned char pX) -{ - _function = pX; -} +void AcousticEmitter::setFunction(unsigned char pX) { _function = pX; } -unsigned char AcousticEmitter::getAcousticIdNumber() const -{ - return _acousticIdNumber; +unsigned char AcousticEmitter::getAcousticIdNumber() const { + return _acousticIdNumber; } -void AcousticEmitter::setAcousticIdNumber(unsigned char pX) -{ - _acousticIdNumber = pX; +void AcousticEmitter::setAcousticIdNumber(unsigned char pX) { + _acousticIdNumber = pX; } -void AcousticEmitter::marshal(DataStream& dataStream) const -{ - dataStream << _acousticName; - dataStream << _function; - dataStream << _acousticIdNumber; +void AcousticEmitter::marshal(DataStream& dataStream) const { + dataStream << _acousticName; + dataStream << _function; + dataStream << _acousticIdNumber; } -void AcousticEmitter::unmarshal(DataStream& dataStream) -{ - dataStream >> _acousticName; - dataStream >> _function; - dataStream >> _acousticIdNumber; +void AcousticEmitter::unmarshal(DataStream& dataStream) { + dataStream >> _acousticName; + dataStream >> _function; + dataStream >> _acousticIdNumber; } +bool AcousticEmitter::operator==(const AcousticEmitter& rhs) const { + bool ivarsEqual = true; -bool AcousticEmitter::operator ==(const AcousticEmitter& rhs) const - { - bool ivarsEqual = true; + if (!(_acousticName == rhs._acousticName)) ivarsEqual = false; + if (!(_function == rhs._function)) ivarsEqual = false; + if (!(_acousticIdNumber == rhs._acousticIdNumber)) ivarsEqual = false; - if( ! (_acousticName == rhs._acousticName) ) ivarsEqual = false; - if( ! (_function == rhs._function) ) ivarsEqual = false; - if( ! (_acousticIdNumber == rhs._acousticIdNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AcousticEmitter::getMarshalledSize() const -{ - int marshalSize = 0; +int AcousticEmitter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _acousticName - marshalSize = marshalSize + 1; // _function - marshalSize = marshalSize + 1; // _acousticIdNumber - return marshalSize; + marshalSize = marshalSize + 2; // _acousticName + marshalSize = marshalSize + 1; // _function + marshalSize = marshalSize + 1; // _acousticIdNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +73,7 @@ int AcousticEmitter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AcousticEmitter.h b/src/dis7/AcousticEmitter.h index 6b58e4a2..9aa78d13 100644 --- a/src/dis7/AcousticEmitter.h +++ b/src/dis7/AcousticEmitter.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // information about a specific UA emmtter. Section 6.2.2. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AcousticEmitter -{ -protected: +class OPENDIS7_EXPORT AcousticEmitter { + protected: /** the system for a particular UA emitter, and an enumeration */ - unsigned short _acousticName; + unsigned short _acousticName; /** The function of the acoustic system */ - unsigned char _function; + unsigned char _function; /** The UA emitter identification number relative to a specific system */ - unsigned char _acousticIdNumber; - + unsigned char _acousticIdNumber; public: - AcousticEmitter(); - virtual ~AcousticEmitter(); + AcousticEmitter(); + virtual ~AcousticEmitter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getAcousticName() const; - void setAcousticName(unsigned short pX); + unsigned short getAcousticName() const; + void setAcousticName(unsigned short pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + unsigned char getFunction() const; + void setFunction(unsigned char pX); - unsigned char getAcousticIdNumber() const; - void setAcousticIdNumber(unsigned char pX); + unsigned char getAcousticIdNumber() const; + void setAcousticIdNumber(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AcousticEmitter& rhs) const; + bool operator==(const AcousticEmitter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionRequestPdu.cpp b/src/dis7/ActionRequestPdu.cpp index 3b02b464..1b72cbd0 100644 --- a/src/dis7/ActionRequestPdu.cpp +++ b/src/dis7/ActionRequestPdu.cpp @@ -2,226 +2,177 @@ using namespace DIS; - -ActionRequestPdu::ActionRequestPdu() : SimulationManagementFamilyPdu(), - _originatingID(), - _receivingID(), - _requestID(0), - _actionID(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 16 ); +ActionRequestPdu::ActionRequestPdu() + : SimulationManagementFamilyPdu(), + _originatingID(), + _receivingID(), + _requestID(0), + _actionID(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(16); } -ActionRequestPdu::~ActionRequestPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +ActionRequestPdu::~ActionRequestPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -EntityID& ActionRequestPdu::getOriginatingID() -{ - return _originatingID; -} +EntityID& ActionRequestPdu::getOriginatingID() { return _originatingID; } -const EntityID& ActionRequestPdu::getOriginatingID() const -{ - return _originatingID; +const EntityID& ActionRequestPdu::getOriginatingID() const { + return _originatingID; } -void ActionRequestPdu::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; +void ActionRequestPdu::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -EntityID& ActionRequestPdu::getReceivingID() -{ - return _receivingID; -} +EntityID& ActionRequestPdu::getReceivingID() { return _receivingID; } -const EntityID& ActionRequestPdu::getReceivingID() const -{ - return _receivingID; +const EntityID& ActionRequestPdu::getReceivingID() const { + return _receivingID; } -void ActionRequestPdu::setReceivingID(const EntityID &pX) -{ - _receivingID = pX; -} +void ActionRequestPdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned int ActionRequestPdu::getRequestID() const -{ - return _requestID; -} +unsigned int ActionRequestPdu::getRequestID() const { return _requestID; } -void ActionRequestPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void ActionRequestPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int ActionRequestPdu::getActionID() const -{ - return _actionID; -} +unsigned int ActionRequestPdu::getActionID() const { return _actionID; } -void ActionRequestPdu::setActionID(unsigned int pX) -{ - _actionID = pX; -} +void ActionRequestPdu::setActionID(unsigned int pX) { _actionID = pX; } -unsigned int ActionRequestPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int ActionRequestPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int ActionRequestPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int ActionRequestPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& ActionRequestPdu::getFixedDatums() -{ - return _fixedDatums; +std::vector& ActionRequestPdu::getFixedDatums() { + return _fixedDatums; } -const std::vector& ActionRequestPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& ActionRequestPdu::getFixedDatums() const { + return _fixedDatums; } -void ActionRequestPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void ActionRequestPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& ActionRequestPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& ActionRequestPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& ActionRequestPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& ActionRequestPdu::getVariableDatums() const { + return _variableDatums; } -void ActionRequestPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void ActionRequestPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void ActionRequestPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingID.marshal(dataStream); - _receivingID.marshal(dataStream); - dataStream << _requestID; - dataStream << _actionID; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); +void ActionRequestPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingID.marshal(dataStream); + _receivingID.marshal(dataStream); + dataStream << _requestID; + dataStream << _actionID; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } -void ActionRequestPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - dataStream >> _requestID; - dataStream >> _actionID; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void ActionRequestPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + dataStream >> _requestID; + dataStream >> _actionID; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } } +bool ActionRequestPdu::operator==(const ActionRequestPdu& rhs) const { + bool ivarsEqual = true; -bool ActionRequestPdu::operator ==(const ActionRequestPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_actionID == rhs._actionID) ) ivarsEqual = false; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_actionID == rhs._actionID)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int ActionRequestPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _actionID - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int ActionRequestPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _actionID + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -234,7 +185,7 @@ int ActionRequestPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionRequestPdu.h b/src/dis7/ActionRequestPdu.h index 136fe427..09826ae7 100644 --- a/src/dis7/ActionRequestPdu.h +++ b/src/dis7/ActionRequestPdu.h @@ -1,96 +1,94 @@ #pragma once -#include +#include + #include #include -#include -#include #include -#include +#include #include +#include +namespace DIS { +// Section 7.5.7. Request from simulation manager to a managed entity to perform +// a specified action. COMPLETE -namespace DIS -{ -// Section 7.5.7. Request from simulation manager to a managed entity to perform a specified action. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for originating entity(or simulation) */ - EntityID _originatingID; + EntityID _originatingID; /** Identifier for the receiving entity(or simulation) */ - EntityID _receivingID; + EntityID _receivingID; /** identifies the request being made by the simulaton manager */ - unsigned int _requestID; + unsigned int _requestID; - /** identifies the particular action being requested(see Section 7 of SISO-REF-010). */ - unsigned int _actionID; + /** identifies the particular action being requested(see Section 7 of + * SISO-REF-010). */ + unsigned int _actionID; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - ActionRequestPdu(); - virtual ~ActionRequestPdu(); + ActionRequestPdu(); + virtual ~ActionRequestPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); - EntityID& getReceivingID(); - const EntityID& getReceivingID() const; - void setReceivingID(const EntityID &pX); + EntityID& getReceivingID(); + const EntityID& getReceivingID() const; + void setReceivingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + unsigned int getActionID() const; + void setActionID(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionRequestPdu& rhs) const; + bool operator==(const ActionRequestPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -103,7 +101,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionRequestReliablePdu.cpp b/src/dis7/ActionRequestReliablePdu.cpp index 22a3b9e9..1701f9fc 100644 --- a/src/dis7/ActionRequestReliablePdu.cpp +++ b/src/dis7/ActionRequestReliablePdu.cpp @@ -2,231 +2,193 @@ using namespace DIS; - -ActionRequestReliablePdu::ActionRequestReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0), - _actionID(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 56 ); +ActionRequestReliablePdu::ActionRequestReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0), + _actionID(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(56); } -ActionRequestReliablePdu::~ActionRequestReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +ActionRequestReliablePdu::~ActionRequestReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned char ActionRequestReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char ActionRequestReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void ActionRequestReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void ActionRequestReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short ActionRequestReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short ActionRequestReliablePdu::getPad1() const { return _pad1; } -void ActionRequestReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void ActionRequestReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char ActionRequestReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char ActionRequestReliablePdu::getPad2() const { return _pad2; } -void ActionRequestReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void ActionRequestReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int ActionRequestReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int ActionRequestReliablePdu::getRequestID() const { + return _requestID; } -void ActionRequestReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; +void ActionRequestReliablePdu::setRequestID(unsigned int pX) { + _requestID = pX; } -unsigned int ActionRequestReliablePdu::getActionID() const -{ - return _actionID; -} +unsigned int ActionRequestReliablePdu::getActionID() const { return _actionID; } -void ActionRequestReliablePdu::setActionID(unsigned int pX) -{ - _actionID = pX; -} +void ActionRequestReliablePdu::setActionID(unsigned int pX) { _actionID = pX; } -unsigned int ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& ActionRequestReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& ActionRequestReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& ActionRequestReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& ActionRequestReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void ActionRequestReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void ActionRequestReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& ActionRequestReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& +ActionRequestReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& ActionRequestReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +ActionRequestReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void ActionRequestReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void ActionRequestReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void ActionRequestReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; - dataStream << _actionID; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void ActionRequestReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; + dataStream << _actionID; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void ActionRequestReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; - dataStream >> _actionID; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void ActionRequestReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; + dataStream >> _actionID; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool ActionRequestReliablePdu::operator==( + const ActionRequestReliablePdu& rhs) const { + bool ivarsEqual = true; -bool ActionRequestReliablePdu::operator ==(const ActionRequestReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_actionID == rhs._actionID) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_actionID == rhs._actionID)) ivarsEqual = false; - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } - -int ActionRequestReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _actionID - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int ActionRequestReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _actionID + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -239,7 +201,7 @@ int ActionRequestReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionRequestReliablePdu.h b/src/dis7/ActionRequestReliablePdu.h index 29c09b29..89d08bc4 100644 --- a/src/dis7/ActionRequestReliablePdu.h +++ b/src/dis7/ActionRequestReliablePdu.h @@ -1,98 +1,97 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.6: request from a simulation manager to a managed entity to +// perform a specified action. COMPLETE -namespace DIS -{ -// Section 5.3.12.6: request from a simulation manager to a managed entity to perform a specified action. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ActionRequestReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ActionRequestReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** request ID */ - unsigned int _actionID; + unsigned int _actionID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - ActionRequestReliablePdu(); - virtual ~ActionRequestReliablePdu(); + ActionRequestReliablePdu(); + virtual ~ActionRequestReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + unsigned int getActionID() const; + void setActionID(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionRequestReliablePdu& rhs) const; + bool operator==(const ActionRequestReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +104,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionResponsePdu.cpp b/src/dis7/ActionResponsePdu.cpp index 033d8543..3871a118 100644 --- a/src/dis7/ActionResponsePdu.cpp +++ b/src/dis7/ActionResponsePdu.cpp @@ -2,226 +2,184 @@ using namespace DIS; - -ActionResponsePdu::ActionResponsePdu() : SimulationManagementFamilyPdu(), - _originatingID(), - _receivingID(), - _requestID(0), - _requestStatus(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 17 ); +ActionResponsePdu::ActionResponsePdu() + : SimulationManagementFamilyPdu(), + _originatingID(), + _receivingID(), + _requestID(0), + _requestStatus(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(17); } -ActionResponsePdu::~ActionResponsePdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +ActionResponsePdu::~ActionResponsePdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -EntityID& ActionResponsePdu::getOriginatingID() -{ - return _originatingID; -} +EntityID& ActionResponsePdu::getOriginatingID() { return _originatingID; } -const EntityID& ActionResponsePdu::getOriginatingID() const -{ - return _originatingID; +const EntityID& ActionResponsePdu::getOriginatingID() const { + return _originatingID; } -void ActionResponsePdu::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; +void ActionResponsePdu::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -EntityID& ActionResponsePdu::getReceivingID() -{ - return _receivingID; -} +EntityID& ActionResponsePdu::getReceivingID() { return _receivingID; } -const EntityID& ActionResponsePdu::getReceivingID() const -{ - return _receivingID; +const EntityID& ActionResponsePdu::getReceivingID() const { + return _receivingID; } -void ActionResponsePdu::setReceivingID(const EntityID &pX) -{ - _receivingID = pX; +void ActionResponsePdu::setReceivingID(const EntityID& pX) { + _receivingID = pX; } -unsigned int ActionResponsePdu::getRequestID() const -{ - return _requestID; -} +unsigned int ActionResponsePdu::getRequestID() const { return _requestID; } -void ActionResponsePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void ActionResponsePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int ActionResponsePdu::getRequestStatus() const -{ - return _requestStatus; +unsigned int ActionResponsePdu::getRequestStatus() const { + return _requestStatus; } -void ActionResponsePdu::setRequestStatus(unsigned int pX) -{ - _requestStatus = pX; +void ActionResponsePdu::setRequestStatus(unsigned int pX) { + _requestStatus = pX; } -unsigned int ActionResponsePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int ActionResponsePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int ActionResponsePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int ActionResponsePdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& ActionResponsePdu::getFixedDatums() -{ - return _fixedDatums; +std::vector& ActionResponsePdu::getFixedDatums() { + return _fixedDatums; } -const std::vector& ActionResponsePdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& ActionResponsePdu::getFixedDatums() const { + return _fixedDatums; } -void ActionResponsePdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void ActionResponsePdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& ActionResponsePdu::getVariableDatums() -{ - return _variableDatums; +std::vector& ActionResponsePdu::getVariableDatums() { + return _variableDatums; } -const std::vector& ActionResponsePdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& ActionResponsePdu::getVariableDatums() const { + return _variableDatums; } -void ActionResponsePdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void ActionResponsePdu::setVariableDatums( + const std::vector& pX) { + _variableDatums = pX; } -void ActionResponsePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingID.marshal(dataStream); - _receivingID.marshal(dataStream); - dataStream << _requestID; - dataStream << _requestStatus; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void ActionResponsePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingID.marshal(dataStream); + _receivingID.marshal(dataStream); + dataStream << _requestID; + dataStream << _requestStatus; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } -void ActionResponsePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - dataStream >> _requestID; - dataStream >> _requestStatus; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void ActionResponsePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + dataStream >> _requestID; + dataStream >> _requestStatus; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } } +bool ActionResponsePdu::operator==(const ActionResponsePdu& rhs) const { + bool ivarsEqual = true; -bool ActionResponsePdu::operator ==(const ActionResponsePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requestStatus == rhs._requestStatus) ) ivarsEqual = false; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requestStatus == rhs._requestStatus)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int ActionResponsePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _requestStatus - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int ActionResponsePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _requestStatus + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -234,7 +192,7 @@ int ActionResponsePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionResponsePdu.h b/src/dis7/ActionResponsePdu.h index 36ebe434..aff7f5c8 100644 --- a/src/dis7/ActionResponsePdu.h +++ b/src/dis7/ActionResponsePdu.h @@ -1,96 +1,92 @@ #pragma once -#include +#include + #include #include -#include -#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 7.5.8. response to an action request PDU. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for originating entity(or simulation) */ - EntityID _originatingID; + EntityID _originatingID; /** Identifier for the receiving entity(or simulation) */ - EntityID _receivingID; + EntityID _receivingID; /** Request ID that is unique */ - unsigned int _requestID; + unsigned int _requestID; /** Status of response */ - unsigned int _requestStatus; + unsigned int _requestStatus; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - ActionResponsePdu(); - virtual ~ActionResponsePdu(); + ActionResponsePdu(); + virtual ~ActionResponsePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); - EntityID& getReceivingID(); - const EntityID& getReceivingID() const; - void setReceivingID(const EntityID &pX); + EntityID& getReceivingID(); + const EntityID& getReceivingID() const; + void setReceivingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getRequestStatus() const; - void setRequestStatus(unsigned int pX); + unsigned int getRequestStatus() const; + void setRequestStatus(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionResponsePdu& rhs) const; + bool operator==(const ActionResponsePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -103,7 +99,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionResponseReliablePdu.cpp b/src/dis7/ActionResponseReliablePdu.cpp index 1b65ec97..0656ad52 100644 --- a/src/dis7/ActionResponseReliablePdu.cpp +++ b/src/dis7/ActionResponseReliablePdu.cpp @@ -2,186 +2,166 @@ using namespace DIS; - -ActionResponseReliablePdu::ActionResponseReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requestID(0), - _responseStatus(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 57 ); +ActionResponseReliablePdu::ActionResponseReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requestID(0), + _responseStatus(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(57); } -ActionResponseReliablePdu::~ActionResponseReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +ActionResponseReliablePdu::~ActionResponseReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned int ActionResponseReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int ActionResponseReliablePdu::getRequestID() const { + return _requestID; } -void ActionResponseReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; +void ActionResponseReliablePdu::setRequestID(unsigned int pX) { + _requestID = pX; } -unsigned int ActionResponseReliablePdu::getResponseStatus() const -{ - return _responseStatus; +unsigned int ActionResponseReliablePdu::getResponseStatus() const { + return _responseStatus; } -void ActionResponseReliablePdu::setResponseStatus(unsigned int pX) -{ - _responseStatus = pX; +void ActionResponseReliablePdu::setResponseStatus(unsigned int pX) { + _responseStatus = pX; } -unsigned int ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int ActionResponseReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int ActionResponseReliablePdu::getNumberOfVariableDatumRecords() + const { + return _variableDatumRecords.size(); } -std::vector& ActionResponseReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& ActionResponseReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& ActionResponseReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& ActionResponseReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void ActionResponseReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void ActionResponseReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& ActionResponseReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& +ActionResponseReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& ActionResponseReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +ActionResponseReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void ActionResponseReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void ActionResponseReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void ActionResponseReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _responseStatus; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void ActionResponseReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _responseStatus; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void ActionResponseReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _responseStatus; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void ActionResponseReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _responseStatus; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool ActionResponseReliablePdu::operator==( + const ActionResponseReliablePdu& rhs) const { + bool ivarsEqual = true; -bool ActionResponseReliablePdu::operator ==(const ActionResponseReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_responseStatus == rhs._responseStatus) ) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_responseStatus == rhs._responseStatus)) ivarsEqual = false; - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int ActionResponseReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _responseStatus - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int ActionResponseReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _responseStatus + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +174,7 @@ int ActionResponseReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ActionResponseReliablePdu.h b/src/dis7/ActionResponseReliablePdu.h index bbc6516d..41530005 100644 --- a/src/dis7/ActionResponseReliablePdu.h +++ b/src/dis7/ActionResponseReliablePdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ActionResponseReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ActionResponseReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** status of response */ - unsigned int _responseStatus; + unsigned int _responseStatus; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - ActionResponseReliablePdu(); - virtual ~ActionResponseReliablePdu(); + ActionResponseReliablePdu(); + virtual ~ActionResponseReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getResponseStatus() const; - void setResponseStatus(unsigned int pX); + unsigned int getResponseStatus() const; + void setResponseStatus(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ActionResponseReliablePdu& rhs) const; + bool operator==(const ActionResponseReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AggregateIdentifier.cpp b/src/dis7/AggregateIdentifier.cpp index ad4cb3ca..429fada8 100644 --- a/src/dis7/AggregateIdentifier.cpp +++ b/src/dis7/AggregateIdentifier.cpp @@ -2,79 +2,64 @@ using namespace DIS; +AggregateIdentifier::AggregateIdentifier() + : _simulationAddress(), _aggregateID(0) {} -AggregateIdentifier::AggregateIdentifier(): - _simulationAddress(), - _aggregateID(0) -{ -} - -AggregateIdentifier::~AggregateIdentifier() -{ -} +AggregateIdentifier::~AggregateIdentifier() {} -SimulationAddress& AggregateIdentifier::getSimulationAddress() -{ - return _simulationAddress; +SimulationAddress& AggregateIdentifier::getSimulationAddress() { + return _simulationAddress; } -const SimulationAddress& AggregateIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +const SimulationAddress& AggregateIdentifier::getSimulationAddress() const { + return _simulationAddress; } -void AggregateIdentifier::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; +void AggregateIdentifier::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -unsigned short AggregateIdentifier::getAggregateID() const -{ - return _aggregateID; +unsigned short AggregateIdentifier::getAggregateID() const { + return _aggregateID; } -void AggregateIdentifier::setAggregateID(unsigned short pX) -{ - _aggregateID = pX; +void AggregateIdentifier::setAggregateID(unsigned short pX) { + _aggregateID = pX; } -void AggregateIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _aggregateID; +void AggregateIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _aggregateID; } -void AggregateIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _aggregateID; +void AggregateIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _aggregateID; } +bool AggregateIdentifier::operator==(const AggregateIdentifier& rhs) const { + bool ivarsEqual = true; -bool AggregateIdentifier::operator ==(const AggregateIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_aggregateID == rhs._aggregateID)) ivarsEqual = false; - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_aggregateID == rhs._aggregateID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AggregateIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int AggregateIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _aggregateID - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _aggregateID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +72,7 @@ int AggregateIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AggregateIdentifier.h b/src/dis7/AggregateIdentifier.h index 8d307178..88188542 100644 --- a/src/dis7/AggregateIdentifier.h +++ b/src/dis7/AggregateIdentifier.h @@ -1,54 +1,53 @@ #pragma once #include -#include #include +#include +namespace DIS { +// The unique designation of each aggrgate in an exercise is specified by an +// aggregate identifier record. The aggregate ID is not an entity and shall not +// be treated as such. Section 6.2.3. -namespace DIS -{ -// The unique designation of each aggrgate in an exercise is specified by an aggregate identifier record. The aggregate ID is not an entity and shall not be treated as such. Section 6.2.3. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AggregateIdentifier -{ -protected: - /** Simulation address, ie site and application, the first two fields of the entity ID */ - SimulationAddress _simulationAddress; +class OPENDIS7_EXPORT AggregateIdentifier { + protected: + /** Simulation address, ie site and application, the first two fields of the + * entity ID */ + SimulationAddress _simulationAddress; /** the aggregate ID */ - unsigned short _aggregateID; - + unsigned short _aggregateID; public: - AggregateIdentifier(); - virtual ~AggregateIdentifier(); + AggregateIdentifier(); + virtual ~AggregateIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getAggregateID() const; - void setAggregateID(unsigned short pX); + unsigned short getAggregateID() const; + void setAggregateID(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AggregateIdentifier& rhs) const; + bool operator==(const AggregateIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AggregateMarking.cpp b/src/dis7/AggregateMarking.cpp index 0786aabc..28e21f62 100644 --- a/src/dis7/AggregateMarking.cpp +++ b/src/dis7/AggregateMarking.cpp @@ -2,102 +2,74 @@ using namespace DIS; - -AggregateMarking::AggregateMarking(): - _characterSet(0) -{ - // Initialize fixed length array - for(int lengthcharacters= 0; lengthcharacters < 31; lengthcharacters++) - { - _characters[lengthcharacters] = 0; - } - +AggregateMarking::AggregateMarking() : _characterSet(0) { + // Initialize fixed length array + for (int lengthcharacters = 0; lengthcharacters < 31; lengthcharacters++) { + _characters[lengthcharacters] = 0; + } } -AggregateMarking::~AggregateMarking() -{ -} +AggregateMarking::~AggregateMarking() {} -unsigned char AggregateMarking::getCharacterSet() const -{ - return _characterSet; +unsigned char AggregateMarking::getCharacterSet() const { + return _characterSet; } -void AggregateMarking::setCharacterSet(unsigned char pX) -{ - _characterSet = pX; -} +void AggregateMarking::setCharacterSet(unsigned char pX) { _characterSet = pX; } -unsigned char* AggregateMarking::getCharacters() -{ - return _characters; -} +unsigned char* AggregateMarking::getCharacters() { return _characters; } -const unsigned char* AggregateMarking::getCharacters() const -{ - return _characters; +const unsigned char* AggregateMarking::getCharacters() const { + return _characters; } -void AggregateMarking::setCharacters(const unsigned char* x) -{ - for(int i = 0; i < 31; i++) - { - _characters[i] = x[i]; - } +void AggregateMarking::setCharacters(const unsigned char* x) { + for (int i = 0; i < 31; i++) { + _characters[i] = x[i]; + } } -void AggregateMarking::marshal(DataStream& dataStream) const -{ - dataStream << _characterSet; - - for(size_t idx = 0; idx < 31; idx++) - { - dataStream << _characters[idx]; - } +void AggregateMarking::marshal(DataStream& dataStream) const { + dataStream << _characterSet; + for (size_t idx = 0; idx < 31; idx++) { + dataStream << _characters[idx]; + } } -void AggregateMarking::unmarshal(DataStream& dataStream) -{ - dataStream >> _characterSet; - - for(size_t idx = 0; idx < 31; idx++) - { - dataStream >> _characters[idx]; - } +void AggregateMarking::unmarshal(DataStream& dataStream) { + dataStream >> _characterSet; + for (size_t idx = 0; idx < 31; idx++) { + dataStream >> _characters[idx]; + } } +bool AggregateMarking::operator==(const AggregateMarking& rhs) const { + bool ivarsEqual = true; -bool AggregateMarking::operator ==(const AggregateMarking& rhs) const - { - bool ivarsEqual = true; - - if( ! (_characterSet == rhs._characterSet) ) ivarsEqual = false; + if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for(unsigned char idx = 0; idx < 31; idx++) - { - if(!(_characters[idx] == rhs._characters[idx]) ) ivarsEqual = false; - } + for (unsigned char idx = 0; idx < 31; idx++) { + if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int AggregateMarking::getMarshalledSize() const -{ - int marshalSize = 0; +int AggregateMarking::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _characterSet - marshalSize = marshalSize + 31 * 1; // _characters - return marshalSize; + marshalSize = marshalSize + 1; // _characterSet + marshalSize = marshalSize + 31 * 1; // _characters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -110,7 +82,7 @@ int AggregateMarking::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AggregateMarking.h b/src/dis7/AggregateMarking.h index 7a80a243..a314d4a2 100644 --- a/src/dis7/AggregateMarking.h +++ b/src/dis7/AggregateMarking.h @@ -1,53 +1,50 @@ #pragma once -#include #include +#include +namespace DIS { +// Specifies the character set used in the first byte, followed by up to 31 +// characters of text data. Section 6.2.4. -namespace DIS -{ -// Specifies the character set used in the first byte, followed by up to 31 characters of text data. Section 6.2.4. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AggregateMarking -{ -protected: +class OPENDIS7_EXPORT AggregateMarking { + protected: /** The character set */ - unsigned char _characterSet; + unsigned char _characterSet; /** The characters */ - unsigned char _characters[31]; - + unsigned char _characters[31]; public: - AggregateMarking(); - virtual ~AggregateMarking(); + AggregateMarking(); + virtual ~AggregateMarking(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + unsigned char getCharacterSet() const; + void setCharacterSet(unsigned char pX); - unsigned char* getCharacters(); - const unsigned char* getCharacters() const; - void setCharacters( const unsigned char* pX); + unsigned char* getCharacters(); + const unsigned char* getCharacters() const; + void setCharacters(const unsigned char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AggregateMarking& rhs) const; + bool operator==(const AggregateMarking& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -60,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AggregateType.cpp b/src/dis7/AggregateType.cpp index 266aa565..dd5d973d 100644 --- a/src/dis7/AggregateType.cpp +++ b/src/dis7/AggregateType.cpp @@ -2,149 +2,97 @@ using namespace DIS; +AggregateType::AggregateType() + : _aggregateKind(0), + _domain(0), + _country(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0) {} -AggregateType::AggregateType(): - _aggregateKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0) -{ -} +AggregateType::~AggregateType() {} -AggregateType::~AggregateType() -{ -} +unsigned char AggregateType::getAggregateKind() const { return _aggregateKind; } -unsigned char AggregateType::getAggregateKind() const -{ - return _aggregateKind; -} +void AggregateType::setAggregateKind(unsigned char pX) { _aggregateKind = pX; } -void AggregateType::setAggregateKind(unsigned char pX) -{ - _aggregateKind = pX; -} +unsigned char AggregateType::getDomain() const { return _domain; } -unsigned char AggregateType::getDomain() const -{ - return _domain; -} +void AggregateType::setDomain(unsigned char pX) { _domain = pX; } -void AggregateType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned short AggregateType::getCountry() const { return _country; } -unsigned short AggregateType::getCountry() const -{ - return _country; -} +void AggregateType::setCountry(unsigned short pX) { _country = pX; } -void AggregateType::setCountry(unsigned short pX) -{ - _country = pX; -} +unsigned char AggregateType::getCategory() const { return _category; } -unsigned char AggregateType::getCategory() const -{ - return _category; -} +void AggregateType::setCategory(unsigned char pX) { _category = pX; } -void AggregateType::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char AggregateType::getSubcategory() const { return _subcategory; } -unsigned char AggregateType::getSubcategory() const -{ - return _subcategory; -} +void AggregateType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void AggregateType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +unsigned char AggregateType::getSpecific() const { return _specific; } -unsigned char AggregateType::getSpecific() const -{ - return _specific; -} +void AggregateType::setSpecific(unsigned char pX) { _specific = pX; } -void AggregateType::setSpecific(unsigned char pX) -{ - _specific = pX; -} +unsigned char AggregateType::getExtra() const { return _extra; } -unsigned char AggregateType::getExtra() const -{ - return _extra; -} +void AggregateType::setExtra(unsigned char pX) { _extra = pX; } -void AggregateType::setExtra(unsigned char pX) -{ - _extra = pX; +void AggregateType::marshal(DataStream& dataStream) const { + dataStream << _aggregateKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; } -void AggregateType::marshal(DataStream& dataStream) const -{ - dataStream << _aggregateKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; +void AggregateType::unmarshal(DataStream& dataStream) { + dataStream >> _aggregateKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; } -void AggregateType::unmarshal(DataStream& dataStream) -{ - dataStream >> _aggregateKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; +bool AggregateType::operator==(const AggregateType& rhs) const { + bool ivarsEqual = true; + + if (!(_aggregateKind == rhs._aggregateKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + + return ivarsEqual; } +int AggregateType::getMarshalledSize() const { + int marshalSize = 0; -bool AggregateType::operator ==(const AggregateType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_aggregateKind == rhs._aggregateKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - - return ivarsEqual; - } - -int AggregateType::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _aggregateKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - return marshalSize; + marshalSize = marshalSize + 1; // _aggregateKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +105,7 @@ int AggregateType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AggregateType.h b/src/dis7/AggregateType.h index 8364794a..82082b2a 100644 --- a/src/dis7/AggregateType.h +++ b/src/dis7/AggregateType.h @@ -1,81 +1,79 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Identifies the type and organization of an aggregate. Section 6.2.5 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AggregateType -{ -protected: - /** Grouping criterion used to group the aggregate. Enumeration from EBV document */ - unsigned char _aggregateKind; +class OPENDIS7_EXPORT AggregateType { + protected: + /** Grouping criterion used to group the aggregate. Enumeration from EBV + * document */ + unsigned char _aggregateKind; - /** Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply. */ - unsigned char _domain; + /** Domain of entity (air, surface, subsurface, space, etc) Zero means domain + * does not apply. */ + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; + unsigned char _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; - - unsigned char _extra; + unsigned char _specific; + unsigned char _extra; public: - AggregateType(); - virtual ~AggregateType(); + AggregateType(); + virtual ~AggregateType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getAggregateKind() const; - void setAggregateKind(unsigned char pX); + unsigned char getAggregateKind() const; + void setAggregateKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AggregateType& rhs) const; + bool operator==(const AggregateType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -88,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AngleDeception.cpp b/src/dis7/AngleDeception.cpp index 4c917420..e5a2a321 100644 --- a/src/dis7/AngleDeception.cpp +++ b/src/dis7/AngleDeception.cpp @@ -2,284 +2,196 @@ using namespace DIS; +AngleDeception::AngleDeception() + : _recordType(3501), + _recordLength(48), + _padding(0), + _emitterNumber(0), + _beamNumber(0), + _stateIndicator(0), + _padding2(0), + _azimuthOffset(0.0), + _azimuthWidth(0.0), + _azimuthPullRate(0.0), + _azimuthPullAcceleration(0.0), + _elevationOffset(0.0), + _elevationWidth(0.0), + _elevationPullRate(0.0), + _elevationPullAcceleration(0.0), + _padding3(0) {} -AngleDeception::AngleDeception(): - _recordType(3501), - _recordLength(48), - _padding(0), - _emitterNumber(0), - _beamNumber(0), - _stateIndicator(0), - _padding2(0), - _azimuthOffset(0.0), - _azimuthWidth(0.0), - _azimuthPullRate(0.0), - _azimuthPullAcceleration(0.0), - _elevationOffset(0.0), - _elevationWidth(0.0), - _elevationPullRate(0.0), - _elevationPullAcceleration(0.0), - _padding3(0) -{ -} +AngleDeception::~AngleDeception() {} -AngleDeception::~AngleDeception() -{ -} +unsigned int AngleDeception::getRecordType() const { return _recordType; } -unsigned int AngleDeception::getRecordType() const -{ - return _recordType; -} +void AngleDeception::setRecordType(unsigned int pX) { _recordType = pX; } -void AngleDeception::setRecordType(unsigned int pX) -{ - _recordType = pX; -} +unsigned short AngleDeception::getRecordLength() const { return _recordLength; } -unsigned short AngleDeception::getRecordLength() const -{ - return _recordLength; -} +void AngleDeception::setRecordLength(unsigned short pX) { _recordLength = pX; } -void AngleDeception::setRecordLength(unsigned short pX) -{ - _recordLength = pX; -} +unsigned short AngleDeception::getPadding() const { return _padding; } -unsigned short AngleDeception::getPadding() const -{ - return _padding; -} +void AngleDeception::setPadding(unsigned short pX) { _padding = pX; } -void AngleDeception::setPadding(unsigned short pX) -{ - _padding = pX; +unsigned char AngleDeception::getEmitterNumber() const { + return _emitterNumber; } -unsigned char AngleDeception::getEmitterNumber() const -{ - return _emitterNumber; -} +void AngleDeception::setEmitterNumber(unsigned char pX) { _emitterNumber = pX; } -void AngleDeception::setEmitterNumber(unsigned char pX) -{ - _emitterNumber = pX; -} +unsigned char AngleDeception::getBeamNumber() const { return _beamNumber; } -unsigned char AngleDeception::getBeamNumber() const -{ - return _beamNumber; -} +void AngleDeception::setBeamNumber(unsigned char pX) { _beamNumber = pX; } -void AngleDeception::setBeamNumber(unsigned char pX) -{ - _beamNumber = pX; +unsigned char AngleDeception::getStateIndicator() const { + return _stateIndicator; } -unsigned char AngleDeception::getStateIndicator() const -{ - return _stateIndicator; +void AngleDeception::setStateIndicator(unsigned char pX) { + _stateIndicator = pX; } -void AngleDeception::setStateIndicator(unsigned char pX) -{ - _stateIndicator = pX; -} +unsigned int AngleDeception::getPadding2() const { return _padding2; } -unsigned int AngleDeception::getPadding2() const -{ - return _padding2; -} +void AngleDeception::setPadding2(unsigned int pX) { _padding2 = pX; } -void AngleDeception::setPadding2(unsigned int pX) -{ - _padding2 = pX; -} +float AngleDeception::getAzimuthOffset() const { return _azimuthOffset; } -float AngleDeception::getAzimuthOffset() const -{ - return _azimuthOffset; -} +void AngleDeception::setAzimuthOffset(float pX) { _azimuthOffset = pX; } -void AngleDeception::setAzimuthOffset(float pX) -{ - _azimuthOffset = pX; -} +float AngleDeception::getAzimuthWidth() const { return _azimuthWidth; } -float AngleDeception::getAzimuthWidth() const -{ - return _azimuthWidth; -} +void AngleDeception::setAzimuthWidth(float pX) { _azimuthWidth = pX; } -void AngleDeception::setAzimuthWidth(float pX) -{ - _azimuthWidth = pX; -} +float AngleDeception::getAzimuthPullRate() const { return _azimuthPullRate; } -float AngleDeception::getAzimuthPullRate() const -{ - return _azimuthPullRate; -} +void AngleDeception::setAzimuthPullRate(float pX) { _azimuthPullRate = pX; } -void AngleDeception::setAzimuthPullRate(float pX) -{ - _azimuthPullRate = pX; +float AngleDeception::getAzimuthPullAcceleration() const { + return _azimuthPullAcceleration; } -float AngleDeception::getAzimuthPullAcceleration() const -{ - return _azimuthPullAcceleration; +void AngleDeception::setAzimuthPullAcceleration(float pX) { + _azimuthPullAcceleration = pX; } -void AngleDeception::setAzimuthPullAcceleration(float pX) -{ - _azimuthPullAcceleration = pX; -} +float AngleDeception::getElevationOffset() const { return _elevationOffset; } -float AngleDeception::getElevationOffset() const -{ - return _elevationOffset; -} +void AngleDeception::setElevationOffset(float pX) { _elevationOffset = pX; } -void AngleDeception::setElevationOffset(float pX) -{ - _elevationOffset = pX; -} +float AngleDeception::getElevationWidth() const { return _elevationWidth; } -float AngleDeception::getElevationWidth() const -{ - return _elevationWidth; -} +void AngleDeception::setElevationWidth(float pX) { _elevationWidth = pX; } -void AngleDeception::setElevationWidth(float pX) -{ - _elevationWidth = pX; +float AngleDeception::getElevationPullRate() const { + return _elevationPullRate; } -float AngleDeception::getElevationPullRate() const -{ - return _elevationPullRate; -} +void AngleDeception::setElevationPullRate(float pX) { _elevationPullRate = pX; } -void AngleDeception::setElevationPullRate(float pX) -{ - _elevationPullRate = pX; +float AngleDeception::getElevationPullAcceleration() const { + return _elevationPullAcceleration; } -float AngleDeception::getElevationPullAcceleration() const -{ - return _elevationPullAcceleration; +void AngleDeception::setElevationPullAcceleration(float pX) { + _elevationPullAcceleration = pX; } -void AngleDeception::setElevationPullAcceleration(float pX) -{ - _elevationPullAcceleration = pX; -} +unsigned int AngleDeception::getPadding3() const { return _padding3; } -unsigned int AngleDeception::getPadding3() const -{ - return _padding3; -} +void AngleDeception::setPadding3(unsigned int pX) { _padding3 = pX; } -void AngleDeception::setPadding3(unsigned int pX) -{ - _padding3 = pX; +void AngleDeception::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _padding; + dataStream << _emitterNumber; + dataStream << _beamNumber; + dataStream << _stateIndicator; + dataStream << _padding2; + dataStream << _azimuthOffset; + dataStream << _azimuthWidth; + dataStream << _azimuthPullRate; + dataStream << _azimuthPullAcceleration; + dataStream << _elevationOffset; + dataStream << _elevationWidth; + dataStream << _elevationPullRate; + dataStream << _elevationPullAcceleration; + dataStream << _padding3; } -void AngleDeception::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _padding; - dataStream << _emitterNumber; - dataStream << _beamNumber; - dataStream << _stateIndicator; - dataStream << _padding2; - dataStream << _azimuthOffset; - dataStream << _azimuthWidth; - dataStream << _azimuthPullRate; - dataStream << _azimuthPullAcceleration; - dataStream << _elevationOffset; - dataStream << _elevationWidth; - dataStream << _elevationPullRate; - dataStream << _elevationPullAcceleration; - dataStream << _padding3; +void AngleDeception::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _padding; + dataStream >> _emitterNumber; + dataStream >> _beamNumber; + dataStream >> _stateIndicator; + dataStream >> _padding2; + dataStream >> _azimuthOffset; + dataStream >> _azimuthWidth; + dataStream >> _azimuthPullRate; + dataStream >> _azimuthPullAcceleration; + dataStream >> _elevationOffset; + dataStream >> _elevationWidth; + dataStream >> _elevationPullRate; + dataStream >> _elevationPullAcceleration; + dataStream >> _padding3; } -void AngleDeception::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _padding; - dataStream >> _emitterNumber; - dataStream >> _beamNumber; - dataStream >> _stateIndicator; - dataStream >> _padding2; - dataStream >> _azimuthOffset; - dataStream >> _azimuthWidth; - dataStream >> _azimuthPullRate; - dataStream >> _azimuthPullAcceleration; - dataStream >> _elevationOffset; - dataStream >> _elevationWidth; - dataStream >> _elevationPullRate; - dataStream >> _elevationPullAcceleration; - dataStream >> _padding3; -} +bool AngleDeception::operator==(const AngleDeception& rhs) const { + bool ivarsEqual = true; + + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_emitterNumber == rhs._emitterNumber)) ivarsEqual = false; + if (!(_beamNumber == rhs._beamNumber)) ivarsEqual = false; + if (!(_stateIndicator == rhs._stateIndicator)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_azimuthOffset == rhs._azimuthOffset)) ivarsEqual = false; + if (!(_azimuthWidth == rhs._azimuthWidth)) ivarsEqual = false; + if (!(_azimuthPullRate == rhs._azimuthPullRate)) ivarsEqual = false; + if (!(_azimuthPullAcceleration == rhs._azimuthPullAcceleration)) + ivarsEqual = false; + if (!(_elevationOffset == rhs._elevationOffset)) ivarsEqual = false; + if (!(_elevationWidth == rhs._elevationWidth)) ivarsEqual = false; + if (!(_elevationPullRate == rhs._elevationPullRate)) ivarsEqual = false; + if (!(_elevationPullAcceleration == rhs._elevationPullAcceleration)) + ivarsEqual = false; + if (!(_padding3 == rhs._padding3)) ivarsEqual = false; + return ivarsEqual; +} -bool AngleDeception::operator ==(const AngleDeception& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_emitterNumber == rhs._emitterNumber) ) ivarsEqual = false; - if( ! (_beamNumber == rhs._beamNumber) ) ivarsEqual = false; - if( ! (_stateIndicator == rhs._stateIndicator) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_azimuthOffset == rhs._azimuthOffset) ) ivarsEqual = false; - if( ! (_azimuthWidth == rhs._azimuthWidth) ) ivarsEqual = false; - if( ! (_azimuthPullRate == rhs._azimuthPullRate) ) ivarsEqual = false; - if( ! (_azimuthPullAcceleration == rhs._azimuthPullAcceleration) ) ivarsEqual = false; - if( ! (_elevationOffset == rhs._elevationOffset) ) ivarsEqual = false; - if( ! (_elevationWidth == rhs._elevationWidth) ) ivarsEqual = false; - if( ! (_elevationPullRate == rhs._elevationPullRate) ) ivarsEqual = false; - if( ! (_elevationPullAcceleration == rhs._elevationPullAcceleration) ) ivarsEqual = false; - if( ! (_padding3 == rhs._padding3) ) ivarsEqual = false; - - return ivarsEqual; - } - -int AngleDeception::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + 1; // _emitterNumber - marshalSize = marshalSize + 1; // _beamNumber - marshalSize = marshalSize + 1; // _stateIndicator - marshalSize = marshalSize + 4; // _padding2 - marshalSize = marshalSize + 4; // _azimuthOffset - marshalSize = marshalSize + 4; // _azimuthWidth - marshalSize = marshalSize + 4; // _azimuthPullRate - marshalSize = marshalSize + 4; // _azimuthPullAcceleration - marshalSize = marshalSize + 4; // _elevationOffset - marshalSize = marshalSize + 4; // _elevationWidth - marshalSize = marshalSize + 4; // _elevationPullRate - marshalSize = marshalSize + 4; // _elevationPullAcceleration - marshalSize = marshalSize + 4; // _padding3 - return marshalSize; +int AngleDeception::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 2; // _padding + marshalSize = marshalSize + 1; // _emitterNumber + marshalSize = marshalSize + 1; // _beamNumber + marshalSize = marshalSize + 1; // _stateIndicator + marshalSize = marshalSize + 4; // _padding2 + marshalSize = marshalSize + 4; // _azimuthOffset + marshalSize = marshalSize + 4; // _azimuthWidth + marshalSize = marshalSize + 4; // _azimuthPullRate + marshalSize = marshalSize + 4; // _azimuthPullAcceleration + marshalSize = marshalSize + 4; // _elevationOffset + marshalSize = marshalSize + 4; // _elevationWidth + marshalSize = marshalSize + 4; // _elevationPullRate + marshalSize = marshalSize + 4; // _elevationPullAcceleration + marshalSize = marshalSize + 4; // _padding3 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -292,7 +204,7 @@ int AngleDeception::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AngleDeception.h b/src/dis7/AngleDeception.h index 8eeb1ccf..fc860711 100644 --- a/src/dis7/AngleDeception.h +++ b/src/dis7/AngleDeception.h @@ -1,120 +1,120 @@ #pragma once -#include #include +#include +namespace DIS { +// The Angle Deception attribute record may be used to communicate discrete +// values that are associated with angle deception jamming that cannot be +// referenced to an emitter mode. The values provided in the record records +// (provided in the associated Electromagnetic Emission PDU). (The victim radar +// beams are those that are targeted by the jammer.) Section 6.2.12.2 -namespace DIS -{ -// The Angle Deception attribute record may be used to communicate discrete values that are associated with angle deception jamming that cannot be referenced to an emitter mode. The values provided in the record records (provided in the associated Electromagnetic Emission PDU). (The victim radar beams are those that are targeted by the jammer.) Section 6.2.12.2 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AngleDeception -{ -protected: - unsigned int _recordType; - - unsigned short _recordLength; +class OPENDIS7_EXPORT AngleDeception { + protected: + unsigned int _recordType; - unsigned short _padding; + unsigned short _recordLength; - unsigned char _emitterNumber; + unsigned short _padding; - unsigned char _beamNumber; + unsigned char _emitterNumber; - unsigned char _stateIndicator; + unsigned char _beamNumber; - unsigned int _padding2; + unsigned char _stateIndicator; - float _azimuthOffset; + unsigned int _padding2; - float _azimuthWidth; + float _azimuthOffset; - float _azimuthPullRate; + float _azimuthWidth; - float _azimuthPullAcceleration; + float _azimuthPullRate; - float _elevationOffset; + float _azimuthPullAcceleration; - float _elevationWidth; + float _elevationOffset; - float _elevationPullRate; + float _elevationWidth; - float _elevationPullAcceleration; + float _elevationPullRate; - unsigned int _padding3; + float _elevationPullAcceleration; + unsigned int _padding3; public: - AngleDeception(); - virtual ~AngleDeception(); + AngleDeception(); + virtual ~AngleDeception(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + unsigned char getEmitterNumber() const; + void setEmitterNumber(unsigned char pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + unsigned char getBeamNumber() const; + void setBeamNumber(unsigned char pX); - unsigned char getStateIndicator() const; - void setStateIndicator(unsigned char pX); + unsigned char getStateIndicator() const; + void setStateIndicator(unsigned char pX); - unsigned int getPadding2() const; - void setPadding2(unsigned int pX); + unsigned int getPadding2() const; + void setPadding2(unsigned int pX); - float getAzimuthOffset() const; - void setAzimuthOffset(float pX); + float getAzimuthOffset() const; + void setAzimuthOffset(float pX); - float getAzimuthWidth() const; - void setAzimuthWidth(float pX); + float getAzimuthWidth() const; + void setAzimuthWidth(float pX); - float getAzimuthPullRate() const; - void setAzimuthPullRate(float pX); + float getAzimuthPullRate() const; + void setAzimuthPullRate(float pX); - float getAzimuthPullAcceleration() const; - void setAzimuthPullAcceleration(float pX); + float getAzimuthPullAcceleration() const; + void setAzimuthPullAcceleration(float pX); - float getElevationOffset() const; - void setElevationOffset(float pX); + float getElevationOffset() const; + void setElevationOffset(float pX); - float getElevationWidth() const; - void setElevationWidth(float pX); + float getElevationWidth() const; + void setElevationWidth(float pX); - float getElevationPullRate() const; - void setElevationPullRate(float pX); + float getElevationPullRate() const; + void setElevationPullRate(float pX); - float getElevationPullAcceleration() const; - void setElevationPullAcceleration(float pX); + float getElevationPullAcceleration() const; + void setElevationPullAcceleration(float pX); - unsigned int getPadding3() const; - void setPadding3(unsigned int pX); + unsigned int getPadding3() const; + void setPadding3(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AngleDeception& rhs) const; + bool operator==(const AngleDeception& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +127,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AngularVelocityVector.cpp b/src/dis7/AngularVelocityVector.cpp index 4d8342e4..18bc2c34 100644 --- a/src/dis7/AngularVelocityVector.cpp +++ b/src/dis7/AngularVelocityVector.cpp @@ -2,89 +2,58 @@ using namespace DIS; +AngularVelocityVector::AngularVelocityVector() : _x(0), _y(0), _z(0) {} -AngularVelocityVector::AngularVelocityVector(): - _x(0), - _y(0), - _z(0) -{ -} +AngularVelocityVector::~AngularVelocityVector() {} -AngularVelocityVector::~AngularVelocityVector() -{ -} +float AngularVelocityVector::getX() const { return _x; } -float AngularVelocityVector::getX() const -{ - return _x; -} +void AngularVelocityVector::setX(float pX) { _x = pX; } -void AngularVelocityVector::setX(float pX) -{ - _x = pX; -} +float AngularVelocityVector::getY() const { return _y; } -float AngularVelocityVector::getY() const -{ - return _y; -} +void AngularVelocityVector::setY(float pX) { _y = pX; } -void AngularVelocityVector::setY(float pX) -{ - _y = pX; -} +float AngularVelocityVector::getZ() const { return _z; } -float AngularVelocityVector::getZ() const -{ - return _z; -} - -void AngularVelocityVector::setZ(float pX) -{ - _z = pX; -} +void AngularVelocityVector::setZ(float pX) { _z = pX; } -void AngularVelocityVector::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; - dataStream << _z; +void AngularVelocityVector::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; + dataStream << _z; } -void AngularVelocityVector::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; +void AngularVelocityVector::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; + dataStream >> _z; } +bool AngularVelocityVector::operator==(const AngularVelocityVector& rhs) const { + bool ivarsEqual = true; -bool AngularVelocityVector::operator ==(const AngularVelocityVector& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; + if (!(_z == rhs._z)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - if( ! (_z == rhs._z) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AngularVelocityVector::getMarshalledSize() const -{ - int marshalSize = 0; +int AngularVelocityVector::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - marshalSize = marshalSize + 4; // _z - return marshalSize; + marshalSize = marshalSize + 4; // _x + marshalSize = marshalSize + 4; // _y + marshalSize = marshalSize + 4; // _z + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int AngularVelocityVector::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AngularVelocityVector.h b/src/dis7/AngularVelocityVector.h index c4e30312..cde6b607 100644 --- a/src/dis7/AngularVelocityVector.h +++ b/src/dis7/AngularVelocityVector.h @@ -1,58 +1,57 @@ #pragma once -#include #include +#include +namespace DIS { +// Angular velocity measured in radians per second out each of the entity's own +// coordinate axes. Order of measurement is angular velocity around the x, y, +// and z axis of the entity. The positive direction is determined by the right +// hand rule. Section 6.2.7 -namespace DIS -{ -// Angular velocity measured in radians per second out each of the entity's own coordinate axes. Order of measurement is angular velocity around the x, y, and z axis of the entity. The positive direction is determined by the right hand rule. Section 6.2.7 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AngularVelocityVector -{ -protected: +class OPENDIS7_EXPORT AngularVelocityVector { + protected: /** velocity about the x axis */ - float _x; + float _x; /** velocity about the y axis */ - float _y; + float _y; /** velocity about the zaxis */ - float _z; - + float _z; public: - AngularVelocityVector(); - virtual ~AngularVelocityVector(); + AngularVelocityVector(); + virtual ~AngularVelocityVector(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getX() const; - void setX(float pX); + float getX() const; + void setX(float pX); - float getY() const; - void setY(float pX); + float getY() const; + void setY(float pX); - float getZ() const; - void setZ(float pX); + float getZ() const; + void setZ(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AngularVelocityVector& rhs) const; + bool operator==(const AngularVelocityVector& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +64,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AntennaLocation.cpp b/src/dis7/AntennaLocation.cpp index a2a32182..0dacfb27 100644 --- a/src/dis7/AntennaLocation.cpp +++ b/src/dis7/AntennaLocation.cpp @@ -2,84 +2,71 @@ using namespace DIS; +AntennaLocation::AntennaLocation() + : _antennaLocation(), _relativeAntennaLocation() {} -AntennaLocation::AntennaLocation(): - _antennaLocation(), - _relativeAntennaLocation() -{ -} - -AntennaLocation::~AntennaLocation() -{ -} +AntennaLocation::~AntennaLocation() {} -Vector3Double& AntennaLocation::getAntennaLocation() -{ - return _antennaLocation; +Vector3Double& AntennaLocation::getAntennaLocation() { + return _antennaLocation; } -const Vector3Double& AntennaLocation::getAntennaLocation() const -{ - return _antennaLocation; +const Vector3Double& AntennaLocation::getAntennaLocation() const { + return _antennaLocation; } -void AntennaLocation::setAntennaLocation(const Vector3Double &pX) -{ - _antennaLocation = pX; +void AntennaLocation::setAntennaLocation(const Vector3Double& pX) { + _antennaLocation = pX; } -Vector3Float& AntennaLocation::getRelativeAntennaLocation() -{ - return _relativeAntennaLocation; +Vector3Float& AntennaLocation::getRelativeAntennaLocation() { + return _relativeAntennaLocation; } -const Vector3Float& AntennaLocation::getRelativeAntennaLocation() const -{ - return _relativeAntennaLocation; +const Vector3Float& AntennaLocation::getRelativeAntennaLocation() const { + return _relativeAntennaLocation; } -void AntennaLocation::setRelativeAntennaLocation(const Vector3Float &pX) -{ - _relativeAntennaLocation = pX; +void AntennaLocation::setRelativeAntennaLocation(const Vector3Float& pX) { + _relativeAntennaLocation = pX; } -void AntennaLocation::marshal(DataStream& dataStream) const -{ - _antennaLocation.marshal(dataStream); - _relativeAntennaLocation.marshal(dataStream); +void AntennaLocation::marshal(DataStream& dataStream) const { + _antennaLocation.marshal(dataStream); + _relativeAntennaLocation.marshal(dataStream); } -void AntennaLocation::unmarshal(DataStream& dataStream) -{ - _antennaLocation.unmarshal(dataStream); - _relativeAntennaLocation.unmarshal(dataStream); +void AntennaLocation::unmarshal(DataStream& dataStream) { + _antennaLocation.unmarshal(dataStream); + _relativeAntennaLocation.unmarshal(dataStream); } +bool AntennaLocation::operator==(const AntennaLocation& rhs) const { + bool ivarsEqual = true; -bool AntennaLocation::operator ==(const AntennaLocation& rhs) const - { - bool ivarsEqual = true; + if (!(_antennaLocation == rhs._antennaLocation)) ivarsEqual = false; + if (!(_relativeAntennaLocation == rhs._relativeAntennaLocation)) + ivarsEqual = false; - if( ! (_antennaLocation == rhs._antennaLocation) ) ivarsEqual = false; - if( ! (_relativeAntennaLocation == rhs._relativeAntennaLocation) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AntennaLocation::getMarshalledSize() const -{ - int marshalSize = 0; +int AntennaLocation::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _antennaLocation.getMarshalledSize(); // _antennaLocation - marshalSize = marshalSize + _relativeAntennaLocation.getMarshalledSize(); // _relativeAntennaLocation - return marshalSize; + marshalSize = + marshalSize + _antennaLocation.getMarshalledSize(); // _antennaLocation + marshalSize = + marshalSize + + _relativeAntennaLocation.getMarshalledSize(); // _relativeAntennaLocation + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -92,7 +79,7 @@ int AntennaLocation::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AntennaLocation.h b/src/dis7/AntennaLocation.h index 76cf8131..0e80193a 100644 --- a/src/dis7/AntennaLocation.h +++ b/src/dis7/AntennaLocation.h @@ -2,55 +2,54 @@ #include #include -#include #include +#include +namespace DIS { +// Location of the radiating portion of the antenna, specified in world +// coordinates and entity coordinates. Section 6.2.8 -namespace DIS -{ -// Location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. Section 6.2.8 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AntennaLocation -{ -protected: - /** Location of the radiating portion of the antenna in world coordinates */ - Vector3Double _antennaLocation; - - /** Location of the radiating portion of the antenna in entity coordinates */ - Vector3Float _relativeAntennaLocation; +class OPENDIS7_EXPORT AntennaLocation { + protected: + /** Location of the radiating portion of the antenna in world coordinates + */ + Vector3Double _antennaLocation; + /** Location of the radiating portion of the antenna in entity coordinates + */ + Vector3Float _relativeAntennaLocation; public: - AntennaLocation(); - virtual ~AntennaLocation(); + AntennaLocation(); + virtual ~AntennaLocation(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - Vector3Double& getAntennaLocation(); - const Vector3Double& getAntennaLocation() const; - void setAntennaLocation(const Vector3Double &pX); + Vector3Double& getAntennaLocation(); + const Vector3Double& getAntennaLocation() const; + void setAntennaLocation(const Vector3Double& pX); - Vector3Float& getRelativeAntennaLocation(); - const Vector3Float& getRelativeAntennaLocation() const; - void setRelativeAntennaLocation(const Vector3Float &pX); + Vector3Float& getRelativeAntennaLocation(); + const Vector3Float& getRelativeAntennaLocation() const; + void setRelativeAntennaLocation(const Vector3Float& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AntennaLocation& rhs) const; + bool operator==(const AntennaLocation& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -63,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ArealObjectStatePdu.cpp b/src/dis7/ArealObjectStatePdu.cpp index 8a31a993..4881b154 100644 --- a/src/dis7/ArealObjectStatePdu.cpp +++ b/src/dis7/ArealObjectStatePdu.cpp @@ -2,278 +2,229 @@ using namespace DIS; - -ArealObjectStatePdu::ArealObjectStatePdu() : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), - _forceID(0), - _modifications(0), - _objectType(), - _specificObjectAppearance(0), - _generalObjectAppearance(0), - _numberOfPoints(0), - _requesterID(), - _receivingID() -{ - setPduType( 45 ); +ArealObjectStatePdu::ArealObjectStatePdu() + : SyntheticEnvironmentFamilyPdu(), + _objectID(), + _referencedObjectID(), + _updateNumber(0), + _forceID(0), + _modifications(0), + _objectType(), + _specificObjectAppearance(0), + _generalObjectAppearance(0), + _numberOfPoints(0), + _requesterID(), + _receivingID() { + setPduType(45); } -ArealObjectStatePdu::~ArealObjectStatePdu() -{ - _objectLocation.clear(); -} +ArealObjectStatePdu::~ArealObjectStatePdu() { _objectLocation.clear(); } -EntityID& ArealObjectStatePdu::getObjectID() -{ - return _objectID; -} +EntityID& ArealObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& ArealObjectStatePdu::getObjectID() const -{ - return _objectID; -} +const EntityID& ArealObjectStatePdu::getObjectID() const { return _objectID; } -void ArealObjectStatePdu::setObjectID(const EntityID &pX) -{ - _objectID = pX; -} +void ArealObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } -EntityID& ArealObjectStatePdu::getReferencedObjectID() -{ - return _referencedObjectID; +EntityID& ArealObjectStatePdu::getReferencedObjectID() { + return _referencedObjectID; } -const EntityID& ArealObjectStatePdu::getReferencedObjectID() const -{ - return _referencedObjectID; +const EntityID& ArealObjectStatePdu::getReferencedObjectID() const { + return _referencedObjectID; } -void ArealObjectStatePdu::setReferencedObjectID(const EntityID &pX) -{ - _referencedObjectID = pX; +void ArealObjectStatePdu::setReferencedObjectID(const EntityID& pX) { + _referencedObjectID = pX; } -unsigned short ArealObjectStatePdu::getUpdateNumber() const -{ - return _updateNumber; +unsigned short ArealObjectStatePdu::getUpdateNumber() const { + return _updateNumber; } -void ArealObjectStatePdu::setUpdateNumber(unsigned short pX) -{ - _updateNumber = pX; +void ArealObjectStatePdu::setUpdateNumber(unsigned short pX) { + _updateNumber = pX; } -unsigned char ArealObjectStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char ArealObjectStatePdu::getForceID() const { return _forceID; } -void ArealObjectStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void ArealObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char ArealObjectStatePdu::getModifications() const -{ - return _modifications; +unsigned char ArealObjectStatePdu::getModifications() const { + return _modifications; } -void ArealObjectStatePdu::setModifications(unsigned char pX) -{ - _modifications = pX; +void ArealObjectStatePdu::setModifications(unsigned char pX) { + _modifications = pX; } -EntityType& ArealObjectStatePdu::getObjectType() -{ - return _objectType; +EntityType& ArealObjectStatePdu::getObjectType() { return _objectType; } + +const EntityType& ArealObjectStatePdu::getObjectType() const { + return _objectType; } -const EntityType& ArealObjectStatePdu::getObjectType() const -{ - return _objectType; +void ArealObjectStatePdu::setObjectType(const EntityType& pX) { + _objectType = pX; } -void ArealObjectStatePdu::setObjectType(const EntityType &pX) -{ - _objectType = pX; +unsigned int ArealObjectStatePdu::getSpecificObjectAppearance() const { + return _specificObjectAppearance; } -unsigned int ArealObjectStatePdu::getSpecificObjectAppearance() const -{ - return _specificObjectAppearance; +void ArealObjectStatePdu::setSpecificObjectAppearance(unsigned int pX) { + _specificObjectAppearance = pX; } -void ArealObjectStatePdu::setSpecificObjectAppearance(unsigned int pX) -{ - _specificObjectAppearance = pX; +unsigned short ArealObjectStatePdu::getGeneralObjectAppearance() const { + return _generalObjectAppearance; } -unsigned short ArealObjectStatePdu::getGeneralObjectAppearance() const -{ - return _generalObjectAppearance; +void ArealObjectStatePdu::setGeneralObjectAppearance(unsigned short pX) { + _generalObjectAppearance = pX; } -void ArealObjectStatePdu::setGeneralObjectAppearance(unsigned short pX) -{ - _generalObjectAppearance = pX; +unsigned short ArealObjectStatePdu::getNumberOfPoints() const { + return _objectLocation.size(); } -unsigned short ArealObjectStatePdu::getNumberOfPoints() const -{ - return _objectLocation.size(); +SimulationAddress& ArealObjectStatePdu::getRequesterID() { + return _requesterID; } -SimulationAddress& ArealObjectStatePdu::getRequesterID() -{ - return _requesterID; +const SimulationAddress& ArealObjectStatePdu::getRequesterID() const { + return _requesterID; } -const SimulationAddress& ArealObjectStatePdu::getRequesterID() const -{ - return _requesterID; +void ArealObjectStatePdu::setRequesterID(const SimulationAddress& pX) { + _requesterID = pX; } -void ArealObjectStatePdu::setRequesterID(const SimulationAddress &pX) -{ - _requesterID = pX; +SimulationAddress& ArealObjectStatePdu::getReceivingID() { + return _receivingID; } -SimulationAddress& ArealObjectStatePdu::getReceivingID() -{ - return _receivingID; +const SimulationAddress& ArealObjectStatePdu::getReceivingID() const { + return _receivingID; } -const SimulationAddress& ArealObjectStatePdu::getReceivingID() const -{ - return _receivingID; +void ArealObjectStatePdu::setReceivingID(const SimulationAddress& pX) { + _receivingID = pX; } -void ArealObjectStatePdu::setReceivingID(const SimulationAddress &pX) -{ - _receivingID = pX; +std::vector& ArealObjectStatePdu::getObjectLocation() { + return _objectLocation; } -std::vector& ArealObjectStatePdu::getObjectLocation() -{ - return _objectLocation; +const std::vector& ArealObjectStatePdu::getObjectLocation() + const { + return _objectLocation; } -const std::vector& ArealObjectStatePdu::getObjectLocation() const -{ - return _objectLocation; +void ArealObjectStatePdu::setObjectLocation( + const std::vector& pX) { + _objectLocation = pX; } -void ArealObjectStatePdu::setObjectLocation(const std::vector& pX) -{ - _objectLocation = pX; +void ArealObjectStatePdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _objectID.marshal(dataStream); + _referencedObjectID.marshal(dataStream); + dataStream << _updateNumber; + dataStream << _forceID; + dataStream << _modifications; + _objectType.marshal(dataStream); + dataStream << _specificObjectAppearance; + dataStream << _generalObjectAppearance; + dataStream << (unsigned short)_objectLocation.size(); + _requesterID.marshal(dataStream); + _receivingID.marshal(dataStream); + + for (size_t idx = 0; idx < _objectLocation.size(); idx++) { + Vector3Double x = _objectLocation[idx]; + x.marshal(dataStream); + } } -void ArealObjectStatePdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _objectID.marshal(dataStream); - _referencedObjectID.marshal(dataStream); - dataStream << _updateNumber; - dataStream << _forceID; - dataStream << _modifications; - _objectType.marshal(dataStream); - dataStream << _specificObjectAppearance; - dataStream << _generalObjectAppearance; - dataStream << ( unsigned short )_objectLocation.size(); - _requesterID.marshal(dataStream); - _receivingID.marshal(dataStream); - - for(size_t idx = 0; idx < _objectLocation.size(); idx++) - { - Vector3Double x = _objectLocation[idx]; - x.marshal(dataStream); - } +void ArealObjectStatePdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _objectID.unmarshal(dataStream); + _referencedObjectID.unmarshal(dataStream); + dataStream >> _updateNumber; + dataStream >> _forceID; + dataStream >> _modifications; + _objectType.unmarshal(dataStream); + dataStream >> _specificObjectAppearance; + dataStream >> _generalObjectAppearance; + dataStream >> _numberOfPoints; + _requesterID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + _objectLocation.clear(); + for (size_t idx = 0; idx < _numberOfPoints; idx++) { + Vector3Double x; + x.unmarshal(dataStream); + _objectLocation.push_back(x); + } } -void ArealObjectStatePdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _objectID.unmarshal(dataStream); - _referencedObjectID.unmarshal(dataStream); - dataStream >> _updateNumber; - dataStream >> _forceID; - dataStream >> _modifications; - _objectType.unmarshal(dataStream); - dataStream >> _specificObjectAppearance; - dataStream >> _generalObjectAppearance; - dataStream >> _numberOfPoints; - _requesterID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - - _objectLocation.clear(); - for(size_t idx = 0; idx < _numberOfPoints; idx++) - { - Vector3Double x; - x.unmarshal(dataStream); - _objectLocation.push_back(x); - } +bool ArealObjectStatePdu::operator==(const ArealObjectStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + + if (!(_objectID == rhs._objectID)) ivarsEqual = false; + if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; + if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_modifications == rhs._modifications)) ivarsEqual = false; + if (!(_objectType == rhs._objectType)) ivarsEqual = false; + if (!(_specificObjectAppearance == rhs._specificObjectAppearance)) + ivarsEqual = false; + if (!(_generalObjectAppearance == rhs._generalObjectAppearance)) + ivarsEqual = false; + if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + + for (size_t idx = 0; idx < _objectLocation.size(); idx++) { + if (!(_objectLocation[idx] == rhs._objectLocation[idx])) ivarsEqual = false; + } + + return ivarsEqual; } +int ArealObjectStatePdu::getMarshalledSize() const { + int marshalSize = 0; -bool ArealObjectStatePdu::operator ==(const ArealObjectStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - - if( ! (_objectID == rhs._objectID) ) ivarsEqual = false; - if( ! (_referencedObjectID == rhs._referencedObjectID) ) ivarsEqual = false; - if( ! (_updateNumber == rhs._updateNumber) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_modifications == rhs._modifications) ) ivarsEqual = false; - if( ! (_objectType == rhs._objectType) ) ivarsEqual = false; - if( ! (_specificObjectAppearance == rhs._specificObjectAppearance) ) ivarsEqual = false; - if( ! (_generalObjectAppearance == rhs._generalObjectAppearance) ) ivarsEqual = false; - if( ! (_requesterID == rhs._requesterID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _objectLocation.size(); idx++) - { - if( ! ( _objectLocation[idx] == rhs._objectLocation[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int ArealObjectStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _modifications - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - marshalSize = marshalSize + 4; // _specificObjectAppearance - marshalSize = marshalSize + 2; // _generalObjectAppearance - marshalSize = marshalSize + 2; // _numberOfPoints - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - - for(unsigned long long idx=0; idx < _objectLocation.size(); idx++) - { - Vector3Double listElement = _objectLocation[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID + marshalSize = marshalSize + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshalSize = marshalSize + 2; // _updateNumber + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _modifications + marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType + marshalSize = marshalSize + 4; // _specificObjectAppearance + marshalSize = marshalSize + 2; // _generalObjectAppearance + marshalSize = marshalSize + 2; // _numberOfPoints + marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + + for (unsigned long long idx = 0; idx < _objectLocation.size(); idx++) { + Vector3Double listElement = _objectLocation[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -286,7 +237,7 @@ int ArealObjectStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ArealObjectStatePdu.h b/src/dis7/ArealObjectStatePdu.h index 07b38f23..cc85b88a 100644 --- a/src/dis7/ArealObjectStatePdu.h +++ b/src/dis7/ArealObjectStatePdu.h @@ -1,125 +1,123 @@ #pragma once -#include +#include + #include #include #include -#include -#include -#include #include -#include +#include #include +#include +namespace DIS { +// Information about the addition/modification of an oobject that is +// geometrically anchored to the terrain with a set of three or more points that +// come to a closure. Section 7.10.6 COMPLETE -namespace DIS -{ -// Information about the addition/modification of an oobject that is geometrically anchored to the terrain with a set of three or more points that come to a closure. Section 7.10.6 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ArealObjectStatePdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ArealObjectStatePdu + : public SyntheticEnvironmentFamilyPdu { + protected: /** Object in synthetic environment */ - EntityID _objectID; + EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + unsigned short _updateNumber; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** modifications enumeration */ - unsigned char _modifications; + unsigned char _modifications; /** Object type */ - EntityType _objectType; + EntityType _objectType; /** Object appearance */ - unsigned int _specificObjectAppearance; + unsigned int _specificObjectAppearance; /** Object appearance */ - unsigned short _generalObjectAppearance; + unsigned short _generalObjectAppearance; /** Number of points */ - unsigned short _numberOfPoints; + unsigned short _numberOfPoints; /** requesterID */ - SimulationAddress _requesterID; + SimulationAddress _requesterID; /** receiver ID */ - SimulationAddress _receivingID; + SimulationAddress _receivingID; /** location of object */ - std::vector _objectLocation; - + std::vector _objectLocation; public: - ArealObjectStatePdu(); - virtual ~ArealObjectStatePdu(); + ArealObjectStatePdu(); + virtual ~ArealObjectStatePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID &pX); + EntityID& getObjectID(); + const EntityID& getObjectID() const; + void setObjectID(const EntityID& pX); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID &pX); + EntityID& getReferencedObjectID(); + const EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + unsigned short getUpdateNumber() const; + void setUpdateNumber(unsigned short pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned char getForceID() const; + void setForceID(unsigned char pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + unsigned char getModifications() const; + void setModifications(unsigned char pX); - EntityType& getObjectType(); - const EntityType& getObjectType() const; - void setObjectType(const EntityType &pX); + EntityType& getObjectType(); + const EntityType& getObjectType() const; + void setObjectType(const EntityType& pX); - unsigned int getSpecificObjectAppearance() const; - void setSpecificObjectAppearance(unsigned int pX); + unsigned int getSpecificObjectAppearance() const; + void setSpecificObjectAppearance(unsigned int pX); - unsigned short getGeneralObjectAppearance() const; - void setGeneralObjectAppearance(unsigned short pX); + unsigned short getGeneralObjectAppearance() const; + void setGeneralObjectAppearance(unsigned short pX); - unsigned short getNumberOfPoints() const; + unsigned short getNumberOfPoints() const; - SimulationAddress& getRequesterID(); - const SimulationAddress& getRequesterID() const; - void setRequesterID(const SimulationAddress &pX); + SimulationAddress& getRequesterID(); + const SimulationAddress& getRequesterID() const; + void setRequesterID(const SimulationAddress& pX); - SimulationAddress& getReceivingID(); - const SimulationAddress& getReceivingID() const; - void setReceivingID(const SimulationAddress &pX); + SimulationAddress& getReceivingID(); + const SimulationAddress& getReceivingID() const; + void setReceivingID(const SimulationAddress& pX); - std::vector& getObjectLocation(); - const std::vector& getObjectLocation() const; - void setObjectLocation(const std::vector& pX); + std::vector& getObjectLocation(); + const std::vector& getObjectLocation() const; + void setObjectLocation(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ArealObjectStatePdu& rhs) const; + bool operator==(const ArealObjectStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -132,7 +130,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ArticulatedParts.cpp b/src/dis7/ArticulatedParts.cpp index d407e413..bcc42753 100644 --- a/src/dis7/ArticulatedParts.cpp +++ b/src/dis7/ArticulatedParts.cpp @@ -2,123 +2,95 @@ using namespace DIS; +ArticulatedParts::ArticulatedParts() + : _recordType(0), + _changeIndicator(0), + _partAttachedTo(0), + _parameterType(0), + _parameterValue(0), + _padding(0) {} -ArticulatedParts::ArticulatedParts(): - _recordType(0), - _changeIndicator(0), - _partAttachedTo(0), - _parameterType(0), - _parameterValue(0), - _padding(0) -{ -} +ArticulatedParts::~ArticulatedParts() {} -ArticulatedParts::~ArticulatedParts() -{ -} +unsigned char ArticulatedParts::getRecordType() const { return _recordType; } -unsigned char ArticulatedParts::getRecordType() const -{ - return _recordType; -} +void ArticulatedParts::setRecordType(unsigned char pX) { _recordType = pX; } -void ArticulatedParts::setRecordType(unsigned char pX) -{ - _recordType = pX; +unsigned char ArticulatedParts::getChangeIndicator() const { + return _changeIndicator; } -unsigned char ArticulatedParts::getChangeIndicator() const -{ - return _changeIndicator; +void ArticulatedParts::setChangeIndicator(unsigned char pX) { + _changeIndicator = pX; } -void ArticulatedParts::setChangeIndicator(unsigned char pX) -{ - _changeIndicator = pX; +unsigned short ArticulatedParts::getPartAttachedTo() const { + return _partAttachedTo; } -unsigned short ArticulatedParts::getPartAttachedTo() const -{ - return _partAttachedTo; +void ArticulatedParts::setPartAttachedTo(unsigned short pX) { + _partAttachedTo = pX; } -void ArticulatedParts::setPartAttachedTo(unsigned short pX) -{ - _partAttachedTo = pX; +unsigned int ArticulatedParts::getParameterType() const { + return _parameterType; } -unsigned int ArticulatedParts::getParameterType() const -{ - return _parameterType; +void ArticulatedParts::setParameterType(unsigned int pX) { + _parameterType = pX; } -void ArticulatedParts::setParameterType(unsigned int pX) -{ - _parameterType = pX; -} +float ArticulatedParts::getParameterValue() const { return _parameterValue; } -float ArticulatedParts::getParameterValue() const -{ - return _parameterValue; -} +void ArticulatedParts::setParameterValue(float pX) { _parameterValue = pX; } -void ArticulatedParts::setParameterValue(float pX) -{ - _parameterValue = pX; +void ArticulatedParts::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _changeIndicator; + dataStream << _partAttachedTo; + dataStream << _parameterType; + dataStream << _parameterValue; + dataStream << _padding; } -void ArticulatedParts::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _changeIndicator; - dataStream << _partAttachedTo; - dataStream << _parameterType; - dataStream << _parameterValue; - dataStream << _padding; -} - -void ArticulatedParts::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _changeIndicator; - dataStream >> _partAttachedTo; - dataStream >> _parameterType; - dataStream >> _parameterValue; - dataStream >> _padding; +void ArticulatedParts::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _changeIndicator; + dataStream >> _partAttachedTo; + dataStream >> _parameterType; + dataStream >> _parameterValue; + dataStream >> _padding; } +bool ArticulatedParts::operator==(const ArticulatedParts& rhs) const { + bool ivarsEqual = true; -bool ArticulatedParts::operator ==(const ArticulatedParts& rhs) const - { - bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_changeIndicator == rhs._changeIndicator)) ivarsEqual = false; + if (!(_partAttachedTo == rhs._partAttachedTo)) ivarsEqual = false; + if (!(_parameterType == rhs._parameterType)) ivarsEqual = false; + if (!(_parameterValue == rhs._parameterValue)) ivarsEqual = false; - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_changeIndicator == rhs._changeIndicator) ) ivarsEqual = false; - if( ! (_partAttachedTo == rhs._partAttachedTo) ) ivarsEqual = false; - if( ! (_parameterType == rhs._parameterType) ) ivarsEqual = false; - if( ! (_parameterValue == rhs._parameterValue) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ArticulatedParts::getMarshalledSize() const -{ - int marshalSize = 0; +int ArticulatedParts::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _recordType - marshalSize = marshalSize + 1; // _changeIndicator - marshalSize = marshalSize + 2; // _partAttachedTo - marshalSize = marshalSize + 4; // _parameterType - marshalSize = marshalSize + 4; // _parameterValue - marshalSize = marshalSize + 4; // _padding - return marshalSize; + marshalSize = marshalSize + 1; // _recordType + marshalSize = marshalSize + 1; // _changeIndicator + marshalSize = marshalSize + 2; // _partAttachedTo + marshalSize = marshalSize + 4; // _parameterType + marshalSize = marshalSize + 4; // _parameterValue + marshalSize = marshalSize + 4; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -131,7 +103,7 @@ int ArticulatedParts::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ArticulatedParts.h b/src/dis7/ArticulatedParts.h index fa618ec8..fbf719d5 100644 --- a/src/dis7/ArticulatedParts.h +++ b/src/dis7/ArticulatedParts.h @@ -1,74 +1,76 @@ #pragma once -#include #include +#include +namespace DIS { +// articulated parts for movable parts and a combination of moveable/attached +// parts of an entity. Section 6.2.94.2 -namespace DIS -{ -// articulated parts for movable parts and a combination of moveable/attached parts of an entity. Section 6.2.94.2 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ArticulatedParts -{ -protected: - /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; +class OPENDIS7_EXPORT ArticulatedParts { + protected: + /** the identification of the Variable Parameter record. Enumeration from EBV + */ + unsigned char _recordType; - /** indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change */ - unsigned char _changeIndicator; + /** indicate the change of any parameter for any articulated part. Starts at + * zero, incremented for each change */ + unsigned char _changeIndicator; - /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */ - unsigned short _partAttachedTo; + /** the identification of the articulated part to which this articulation + * parameter is attached. This field shall be specified by a 16-bit unsigned + * integer. This field shall contain the value zero if the articulated part is + * attached directly to the entity. */ + unsigned short _partAttachedTo; /** the type of parameter represented, 32 bit enumeration */ - unsigned int _parameterType; + unsigned int _parameterType; - /** This field shall specify the parameter value and shall be specified by a 32-bit -floating point number. */ + /** This field shall specify the parameter value and shall be specified by a +32-bit floating point number. */ float _parameterValue; /** 32 bits of unused padding */ unsigned int _padding; - public: - ArticulatedParts(); - virtual ~ArticulatedParts(); + ArticulatedParts(); + virtual ~ArticulatedParts(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + unsigned char getRecordType() const; + void setRecordType(unsigned char pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + unsigned char getChangeIndicator() const; + void setChangeIndicator(unsigned char pX); - unsigned short getPartAttachedTo() const; - void setPartAttachedTo(unsigned short pX); + unsigned short getPartAttachedTo() const; + void setPartAttachedTo(unsigned short pX); - unsigned int getParameterType() const; - void setParameterType(unsigned int pX); + unsigned int getParameterType() const; + void setParameterType(unsigned int pX); - float getParameterValue() const; - void setParameterValue(float pX); + float getParameterValue() const; + void setParameterValue(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ArticulatedParts& rhs) const; + bool operator==(const ArticulatedParts& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -81,7 +83,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Association.cpp b/src/dis7/Association.cpp index 8dab492c..1803d92a 100644 --- a/src/dis7/Association.cpp +++ b/src/dis7/Association.cpp @@ -2,114 +2,90 @@ using namespace DIS; +Association::Association() + : _associationType(0), + _padding4(0), + _associatedEntityID(), + _associatedLocation() {} -Association::Association(): - _associationType(0), - _padding4(0), - _associatedEntityID(), - _associatedLocation() -{ -} - -Association::~Association() -{ -} +Association::~Association() {} -unsigned char Association::getAssociationType() const -{ - return _associationType; +unsigned char Association::getAssociationType() const { + return _associationType; } -void Association::setAssociationType(unsigned char pX) -{ - _associationType = pX; +void Association::setAssociationType(unsigned char pX) { + _associationType = pX; } -unsigned char Association::getPadding4() const -{ - return _padding4; -} +unsigned char Association::getPadding4() const { return _padding4; } -void Association::setPadding4(unsigned char pX) -{ - _padding4 = pX; -} +void Association::setPadding4(unsigned char pX) { _padding4 = pX; } -EntityID& Association::getAssociatedEntityID() -{ - return _associatedEntityID; -} +EntityID& Association::getAssociatedEntityID() { return _associatedEntityID; } -const EntityID& Association::getAssociatedEntityID() const -{ - return _associatedEntityID; +const EntityID& Association::getAssociatedEntityID() const { + return _associatedEntityID; } -void Association::setAssociatedEntityID(const EntityID &pX) -{ - _associatedEntityID = pX; +void Association::setAssociatedEntityID(const EntityID& pX) { + _associatedEntityID = pX; } -Vector3Double& Association::getAssociatedLocation() -{ - return _associatedLocation; +Vector3Double& Association::getAssociatedLocation() { + return _associatedLocation; } -const Vector3Double& Association::getAssociatedLocation() const -{ - return _associatedLocation; +const Vector3Double& Association::getAssociatedLocation() const { + return _associatedLocation; } -void Association::setAssociatedLocation(const Vector3Double &pX) -{ - _associatedLocation = pX; +void Association::setAssociatedLocation(const Vector3Double& pX) { + _associatedLocation = pX; } -void Association::marshal(DataStream& dataStream) const -{ - dataStream << _associationType; - dataStream << _padding4; - _associatedEntityID.marshal(dataStream); - _associatedLocation.marshal(dataStream); +void Association::marshal(DataStream& dataStream) const { + dataStream << _associationType; + dataStream << _padding4; + _associatedEntityID.marshal(dataStream); + _associatedLocation.marshal(dataStream); } -void Association::unmarshal(DataStream& dataStream) -{ - dataStream >> _associationType; - dataStream >> _padding4; - _associatedEntityID.unmarshal(dataStream); - _associatedLocation.unmarshal(dataStream); +void Association::unmarshal(DataStream& dataStream) { + dataStream >> _associationType; + dataStream >> _padding4; + _associatedEntityID.unmarshal(dataStream); + _associatedLocation.unmarshal(dataStream); } +bool Association::operator==(const Association& rhs) const { + bool ivarsEqual = true; -bool Association::operator ==(const Association& rhs) const - { - bool ivarsEqual = true; + if (!(_associationType == rhs._associationType)) ivarsEqual = false; + if (!(_padding4 == rhs._padding4)) ivarsEqual = false; + if (!(_associatedEntityID == rhs._associatedEntityID)) ivarsEqual = false; + if (!(_associatedLocation == rhs._associatedLocation)) ivarsEqual = false; - if( ! (_associationType == rhs._associationType) ) ivarsEqual = false; - if( ! (_padding4 == rhs._padding4) ) ivarsEqual = false; - if( ! (_associatedEntityID == rhs._associatedEntityID) ) ivarsEqual = false; - if( ! (_associatedLocation == rhs._associatedLocation) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Association::getMarshalledSize() const -{ - int marshalSize = 0; +int Association::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _associationType - marshalSize = marshalSize + 1; // _padding4 - marshalSize = marshalSize + _associatedEntityID.getMarshalledSize(); // _associatedEntityID - marshalSize = marshalSize + _associatedLocation.getMarshalledSize(); // _associatedLocation - return marshalSize; + marshalSize = marshalSize + 1; // _associationType + marshalSize = marshalSize + 1; // _padding4 + marshalSize = marshalSize + + _associatedEntityID.getMarshalledSize(); // _associatedEntityID + marshalSize = marshalSize + + _associatedLocation.getMarshalledSize(); // _associatedLocation + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -122,7 +98,7 @@ int Association::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Association.h b/src/dis7/Association.h index 3daf988f..e578595b 100644 --- a/src/dis7/Association.h +++ b/src/dis7/Association.h @@ -2,65 +2,67 @@ #include #include -#include #include +#include - -namespace DIS -{ -// An entity's associations with other entities and/or locations. For each association, this record shall specify the type of the association, the associated entity's EntityID and/or the associated location's world coordinates. This record may be used (optionally) in a transfer transaction to send internal state data from the divesting simulation to the acquiring simulation (see 5.9.4). This record may also be used for other purposes. Section 6.2.10 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +namespace DIS { +// An entity's associations with other entities and/or locations. For each +// association, this record shall specify the type of the association, the +// associated entity's EntityID and/or the associated location's world +// coordinates. This record may be used (optionally) in a transfer transaction +// to send internal state data from the divesting simulation to the acquiring +// simulation (see 5.9.4). This record may also be used for other purposes. +// Section 6.2.10 + +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Association -{ -protected: - unsigned char _associationType; +class OPENDIS7_EXPORT Association { + protected: + unsigned char _associationType; - unsigned char _padding4; + unsigned char _padding4; /** identity of associated entity. If none, NO_SPECIFIC_ENTITY */ - EntityID _associatedEntityID; + EntityID _associatedEntityID; /** location, in world coordinates */ - Vector3Double _associatedLocation; - + Vector3Double _associatedLocation; public: - Association(); - virtual ~Association(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + Association(); + virtual ~Association(); - unsigned char getAssociationType() const; - void setAssociationType(unsigned char pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getPadding4() const; - void setPadding4(unsigned char pX); + unsigned char getAssociationType() const; + void setAssociationType(unsigned char pX); - EntityID& getAssociatedEntityID(); - const EntityID& getAssociatedEntityID() const; - void setAssociatedEntityID(const EntityID &pX); + unsigned char getPadding4() const; + void setPadding4(unsigned char pX); - Vector3Double& getAssociatedLocation(); - const Vector3Double& getAssociatedLocation() const; - void setAssociatedLocation(const Vector3Double &pX); + EntityID& getAssociatedEntityID(); + const EntityID& getAssociatedEntityID() const; + void setAssociatedEntityID(const EntityID& pX); + Vector3Double& getAssociatedLocation(); + const Vector3Double& getAssociatedLocation() const; + void setAssociatedLocation(const Vector3Double& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const Association& rhs) const; + bool operator==(const Association& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -73,7 +75,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AttachedParts.cpp b/src/dis7/AttachedParts.cpp index 048ad95a..bac0c7fc 100644 --- a/src/dis7/AttachedParts.cpp +++ b/src/dis7/AttachedParts.cpp @@ -2,119 +2,91 @@ using namespace DIS; +AttachedParts::AttachedParts() + : _recordType(1), + _detachedIndicator(0), + _partAttachedTo(0), + _parameterType(0), + _attachedPartType(0) {} -AttachedParts::AttachedParts(): - _recordType(1), - _detachedIndicator(0), - _partAttachedTo(0), - _parameterType(0), - _attachedPartType(0) -{ -} +AttachedParts::~AttachedParts() {} -AttachedParts::~AttachedParts() -{ -} +unsigned char AttachedParts::getRecordType() const { return _recordType; } -unsigned char AttachedParts::getRecordType() const -{ - return _recordType; -} +void AttachedParts::setRecordType(unsigned char pX) { _recordType = pX; } -void AttachedParts::setRecordType(unsigned char pX) -{ - _recordType = pX; +unsigned char AttachedParts::getDetachedIndicator() const { + return _detachedIndicator; } -unsigned char AttachedParts::getDetachedIndicator() const -{ - return _detachedIndicator; +void AttachedParts::setDetachedIndicator(unsigned char pX) { + _detachedIndicator = pX; } -void AttachedParts::setDetachedIndicator(unsigned char pX) -{ - _detachedIndicator = pX; +unsigned short AttachedParts::getPartAttachedTo() const { + return _partAttachedTo; } -unsigned short AttachedParts::getPartAttachedTo() const -{ - return _partAttachedTo; +void AttachedParts::setPartAttachedTo(unsigned short pX) { + _partAttachedTo = pX; } -void AttachedParts::setPartAttachedTo(unsigned short pX) -{ - _partAttachedTo = pX; -} +unsigned int AttachedParts::getParameterType() const { return _parameterType; } -unsigned int AttachedParts::getParameterType() const -{ - return _parameterType; -} +void AttachedParts::setParameterType(unsigned int pX) { _parameterType = pX; } -void AttachedParts::setParameterType(unsigned int pX) -{ - _parameterType = pX; +unsigned long long AttachedParts::getAttachedPartType() const { + return _attachedPartType; } -unsigned long long AttachedParts::getAttachedPartType() const -{ - return _attachedPartType; +void AttachedParts::setAttachedPartType(unsigned long long pX) { + _attachedPartType = pX; } -void AttachedParts::setAttachedPartType(unsigned long long pX) -{ - _attachedPartType = pX; +void AttachedParts::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _detachedIndicator; + dataStream << _partAttachedTo; + dataStream << _parameterType; + dataStream << _attachedPartType; } -void AttachedParts::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _detachedIndicator; - dataStream << _partAttachedTo; - dataStream << _parameterType; - dataStream << _attachedPartType; -} - -void AttachedParts::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _detachedIndicator; - dataStream >> _partAttachedTo; - dataStream >> _parameterType; - dataStream >> _attachedPartType; +void AttachedParts::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _detachedIndicator; + dataStream >> _partAttachedTo; + dataStream >> _parameterType; + dataStream >> _attachedPartType; } +bool AttachedParts::operator==(const AttachedParts& rhs) const { + bool ivarsEqual = true; -bool AttachedParts::operator ==(const AttachedParts& rhs) const - { - bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_detachedIndicator == rhs._detachedIndicator)) ivarsEqual = false; + if (!(_partAttachedTo == rhs._partAttachedTo)) ivarsEqual = false; + if (!(_parameterType == rhs._parameterType)) ivarsEqual = false; + if (!(_attachedPartType == rhs._attachedPartType)) ivarsEqual = false; - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_detachedIndicator == rhs._detachedIndicator) ) ivarsEqual = false; - if( ! (_partAttachedTo == rhs._partAttachedTo) ) ivarsEqual = false; - if( ! (_parameterType == rhs._parameterType) ) ivarsEqual = false; - if( ! (_attachedPartType == rhs._attachedPartType) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int AttachedParts::getMarshalledSize() const -{ - int marshalSize = 0; +int AttachedParts::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _recordType - marshalSize = marshalSize + 1; // _detachedIndicator - marshalSize = marshalSize + 2; // _partAttachedTo - marshalSize = marshalSize + 4; // _parameterType - marshalSize = marshalSize + 8; // _attachedPartType - return marshalSize; + marshalSize = marshalSize + 1; // _recordType + marshalSize = marshalSize + 1; // _detachedIndicator + marshalSize = marshalSize + 2; // _partAttachedTo + marshalSize = marshalSize + 4; // _parameterType + marshalSize = marshalSize + 8; // _attachedPartType + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +99,7 @@ int AttachedParts::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AttachedParts.h b/src/dis7/AttachedParts.h index b80f7547..35e7001f 100644 --- a/src/dis7/AttachedParts.h +++ b/src/dis7/AttachedParts.h @@ -1,70 +1,71 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Removable parts that may be attached to an entity. Section 6.2.94.3 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AttachedParts -{ -protected: - /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; +class OPENDIS7_EXPORT AttachedParts { + protected: + /** the identification of the Variable Parameter record. Enumeration from EBV + */ + unsigned char _recordType; /** 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram */ - unsigned char _detachedIndicator; + unsigned char _detachedIndicator; - /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */ - unsigned short _partAttachedTo; + /** the identification of the articulated part to which this articulation + * parameter is attached. This field shall be specified by a 16-bit unsigned + * integer. This field shall contain the value zero if the articulated part is + * attached directly to the entity. */ + unsigned short _partAttachedTo; /** The location or station to which the part is attached */ - unsigned int _parameterType; + unsigned int _parameterType; - /** The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field */ + /** The definition of the 64 bits shall be determined based on the type of + * parameter specified in the Parameter Type field */ unsigned long long _attachedPartType; - public: - AttachedParts(); - virtual ~AttachedParts(); + AttachedParts(); + virtual ~AttachedParts(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + unsigned char getRecordType() const; + void setRecordType(unsigned char pX); - unsigned char getDetachedIndicator() const; - void setDetachedIndicator(unsigned char pX); + unsigned char getDetachedIndicator() const; + void setDetachedIndicator(unsigned char pX); - unsigned short getPartAttachedTo() const; - void setPartAttachedTo(unsigned short pX); + unsigned short getPartAttachedTo() const; + void setPartAttachedTo(unsigned short pX); - unsigned int getParameterType() const; - void setParameterType(unsigned int pX); + unsigned int getParameterType() const; + void setParameterType(unsigned int pX); - unsigned long long getAttachedPartType() const; - void setAttachedPartType(unsigned long long pX); + unsigned long long getAttachedPartType() const; + void setAttachedPartType(unsigned long long pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const AttachedParts& rhs) const; + bool operator==(const AttachedParts& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +78,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Attribute.cpp b/src/dis7/Attribute.cpp index fa7bf7c4..379be89e 100644 --- a/src/dis7/Attribute.cpp +++ b/src/dis7/Attribute.cpp @@ -2,89 +2,63 @@ using namespace DIS; +Attribute::Attribute() + : _recordType(0), _recordLength(0), _recordSpecificFields(0) {} -Attribute::Attribute(): - _recordType(0), - _recordLength(0), - _recordSpecificFields(0) -{ -} +Attribute::~Attribute() {} -Attribute::~Attribute() -{ -} +unsigned int Attribute::getRecordType() const { return _recordType; } -unsigned int Attribute::getRecordType() const -{ - return _recordType; -} +void Attribute::setRecordType(unsigned int pX) { _recordType = pX; } -void Attribute::setRecordType(unsigned int pX) -{ - _recordType = pX; -} +unsigned short Attribute::getRecordLength() const { return _recordLength; } -unsigned short Attribute::getRecordLength() const -{ - return _recordLength; -} +void Attribute::setRecordLength(unsigned short pX) { _recordLength = pX; } -void Attribute::setRecordLength(unsigned short pX) -{ - _recordLength = pX; +long long Attribute::getRecordSpecificFields() const { + return _recordSpecificFields; } -long long Attribute::getRecordSpecificFields() const -{ - return _recordSpecificFields; +void Attribute::setRecordSpecificFields(long long pX) { + _recordSpecificFields = pX; } -void Attribute::setRecordSpecificFields(long long pX) -{ - _recordSpecificFields = pX; +void Attribute::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _recordSpecificFields; } -void Attribute::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _recordSpecificFields; -} - -void Attribute::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _recordSpecificFields; +void Attribute::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _recordSpecificFields; } +bool Attribute::operator==(const Attribute& rhs) const { + bool ivarsEqual = true; -bool Attribute::operator ==(const Attribute& rhs) const - { - bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_recordSpecificFields == rhs._recordSpecificFields)) ivarsEqual = false; - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_recordSpecificFields == rhs._recordSpecificFields) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Attribute::getMarshalledSize() const -{ - int marshalSize = 0; +int Attribute::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 1; // _recordLength - marshalSize = marshalSize + 8; // _recordSpecificFields - return marshalSize; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 1; // _recordLength + marshalSize = marshalSize + 8; // _recordSpecificFields + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +71,7 @@ int Attribute::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Attribute.h b/src/dis7/Attribute.h index 22bea221..e44fdf0d 100644 --- a/src/dis7/Attribute.h +++ b/src/dis7/Attribute.h @@ -1,55 +1,52 @@ #pragma once -#include #include +#include +namespace DIS { +// Used to convey information for one or more attributes. Attributes conform to +// the standard variable record format of 6.2.82. Section 6.2.10 -namespace DIS -{ -// Used to convey information for one or more attributes. Attributes conform to the standard variable record format of 6.2.82. Section 6.2.10 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Attribute -{ -protected: - unsigned int _recordType; +class OPENDIS7_EXPORT Attribute { + protected: + unsigned int _recordType; unsigned short _recordLength; long long _recordSpecificFields; - public: - Attribute(); - virtual ~Attribute(); + Attribute(); + virtual ~Attribute(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - long long getRecordSpecificFields() const; - void setRecordSpecificFields(long long pX); + long long getRecordSpecificFields() const; + void setRecordSpecificFields(long long pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Attribute& rhs) const; + bool operator==(const Attribute& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -62,7 +59,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AttributePdu.cpp b/src/dis7/AttributePdu.cpp index 8d97bd2c..5e695ff1 100644 --- a/src/dis7/AttributePdu.cpp +++ b/src/dis7/AttributePdu.cpp @@ -2,189 +2,155 @@ using namespace DIS; +AttributePdu::AttributePdu() + : EntityInformationFamilyPdu(), + _originatingSimulationAddress(), + _padding1(0), + _padding2(0), + _attributeRecordPduType(0), + _attributeRecordProtocolVersion(0), + _masterAttributeRecordType(0), + _actionCode(0), + _padding3(0), + _numberAttributeRecordSet(0) {} -AttributePdu::AttributePdu() : EntityInformationFamilyPdu(), - _originatingSimulationAddress(), - _padding1(0), - _padding2(0), - _attributeRecordPduType(0), - _attributeRecordProtocolVersion(0), - _masterAttributeRecordType(0), - _actionCode(0), - _padding3(0), - _numberAttributeRecordSet(0) -{ -} +AttributePdu::~AttributePdu() {} -AttributePdu::~AttributePdu() -{ +SimulationAddress& AttributePdu::getOriginatingSimulationAddress() { + return _originatingSimulationAddress; } -SimulationAddress& AttributePdu::getOriginatingSimulationAddress() -{ - return _originatingSimulationAddress; +const SimulationAddress& AttributePdu::getOriginatingSimulationAddress() const { + return _originatingSimulationAddress; } -const SimulationAddress& AttributePdu::getOriginatingSimulationAddress() const -{ - return _originatingSimulationAddress; +void AttributePdu::setOriginatingSimulationAddress( + const SimulationAddress& pX) { + _originatingSimulationAddress = pX; } -void AttributePdu::setOriginatingSimulationAddress(const SimulationAddress &pX) -{ - _originatingSimulationAddress = pX; -} +int AttributePdu::getPadding1() const { return _padding1; } -int AttributePdu::getPadding1() const -{ - return _padding1; -} +void AttributePdu::setPadding1(int pX) { _padding1 = pX; } -void AttributePdu::setPadding1(int pX) -{ - _padding1 = pX; -} +short AttributePdu::getPadding2() const { return _padding2; } -short AttributePdu::getPadding2() const -{ - return _padding2; -} +void AttributePdu::setPadding2(short pX) { _padding2 = pX; } -void AttributePdu::setPadding2(short pX) -{ - _padding2 = pX; +unsigned char AttributePdu::getAttributeRecordPduType() const { + return _attributeRecordPduType; } -unsigned char AttributePdu::getAttributeRecordPduType() const -{ - return _attributeRecordPduType; +void AttributePdu::setAttributeRecordPduType(unsigned char pX) { + _attributeRecordPduType = pX; } -void AttributePdu::setAttributeRecordPduType(unsigned char pX) -{ - _attributeRecordPduType = pX; +unsigned char AttributePdu::getAttributeRecordProtocolVersion() const { + return _attributeRecordProtocolVersion; } -unsigned char AttributePdu::getAttributeRecordProtocolVersion() const -{ - return _attributeRecordProtocolVersion; +void AttributePdu::setAttributeRecordProtocolVersion(unsigned char pX) { + _attributeRecordProtocolVersion = pX; } -void AttributePdu::setAttributeRecordProtocolVersion(unsigned char pX) -{ - _attributeRecordProtocolVersion = pX; +unsigned int AttributePdu::getMasterAttributeRecordType() const { + return _masterAttributeRecordType; } -unsigned int AttributePdu::getMasterAttributeRecordType() const -{ - return _masterAttributeRecordType; +void AttributePdu::setMasterAttributeRecordType(unsigned int pX) { + _masterAttributeRecordType = pX; } -void AttributePdu::setMasterAttributeRecordType(unsigned int pX) -{ - _masterAttributeRecordType = pX; -} +unsigned char AttributePdu::getActionCode() const { return _actionCode; } -unsigned char AttributePdu::getActionCode() const -{ - return _actionCode; -} +void AttributePdu::setActionCode(unsigned char pX) { _actionCode = pX; } -void AttributePdu::setActionCode(unsigned char pX) -{ - _actionCode = pX; -} +char AttributePdu::getPadding3() const { return _padding3; } -char AttributePdu::getPadding3() const -{ - return _padding3; -} +void AttributePdu::setPadding3(char pX) { _padding3 = pX; } -void AttributePdu::setPadding3(char pX) -{ - _padding3 = pX; +unsigned short AttributePdu::getNumberAttributeRecordSet() const { + return _numberAttributeRecordSet; } -unsigned short AttributePdu::getNumberAttributeRecordSet() const -{ - return _numberAttributeRecordSet; +void AttributePdu::setNumberAttributeRecordSet(unsigned short pX) { + _numberAttributeRecordSet = pX; } -void AttributePdu::setNumberAttributeRecordSet(unsigned short pX) -{ - _numberAttributeRecordSet = pX; +void AttributePdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingSimulationAddress.marshal(dataStream); + dataStream << _padding1; + dataStream << _padding2; + dataStream << _attributeRecordPduType; + dataStream << _attributeRecordProtocolVersion; + dataStream << _masterAttributeRecordType; + dataStream << _actionCode; + dataStream << _padding3; + dataStream << _numberAttributeRecordSet; } -void AttributePdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingSimulationAddress.marshal(dataStream); - dataStream << _padding1; - dataStream << _padding2; - dataStream << _attributeRecordPduType; - dataStream << _attributeRecordProtocolVersion; - dataStream << _masterAttributeRecordType; - dataStream << _actionCode; - dataStream << _padding3; - dataStream << _numberAttributeRecordSet; +void AttributePdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingSimulationAddress.unmarshal(dataStream); + dataStream >> _padding1; + dataStream >> _padding2; + dataStream >> _attributeRecordPduType; + dataStream >> _attributeRecordProtocolVersion; + dataStream >> _masterAttributeRecordType; + dataStream >> _actionCode; + dataStream >> _padding3; + dataStream >> _numberAttributeRecordSet; } -void AttributePdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingSimulationAddress.unmarshal(dataStream); - dataStream >> _padding1; - dataStream >> _padding2; - dataStream >> _attributeRecordPduType; - dataStream >> _attributeRecordProtocolVersion; - dataStream >> _masterAttributeRecordType; - dataStream >> _actionCode; - dataStream >> _padding3; - dataStream >> _numberAttributeRecordSet; +bool AttributePdu::operator==(const AttributePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + + if (!(_originatingSimulationAddress == rhs._originatingSimulationAddress)) + ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_attributeRecordPduType == rhs._attributeRecordPduType)) + ivarsEqual = false; + if (!(_attributeRecordProtocolVersion == rhs._attributeRecordProtocolVersion)) + ivarsEqual = false; + if (!(_masterAttributeRecordType == rhs._masterAttributeRecordType)) + ivarsEqual = false; + if (!(_actionCode == rhs._actionCode)) ivarsEqual = false; + if (!(_padding3 == rhs._padding3)) ivarsEqual = false; + if (!(_numberAttributeRecordSet == rhs._numberAttributeRecordSet)) + ivarsEqual = false; + + return ivarsEqual; } +int AttributePdu::getMarshalledSize() const { + int marshalSize = 0; -bool AttributePdu::operator ==(const AttributePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_originatingSimulationAddress == rhs._originatingSimulationAddress) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_attributeRecordPduType == rhs._attributeRecordPduType) ) ivarsEqual = false; - if( ! (_attributeRecordProtocolVersion == rhs._attributeRecordProtocolVersion) ) ivarsEqual = false; - if( ! (_masterAttributeRecordType == rhs._masterAttributeRecordType) ) ivarsEqual = false; - if( ! (_actionCode == rhs._actionCode) ) ivarsEqual = false; - if( ! (_padding3 == rhs._padding3) ) ivarsEqual = false; - if( ! (_numberAttributeRecordSet == rhs._numberAttributeRecordSet) ) ivarsEqual = false; - - return ivarsEqual; - } - -int AttributePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingSimulationAddress.getMarshalledSize(); // _originatingSimulationAddress - marshalSize = marshalSize + 4; // _padding1 - marshalSize = marshalSize + 2; // _padding2 - marshalSize = marshalSize + 1; // _attributeRecordPduType - marshalSize = marshalSize + 1; // _attributeRecordProtocolVersion - marshalSize = marshalSize + 4; // _masterAttributeRecordType - marshalSize = marshalSize + 1; // _actionCode - marshalSize = marshalSize + 1; // _padding3 - marshalSize = marshalSize + 2; // _numberAttributeRecordSet - return marshalSize; + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingSimulationAddress + .getMarshalledSize(); // _originatingSimulationAddress + marshalSize = marshalSize + 4; // _padding1 + marshalSize = marshalSize + 2; // _padding2 + marshalSize = marshalSize + 1; // _attributeRecordPduType + marshalSize = marshalSize + 1; // _attributeRecordProtocolVersion + marshalSize = marshalSize + 4; // _masterAttributeRecordType + marshalSize = marshalSize + 1; // _actionCode + marshalSize = marshalSize + 1; // _padding3 + marshalSize = marshalSize + 2; // _numberAttributeRecordSet + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -197,7 +163,7 @@ int AttributePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/AttributePdu.h b/src/dis7/AttributePdu.h index ff194bbf..ffcca9be 100644 --- a/src/dis7/AttributePdu.h +++ b/src/dis7/AttributePdu.h @@ -1,97 +1,108 @@ #pragma once -#include #include -#include +#include #include +#include +namespace DIS { +// Information about individual attributes for a particular entity, other +// object, or event may be communicated using an Attribute PDU. The Attribute +// PDU shall not be used to exchange data available in any other PDU except +// where explicitly mentioned in the PDU issuance instructions within this +// standard. See 5.3.6 for the information requirements and issuance and receipt +// rules for this PDU. Section 7.2.6. INCOMPLETE -namespace DIS -{ -// Information about individual attributes for a particular entity, other object, or event may be communicated using an Attribute PDU. The Attribute PDU shall not be used to exchange data available in any other PDU except where explicitly mentioned in the PDU issuance instructions within this standard. See 5.3.6 for the information requirements and issuance and receipt rules for this PDU. Section 7.2.6. INCOMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT AttributePdu : public EntityInformationFamilyPdu -{ -protected: - /** This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79). */ - SimulationAddress _originatingSimulationAddress; +class OPENDIS7_EXPORT AttributePdu : public EntityInformationFamilyPdu { + protected: + /** This field shall identify the simulation issuing the Attribute PDU. It + * shall be represented by a Simulation Address record (see 6.2.79). */ + SimulationAddress _originatingSimulationAddress; /** Padding */ - int _padding1; + int _padding1; /** Padding */ - short _padding2; + short _padding2; - /** This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration. */ - unsigned char _attributeRecordPduType; + /** This field shall represent the type of the PDU that is being extended or + * updated, if applicable. It shall be represented by an 8-bit enumeration. */ + unsigned char _attributeRecordPduType; - /** This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration. */ - unsigned char _attributeRecordProtocolVersion; + /** This field shall indicate the Protocol Version associated with the + * Attribute Record PDU Type. It shall be represented by an 8-bit enumeration. + */ + unsigned char _attributeRecordProtocolVersion; - /** This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration. */ - unsigned int _masterAttributeRecordType; + /** This field shall contain the Attribute record type of the Attribute + * records in the PDU if they all have the same Attribute record type. It + * shall be represented by a 32-bit enumeration. */ + unsigned int _masterAttributeRecordType; - /** This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration. */ - unsigned char _actionCode; + /** This field shall identify the action code applicable to this Attribute + * PDU. The Action Code shall apply to all Attribute records contained in the + * PDU. It shall be represented by an 8-bit enumeration. */ + unsigned char _actionCode; /** Padding */ - char _padding3; - - /** This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer. */ - unsigned short _numberAttributeRecordSet; + char _padding3; + /** This field shall specify the number of Attribute Record Sets that make up + * the remainder of the PDU. It shall be represented by a 16-bit unsigned + * integer. */ + unsigned short _numberAttributeRecordSet; public: - AttributePdu(); - virtual ~AttributePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + AttributePdu(); + virtual ~AttributePdu(); - SimulationAddress& getOriginatingSimulationAddress(); - const SimulationAddress& getOriginatingSimulationAddress() const; - void setOriginatingSimulationAddress(const SimulationAddress &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - int getPadding1() const; - void setPadding1(int pX); + SimulationAddress& getOriginatingSimulationAddress(); + const SimulationAddress& getOriginatingSimulationAddress() const; + void setOriginatingSimulationAddress(const SimulationAddress& pX); - short getPadding2() const; - void setPadding2(short pX); + int getPadding1() const; + void setPadding1(int pX); - unsigned char getAttributeRecordPduType() const; - void setAttributeRecordPduType(unsigned char pX); + short getPadding2() const; + void setPadding2(short pX); - unsigned char getAttributeRecordProtocolVersion() const; - void setAttributeRecordProtocolVersion(unsigned char pX); + unsigned char getAttributeRecordPduType() const; + void setAttributeRecordPduType(unsigned char pX); - unsigned int getMasterAttributeRecordType() const; - void setMasterAttributeRecordType(unsigned int pX); + unsigned char getAttributeRecordProtocolVersion() const; + void setAttributeRecordProtocolVersion(unsigned char pX); - unsigned char getActionCode() const; - void setActionCode(unsigned char pX); + unsigned int getMasterAttributeRecordType() const; + void setMasterAttributeRecordType(unsigned int pX); - char getPadding3() const; - void setPadding3(char pX); + unsigned char getActionCode() const; + void setActionCode(unsigned char pX); - unsigned short getNumberAttributeRecordSet() const; - void setNumberAttributeRecordSet(unsigned short pX); + char getPadding3() const; + void setPadding3(char pX); + unsigned short getNumberAttributeRecordSet() const; + void setNumberAttributeRecordSet(unsigned short pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const AttributePdu& rhs) const; + bool operator==(const AttributePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -104,7 +115,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BeamAntennaPattern.cpp b/src/dis7/BeamAntennaPattern.cpp index a37cc85a..984bd150 100644 --- a/src/dis7/BeamAntennaPattern.cpp +++ b/src/dis7/BeamAntennaPattern.cpp @@ -2,199 +2,141 @@ using namespace DIS; +BeamAntennaPattern::BeamAntennaPattern() + : _beamDirection(), + _azimuthBeamwidth(0), + _elevationBeamwidth(0), + _referenceSystem(0), + _padding1(0), + _padding2(0), + _ez(0.0), + _ex(0.0), + _phase(0.0), + _padding3(0) {} -BeamAntennaPattern::BeamAntennaPattern(): - _beamDirection(), - _azimuthBeamwidth(0), - _elevationBeamwidth(0), - _referenceSystem(0), - _padding1(0), - _padding2(0), - _ez(0.0), - _ex(0.0), - _phase(0.0), - _padding3(0) -{ -} +BeamAntennaPattern::~BeamAntennaPattern() {} -BeamAntennaPattern::~BeamAntennaPattern() -{ -} +EulerAngles& BeamAntennaPattern::getBeamDirection() { return _beamDirection; } -EulerAngles& BeamAntennaPattern::getBeamDirection() -{ - return _beamDirection; +const EulerAngles& BeamAntennaPattern::getBeamDirection() const { + return _beamDirection; } -const EulerAngles& BeamAntennaPattern::getBeamDirection() const -{ - return _beamDirection; +void BeamAntennaPattern::setBeamDirection(const EulerAngles& pX) { + _beamDirection = pX; } -void BeamAntennaPattern::setBeamDirection(const EulerAngles &pX) -{ - _beamDirection = pX; +float BeamAntennaPattern::getAzimuthBeamwidth() const { + return _azimuthBeamwidth; } -float BeamAntennaPattern::getAzimuthBeamwidth() const -{ - return _azimuthBeamwidth; +void BeamAntennaPattern::setAzimuthBeamwidth(float pX) { + _azimuthBeamwidth = pX; } -void BeamAntennaPattern::setAzimuthBeamwidth(float pX) -{ - _azimuthBeamwidth = pX; +float BeamAntennaPattern::getElevationBeamwidth() const { + return _elevationBeamwidth; } -float BeamAntennaPattern::getElevationBeamwidth() const -{ - return _elevationBeamwidth; +void BeamAntennaPattern::setElevationBeamwidth(float pX) { + _elevationBeamwidth = pX; } -void BeamAntennaPattern::setElevationBeamwidth(float pX) -{ - _elevationBeamwidth = pX; +float BeamAntennaPattern::getReferenceSystem() const { + return _referenceSystem; } -float BeamAntennaPattern::getReferenceSystem() const -{ - return _referenceSystem; -} +void BeamAntennaPattern::setReferenceSystem(float pX) { _referenceSystem = pX; } -void BeamAntennaPattern::setReferenceSystem(float pX) -{ - _referenceSystem = pX; -} +unsigned char BeamAntennaPattern::getPadding1() const { return _padding1; } -unsigned char BeamAntennaPattern::getPadding1() const -{ - return _padding1; -} +void BeamAntennaPattern::setPadding1(unsigned char pX) { _padding1 = pX; } -void BeamAntennaPattern::setPadding1(unsigned char pX) -{ - _padding1 = pX; -} +unsigned short BeamAntennaPattern::getPadding2() const { return _padding2; } -unsigned short BeamAntennaPattern::getPadding2() const -{ - return _padding2; -} +void BeamAntennaPattern::setPadding2(unsigned short pX) { _padding2 = pX; } -void BeamAntennaPattern::setPadding2(unsigned short pX) -{ - _padding2 = pX; -} +float BeamAntennaPattern::getEz() const { return _ez; } -float BeamAntennaPattern::getEz() const -{ - return _ez; -} +void BeamAntennaPattern::setEz(float pX) { _ez = pX; } -void BeamAntennaPattern::setEz(float pX) -{ - _ez = pX; -} +float BeamAntennaPattern::getEx() const { return _ex; } -float BeamAntennaPattern::getEx() const -{ - return _ex; -} +void BeamAntennaPattern::setEx(float pX) { _ex = pX; } -void BeamAntennaPattern::setEx(float pX) -{ - _ex = pX; -} +float BeamAntennaPattern::getPhase() const { return _phase; } -float BeamAntennaPattern::getPhase() const -{ - return _phase; -} +void BeamAntennaPattern::setPhase(float pX) { _phase = pX; } -void BeamAntennaPattern::setPhase(float pX) -{ - _phase = pX; -} +unsigned int BeamAntennaPattern::getPadding3() const { return _padding3; } -unsigned int BeamAntennaPattern::getPadding3() const -{ - return _padding3; -} +void BeamAntennaPattern::setPadding3(unsigned int pX) { _padding3 = pX; } -void BeamAntennaPattern::setPadding3(unsigned int pX) -{ - _padding3 = pX; +void BeamAntennaPattern::marshal(DataStream& dataStream) const { + _beamDirection.marshal(dataStream); + dataStream << _azimuthBeamwidth; + dataStream << _elevationBeamwidth; + dataStream << _referenceSystem; + dataStream << _padding1; + dataStream << _padding2; + dataStream << _ez; + dataStream << _ex; + dataStream << _phase; + dataStream << _padding3; } -void BeamAntennaPattern::marshal(DataStream& dataStream) const -{ - _beamDirection.marshal(dataStream); - dataStream << _azimuthBeamwidth; - dataStream << _elevationBeamwidth; - dataStream << _referenceSystem; - dataStream << _padding1; - dataStream << _padding2; - dataStream << _ez; - dataStream << _ex; - dataStream << _phase; - dataStream << _padding3; +void BeamAntennaPattern::unmarshal(DataStream& dataStream) { + _beamDirection.unmarshal(dataStream); + dataStream >> _azimuthBeamwidth; + dataStream >> _elevationBeamwidth; + dataStream >> _referenceSystem; + dataStream >> _padding1; + dataStream >> _padding2; + dataStream >> _ez; + dataStream >> _ex; + dataStream >> _phase; + dataStream >> _padding3; } -void BeamAntennaPattern::unmarshal(DataStream& dataStream) -{ - _beamDirection.unmarshal(dataStream); - dataStream >> _azimuthBeamwidth; - dataStream >> _elevationBeamwidth; - dataStream >> _referenceSystem; - dataStream >> _padding1; - dataStream >> _padding2; - dataStream >> _ez; - dataStream >> _ex; - dataStream >> _phase; - dataStream >> _padding3; +bool BeamAntennaPattern::operator==(const BeamAntennaPattern& rhs) const { + bool ivarsEqual = true; + + if (!(_beamDirection == rhs._beamDirection)) ivarsEqual = false; + if (!(_azimuthBeamwidth == rhs._azimuthBeamwidth)) ivarsEqual = false; + if (!(_elevationBeamwidth == rhs._elevationBeamwidth)) ivarsEqual = false; + if (!(_referenceSystem == rhs._referenceSystem)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_ez == rhs._ez)) ivarsEqual = false; + if (!(_ex == rhs._ex)) ivarsEqual = false; + if (!(_phase == rhs._phase)) ivarsEqual = false; + if (!(_padding3 == rhs._padding3)) ivarsEqual = false; + + return ivarsEqual; } +int BeamAntennaPattern::getMarshalledSize() const { + int marshalSize = 0; -bool BeamAntennaPattern::operator ==(const BeamAntennaPattern& rhs) const - { - bool ivarsEqual = true; - - if( ! (_beamDirection == rhs._beamDirection) ) ivarsEqual = false; - if( ! (_azimuthBeamwidth == rhs._azimuthBeamwidth) ) ivarsEqual = false; - if( ! (_elevationBeamwidth == rhs._elevationBeamwidth) ) ivarsEqual = false; - if( ! (_referenceSystem == rhs._referenceSystem) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_ez == rhs._ez) ) ivarsEqual = false; - if( ! (_ex == rhs._ex) ) ivarsEqual = false; - if( ! (_phase == rhs._phase) ) ivarsEqual = false; - if( ! (_padding3 == rhs._padding3) ) ivarsEqual = false; - - return ivarsEqual; - } - -int BeamAntennaPattern::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + _beamDirection.getMarshalledSize(); // _beamDirection - marshalSize = marshalSize + 4; // _azimuthBeamwidth - marshalSize = marshalSize + 4; // _elevationBeamwidth - marshalSize = marshalSize + 4; // _referenceSystem - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 2; // _padding2 - marshalSize = marshalSize + 4; // _ez - marshalSize = marshalSize + 4; // _ex - marshalSize = marshalSize + 4; // _phase - marshalSize = marshalSize + 4; // _padding3 - return marshalSize; + marshalSize = + marshalSize + _beamDirection.getMarshalledSize(); // _beamDirection + marshalSize = marshalSize + 4; // _azimuthBeamwidth + marshalSize = marshalSize + 4; // _elevationBeamwidth + marshalSize = marshalSize + 4; // _referenceSystem + marshalSize = marshalSize + 1; // _padding1 + marshalSize = marshalSize + 2; // _padding2 + marshalSize = marshalSize + 4; // _ez + marshalSize = marshalSize + 4; // _ex + marshalSize = marshalSize + 4; // _phase + marshalSize = marshalSize + 4; // _padding3 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -207,7 +149,7 @@ int BeamAntennaPattern::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BeamAntennaPattern.h b/src/dis7/BeamAntennaPattern.h index 3137ab96..c83a0cef 100644 --- a/src/dis7/BeamAntennaPattern.h +++ b/src/dis7/BeamAntennaPattern.h @@ -1,97 +1,106 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Used when the antenna pattern type field has a value of 1. Specifies the +// direction, pattern, and polarization of radiation from an antenna. +// Section 6.2.9.2 -namespace DIS -{ -// Used when the antenna pattern type field has a value of 1. Specifies the direction, pattern, and polarization of radiation from an antenna. Section 6.2.9.2 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT BeamAntennaPattern -{ -protected: - /** The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record. */ - EulerAngles _beamDirection; +class OPENDIS7_EXPORT BeamAntennaPattern { + protected: + /** The rotation that transforms the reference coordinate sytem into the beam + * coordinate system. Either world coordinates or entity coordinates may be + * used as the reference coordinate system, as specified by the reference + * system field of the antenna pattern record. */ + EulerAngles _beamDirection; - float _azimuthBeamwidth; + float _azimuthBeamwidth; - float _elevationBeamwidth; + float _elevationBeamwidth; - float _referenceSystem; + float _referenceSystem; - unsigned char _padding1; + unsigned char _padding1; - unsigned short _padding2; + unsigned short _padding2; - /** This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna. */ - float _ez; + /** This field shall specify the magnitude of the Z-component (in beam + * coordinates) of the Electrical field at some arbitrary single point in the + * main beam and in the far field of the antenna. */ + float _ez; - /** This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna. */ - float _ex; + /** This field shall specify the magnitude of the X-component (in beam + * coordinates) of the Electri- cal field at some arbitrary single point in + * the main beam and in the far field of the antenna. */ + float _ex; - /** This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI */ - float _phase; + /** This field shall specify the phase angle between EZ and EX in radians. If + * fully omni-direc- tional antenna is modeled using beam pattern type one, + * the omni-directional antenna shall be repre- sented by beam direction Euler + * angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an + * elevation beamwidth of PI */ + float _phase; /** padding */ - unsigned int _padding3; - + unsigned int _padding3; public: - BeamAntennaPattern(); - virtual ~BeamAntennaPattern(); + BeamAntennaPattern(); + virtual ~BeamAntennaPattern(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EulerAngles& getBeamDirection(); - const EulerAngles& getBeamDirection() const; - void setBeamDirection(const EulerAngles &pX); + EulerAngles& getBeamDirection(); + const EulerAngles& getBeamDirection() const; + void setBeamDirection(const EulerAngles& pX); - float getAzimuthBeamwidth() const; - void setAzimuthBeamwidth(float pX); + float getAzimuthBeamwidth() const; + void setAzimuthBeamwidth(float pX); - float getElevationBeamwidth() const; - void setElevationBeamwidth(float pX); + float getElevationBeamwidth() const; + void setElevationBeamwidth(float pX); - float getReferenceSystem() const; - void setReferenceSystem(float pX); + float getReferenceSystem() const; + void setReferenceSystem(float pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + unsigned char getPadding1() const; + void setPadding1(unsigned char pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + unsigned short getPadding2() const; + void setPadding2(unsigned short pX); - float getEz() const; - void setEz(float pX); + float getEz() const; + void setEz(float pX); - float getEx() const; - void setEx(float pX); + float getEx() const; + void setEx(float pX); - float getPhase() const; - void setPhase(float pX); + float getPhase() const; + void setPhase(float pX); - unsigned int getPadding3() const; - void setPadding3(unsigned int pX); + unsigned int getPadding3() const; + void setPadding3(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const BeamAntennaPattern& rhs) const; + bool operator==(const BeamAntennaPattern& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -104,7 +113,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BeamData.cpp b/src/dis7/BeamData.cpp index 8c86b4bc..4098170a 100644 --- a/src/dis7/BeamData.cpp +++ b/src/dis7/BeamData.cpp @@ -2,119 +2,79 @@ using namespace DIS; +BeamData::BeamData() + : _beamAzimuthCenter(0.0), + _beamAzimuthSweep(0.0), + _beamElevationCenter(0.0), + _beamElevationSweep(0.0), + _beamSweepSync(0.0) {} -BeamData::BeamData(): - _beamAzimuthCenter(0.0), - _beamAzimuthSweep(0.0), - _beamElevationCenter(0.0), - _beamElevationSweep(0.0), - _beamSweepSync(0.0) -{ -} +BeamData::~BeamData() {} -BeamData::~BeamData() -{ -} +float BeamData::getBeamAzimuthCenter() const { return _beamAzimuthCenter; } -float BeamData::getBeamAzimuthCenter() const -{ - return _beamAzimuthCenter; -} +void BeamData::setBeamAzimuthCenter(float pX) { _beamAzimuthCenter = pX; } -void BeamData::setBeamAzimuthCenter(float pX) -{ - _beamAzimuthCenter = pX; -} +float BeamData::getBeamAzimuthSweep() const { return _beamAzimuthSweep; } -float BeamData::getBeamAzimuthSweep() const -{ - return _beamAzimuthSweep; -} +void BeamData::setBeamAzimuthSweep(float pX) { _beamAzimuthSweep = pX; } -void BeamData::setBeamAzimuthSweep(float pX) -{ - _beamAzimuthSweep = pX; -} +float BeamData::getBeamElevationCenter() const { return _beamElevationCenter; } -float BeamData::getBeamElevationCenter() const -{ - return _beamElevationCenter; -} +void BeamData::setBeamElevationCenter(float pX) { _beamElevationCenter = pX; } -void BeamData::setBeamElevationCenter(float pX) -{ - _beamElevationCenter = pX; -} +float BeamData::getBeamElevationSweep() const { return _beamElevationSweep; } -float BeamData::getBeamElevationSweep() const -{ - return _beamElevationSweep; -} +void BeamData::setBeamElevationSweep(float pX) { _beamElevationSweep = pX; } -void BeamData::setBeamElevationSweep(float pX) -{ - _beamElevationSweep = pX; -} +float BeamData::getBeamSweepSync() const { return _beamSweepSync; } -float BeamData::getBeamSweepSync() const -{ - return _beamSweepSync; -} +void BeamData::setBeamSweepSync(float pX) { _beamSweepSync = pX; } -void BeamData::setBeamSweepSync(float pX) -{ - _beamSweepSync = pX; +void BeamData::marshal(DataStream& dataStream) const { + dataStream << _beamAzimuthCenter; + dataStream << _beamAzimuthSweep; + dataStream << _beamElevationCenter; + dataStream << _beamElevationSweep; + dataStream << _beamSweepSync; } -void BeamData::marshal(DataStream& dataStream) const -{ - dataStream << _beamAzimuthCenter; - dataStream << _beamAzimuthSweep; - dataStream << _beamElevationCenter; - dataStream << _beamElevationSweep; - dataStream << _beamSweepSync; +void BeamData::unmarshal(DataStream& dataStream) { + dataStream >> _beamAzimuthCenter; + dataStream >> _beamAzimuthSweep; + dataStream >> _beamElevationCenter; + dataStream >> _beamElevationSweep; + dataStream >> _beamSweepSync; } -void BeamData::unmarshal(DataStream& dataStream) -{ - dataStream >> _beamAzimuthCenter; - dataStream >> _beamAzimuthSweep; - dataStream >> _beamElevationCenter; - dataStream >> _beamElevationSweep; - dataStream >> _beamSweepSync; -} +bool BeamData::operator==(const BeamData& rhs) const { + bool ivarsEqual = true; + if (!(_beamAzimuthCenter == rhs._beamAzimuthCenter)) ivarsEqual = false; + if (!(_beamAzimuthSweep == rhs._beamAzimuthSweep)) ivarsEqual = false; + if (!(_beamElevationCenter == rhs._beamElevationCenter)) ivarsEqual = false; + if (!(_beamElevationSweep == rhs._beamElevationSweep)) ivarsEqual = false; + if (!(_beamSweepSync == rhs._beamSweepSync)) ivarsEqual = false; -bool BeamData::operator ==(const BeamData& rhs) const - { - bool ivarsEqual = true; - - if( ! (_beamAzimuthCenter == rhs._beamAzimuthCenter) ) ivarsEqual = false; - if( ! (_beamAzimuthSweep == rhs._beamAzimuthSweep) ) ivarsEqual = false; - if( ! (_beamElevationCenter == rhs._beamElevationCenter) ) ivarsEqual = false; - if( ! (_beamElevationSweep == rhs._beamElevationSweep) ) ivarsEqual = false; - if( ! (_beamSweepSync == rhs._beamSweepSync) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int BeamData::getMarshalledSize() const -{ - int marshalSize = 0; +int BeamData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _beamAzimuthCenter - marshalSize = marshalSize + 4; // _beamAzimuthSweep - marshalSize = marshalSize + 4; // _beamElevationCenter - marshalSize = marshalSize + 4; // _beamElevationSweep - marshalSize = marshalSize + 4; // _beamSweepSync - return marshalSize; + marshalSize = marshalSize + 4; // _beamAzimuthCenter + marshalSize = marshalSize + 4; // _beamAzimuthSweep + marshalSize = marshalSize + 4; // _beamElevationCenter + marshalSize = marshalSize + 4; // _beamElevationSweep + marshalSize = marshalSize + 4; // _beamSweepSync + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +87,7 @@ int BeamData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BeamData.h b/src/dis7/BeamData.h index 2d29f95b..e2d57a21 100644 --- a/src/dis7/BeamData.h +++ b/src/dis7/BeamData.h @@ -1,70 +1,69 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Describes the scan volue of an emitter beam. Section 6.2.13. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT BeamData -{ -protected: - /** Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume */ - float _beamAzimuthCenter; +class OPENDIS7_EXPORT BeamData { + protected: + /** Specifies the beam azimuth an elevation centers and corresponding + * half-angles to describe the scan volume */ + float _beamAzimuthCenter; /** Specifies the beam azimuth sweep to determine scan volume */ - float _beamAzimuthSweep; + float _beamAzimuthSweep; /** Specifies the beam elevation center to determine scan volume */ - float _beamElevationCenter; + float _beamElevationCenter; /** Specifies the beam elevation sweep to determine scan volume */ - float _beamElevationSweep; - - /** allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion. */ - float _beamSweepSync; + float _beamElevationSweep; + /** allows receiver to synchronize its regenerated scan pattern to that of the + * emmitter. Specifies the percentage of time a scan is through its pattern + * from its origion. */ + float _beamSweepSync; public: - BeamData(); - virtual ~BeamData(); + BeamData(); + virtual ~BeamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getBeamAzimuthCenter() const; - void setBeamAzimuthCenter(float pX); + float getBeamAzimuthCenter() const; + void setBeamAzimuthCenter(float pX); - float getBeamAzimuthSweep() const; - void setBeamAzimuthSweep(float pX); + float getBeamAzimuthSweep() const; + void setBeamAzimuthSweep(float pX); - float getBeamElevationCenter() const; - void setBeamElevationCenter(float pX); + float getBeamElevationCenter() const; + void setBeamElevationCenter(float pX); - float getBeamElevationSweep() const; - void setBeamElevationSweep(float pX); + float getBeamElevationSweep() const; + void setBeamElevationSweep(float pX); - float getBeamSweepSync() const; - void setBeamSweepSync(float pX); + float getBeamSweepSync() const; + void setBeamSweepSync(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const BeamData& rhs) const; + bool operator==(const BeamData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +76,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BeamStatus.cpp b/src/dis7/BeamStatus.cpp index 7ab7807d..9c8b8387 100644 --- a/src/dis7/BeamStatus.cpp +++ b/src/dis7/BeamStatus.cpp @@ -2,59 +2,40 @@ using namespace DIS; +BeamStatus::BeamStatus() : _beamState(0) {} -BeamStatus::BeamStatus(): - _beamState(0) -{ -} - -BeamStatus::~BeamStatus() -{ -} - -unsigned char BeamStatus::getBeamState() const -{ - return _beamState; -} +BeamStatus::~BeamStatus() {} -void BeamStatus::setBeamState(unsigned char pX) -{ - _beamState = pX; -} +unsigned char BeamStatus::getBeamState() const { return _beamState; } -void BeamStatus::marshal(DataStream& dataStream) const -{ - dataStream << _beamState; -} +void BeamStatus::setBeamState(unsigned char pX) { _beamState = pX; } -void BeamStatus::unmarshal(DataStream& dataStream) -{ - dataStream >> _beamState; +void BeamStatus::marshal(DataStream& dataStream) const { + dataStream << _beamState; } +void BeamStatus::unmarshal(DataStream& dataStream) { dataStream >> _beamState; } -bool BeamStatus::operator ==(const BeamStatus& rhs) const - { - bool ivarsEqual = true; +bool BeamStatus::operator==(const BeamStatus& rhs) const { + bool ivarsEqual = true; - if( ! (_beamState == rhs._beamState) ) ivarsEqual = false; + if (!(_beamState == rhs._beamState)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int BeamStatus::getMarshalledSize() const -{ - int marshalSize = 0; +int BeamStatus::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _beamState - return marshalSize; + marshalSize = marshalSize + 1; // _beamState + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +48,7 @@ int BeamStatus::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BeamStatus.h b/src/dis7/BeamStatus.h index e7f5fef8..8430619d 100644 --- a/src/dis7/BeamStatus.h +++ b/src/dis7/BeamStatus.h @@ -1,46 +1,45 @@ #pragma once -#include #include +#include +namespace DIS { +// Information related to the status of a beam. This is contained in the beam +// status field of the electromagnitec emission PDU. The first bit determines +// whether the beam is active (0) or deactivated (1). -namespace DIS -{ -// Information related to the status of a beam. This is contained in the beam status field of the electromagnitec emission PDU. The first bit determines whether the beam is active (0) or deactivated (1). - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT BeamStatus -{ -protected: - /** First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding. */ - unsigned char _beamState; - +class OPENDIS7_EXPORT BeamStatus { + protected: + /** First bit zero means beam is active, first bit = 1 means deactivated. The + * rest is padding. */ + unsigned char _beamState; public: - BeamStatus(); - virtual ~BeamStatus(); + BeamStatus(); + virtual ~BeamStatus(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getBeamState() const; - void setBeamState(unsigned char pX); + unsigned char getBeamState() const; + void setBeamState(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const BeamStatus& rhs) const; + bool operator==(const BeamStatus& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -53,7 +52,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BlankingSector.cpp b/src/dis7/BlankingSector.cpp index e589ab30..aac53ba3 100644 --- a/src/dis7/BlankingSector.cpp +++ b/src/dis7/BlankingSector.cpp @@ -2,194 +2,130 @@ using namespace DIS; +BlankingSector::BlankingSector() + : _recordType(3500), + _recordLength(0), + _emitterNumber(0), + _beamNumber(0), + _stateIndicator(0), + _leftAzimuth(0.0), + _rightAzimuth(0.0), + _lowerElevation(0.0), + _upperElevation(0.0), + _residualPower(0.0) {} -BlankingSector::BlankingSector(): - _recordType(3500), - _recordLength(0), - _emitterNumber(0), - _beamNumber(0), - _stateIndicator(0), - _leftAzimuth(0.0), - _rightAzimuth(0.0), - _lowerElevation(0.0), - _upperElevation(0.0), - _residualPower(0.0) -{ -} +BlankingSector::~BlankingSector() {} -BlankingSector::~BlankingSector() -{ -} +unsigned int BlankingSector::getRecordType() const { return _recordType; } -unsigned int BlankingSector::getRecordType() const -{ - return _recordType; -} +void BlankingSector::setRecordType(unsigned int pX) { _recordType = pX; } -void BlankingSector::setRecordType(unsigned int pX) -{ - _recordType = pX; -} +unsigned short BlankingSector::getRecordLength() const { return _recordLength; } -unsigned short BlankingSector::getRecordLength() const -{ - return _recordLength; -} +void BlankingSector::setRecordLength(unsigned short pX) { _recordLength = pX; } -void BlankingSector::setRecordLength(unsigned short pX) -{ - _recordLength = pX; +unsigned char BlankingSector::getEmitterNumber() const { + return _emitterNumber; } -unsigned char BlankingSector::getEmitterNumber() const -{ - return _emitterNumber; -} +void BlankingSector::setEmitterNumber(unsigned char pX) { _emitterNumber = pX; } -void BlankingSector::setEmitterNumber(unsigned char pX) -{ - _emitterNumber = pX; -} +unsigned char BlankingSector::getBeamNumber() const { return _beamNumber; } -unsigned char BlankingSector::getBeamNumber() const -{ - return _beamNumber; -} +void BlankingSector::setBeamNumber(unsigned char pX) { _beamNumber = pX; } -void BlankingSector::setBeamNumber(unsigned char pX) -{ - _beamNumber = pX; +unsigned char BlankingSector::getStateIndicator() const { + return _stateIndicator; } -unsigned char BlankingSector::getStateIndicator() const -{ - return _stateIndicator; +void BlankingSector::setStateIndicator(unsigned char pX) { + _stateIndicator = pX; } -void BlankingSector::setStateIndicator(unsigned char pX) -{ - _stateIndicator = pX; -} +float BlankingSector::getLeftAzimuth() const { return _leftAzimuth; } -float BlankingSector::getLeftAzimuth() const -{ - return _leftAzimuth; -} +void BlankingSector::setLeftAzimuth(float pX) { _leftAzimuth = pX; } -void BlankingSector::setLeftAzimuth(float pX) -{ - _leftAzimuth = pX; -} +float BlankingSector::getRightAzimuth() const { return _rightAzimuth; } -float BlankingSector::getRightAzimuth() const -{ - return _rightAzimuth; -} +void BlankingSector::setRightAzimuth(float pX) { _rightAzimuth = pX; } -void BlankingSector::setRightAzimuth(float pX) -{ - _rightAzimuth = pX; -} +float BlankingSector::getLowerElevation() const { return _lowerElevation; } -float BlankingSector::getLowerElevation() const -{ - return _lowerElevation; -} +void BlankingSector::setLowerElevation(float pX) { _lowerElevation = pX; } -void BlankingSector::setLowerElevation(float pX) -{ - _lowerElevation = pX; -} +float BlankingSector::getUpperElevation() const { return _upperElevation; } -float BlankingSector::getUpperElevation() const -{ - return _upperElevation; -} +void BlankingSector::setUpperElevation(float pX) { _upperElevation = pX; } -void BlankingSector::setUpperElevation(float pX) -{ - _upperElevation = pX; -} +float BlankingSector::getResidualPower() const { return _residualPower; } -float BlankingSector::getResidualPower() const -{ - return _residualPower; -} +void BlankingSector::setResidualPower(float pX) { _residualPower = pX; } -void BlankingSector::setResidualPower(float pX) -{ - _residualPower = pX; +void BlankingSector::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _emitterNumber; + dataStream << _beamNumber; + dataStream << _stateIndicator; + dataStream << _leftAzimuth; + dataStream << _rightAzimuth; + dataStream << _lowerElevation; + dataStream << _upperElevation; + dataStream << _residualPower; } -void BlankingSector::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _emitterNumber; - dataStream << _beamNumber; - dataStream << _stateIndicator; - dataStream << _leftAzimuth; - dataStream << _rightAzimuth; - dataStream << _lowerElevation; - dataStream << _upperElevation; - dataStream << _residualPower; +void BlankingSector::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _emitterNumber; + dataStream >> _beamNumber; + dataStream >> _stateIndicator; + dataStream >> _leftAzimuth; + dataStream >> _rightAzimuth; + dataStream >> _lowerElevation; + dataStream >> _upperElevation; + dataStream >> _residualPower; } -void BlankingSector::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _emitterNumber; - dataStream >> _beamNumber; - dataStream >> _stateIndicator; - dataStream >> _leftAzimuth; - dataStream >> _rightAzimuth; - dataStream >> _lowerElevation; - dataStream >> _upperElevation; - dataStream >> _residualPower; +bool BlankingSector::operator==(const BlankingSector& rhs) const { + bool ivarsEqual = true; + + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_emitterNumber == rhs._emitterNumber)) ivarsEqual = false; + if (!(_beamNumber == rhs._beamNumber)) ivarsEqual = false; + if (!(_stateIndicator == rhs._stateIndicator)) ivarsEqual = false; + if (!(_leftAzimuth == rhs._leftAzimuth)) ivarsEqual = false; + if (!(_rightAzimuth == rhs._rightAzimuth)) ivarsEqual = false; + if (!(_lowerElevation == rhs._lowerElevation)) ivarsEqual = false; + if (!(_upperElevation == rhs._upperElevation)) ivarsEqual = false; + if (!(_residualPower == rhs._residualPower)) ivarsEqual = false; + + return ivarsEqual; } +int BlankingSector::getMarshalledSize() const { + int marshalSize = 0; -bool BlankingSector::operator ==(const BlankingSector& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_emitterNumber == rhs._emitterNumber) ) ivarsEqual = false; - if( ! (_beamNumber == rhs._beamNumber) ) ivarsEqual = false; - if( ! (_stateIndicator == rhs._stateIndicator) ) ivarsEqual = false; - if( ! (_leftAzimuth == rhs._leftAzimuth) ) ivarsEqual = false; - if( ! (_rightAzimuth == rhs._rightAzimuth) ) ivarsEqual = false; - if( ! (_lowerElevation == rhs._lowerElevation) ) ivarsEqual = false; - if( ! (_upperElevation == rhs._upperElevation) ) ivarsEqual = false; - if( ! (_residualPower == rhs._residualPower) ) ivarsEqual = false; - - return ivarsEqual; - } - -int BlankingSector::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 1; // _emitterNumber - marshalSize = marshalSize + 1; // _beamNumber - marshalSize = marshalSize + 1; // _stateIndicator - marshalSize = marshalSize + 4; // _leftAzimuth - marshalSize = marshalSize + 4; // _rightAzimuth - marshalSize = marshalSize + 4; // _lowerElevation - marshalSize = marshalSize + 4; // _upperElevation - marshalSize = marshalSize + 4; // _residualPower - return marshalSize; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 1; // _emitterNumber + marshalSize = marshalSize + 1; // _beamNumber + marshalSize = marshalSize + 1; // _stateIndicator + marshalSize = marshalSize + 4; // _leftAzimuth + marshalSize = marshalSize + 4; // _rightAzimuth + marshalSize = marshalSize + 4; // _lowerElevation + marshalSize = marshalSize + 4; // _upperElevation + marshalSize = marshalSize + 4; // _residualPower + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -202,7 +138,7 @@ int BlankingSector::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/BlankingSector.h b/src/dis7/BlankingSector.h index bf2cbd81..0032de63 100644 --- a/src/dis7/BlankingSector.h +++ b/src/dis7/BlankingSector.h @@ -1,90 +1,88 @@ #pragma once -#include #include +#include +namespace DIS { +// The Blanking Sector attribute record may be used to convey persistent areas +// within a scan volume where emitter power for a specific active emitter beam +// is reduced to an insignificant value. Section 6.2.12 -namespace DIS -{ -// The Blanking Sector attribute record may be used to convey persistent areas within a scan volume where emitter power for a specific active emitter beam is reduced to an insignificant value. Section 6.2.12 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT BlankingSector -{ -protected: - unsigned int _recordType; - - unsigned short _recordLength; +class OPENDIS7_EXPORT BlankingSector { + protected: + unsigned int _recordType; - unsigned char _emitterNumber; + unsigned short _recordLength; - unsigned char _beamNumber; + unsigned char _emitterNumber; - unsigned char _stateIndicator; + unsigned char _beamNumber; - float _leftAzimuth; + unsigned char _stateIndicator; - float _rightAzimuth; + float _leftAzimuth; - float _lowerElevation; + float _rightAzimuth; - float _upperElevation; + float _lowerElevation; - float _residualPower; + float _upperElevation; + float _residualPower; public: - BlankingSector(); - virtual ~BlankingSector(); + BlankingSector(); + virtual ~BlankingSector(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + unsigned char getEmitterNumber() const; + void setEmitterNumber(unsigned char pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + unsigned char getBeamNumber() const; + void setBeamNumber(unsigned char pX); - unsigned char getStateIndicator() const; - void setStateIndicator(unsigned char pX); + unsigned char getStateIndicator() const; + void setStateIndicator(unsigned char pX); - float getLeftAzimuth() const; - void setLeftAzimuth(float pX); + float getLeftAzimuth() const; + void setLeftAzimuth(float pX); - float getRightAzimuth() const; - void setRightAzimuth(float pX); + float getRightAzimuth() const; + void setRightAzimuth(float pX); - float getLowerElevation() const; - void setLowerElevation(float pX); + float getLowerElevation() const; + void setLowerElevation(float pX); - float getUpperElevation() const; - void setUpperElevation(float pX); + float getUpperElevation() const; + void setUpperElevation(float pX); - float getResidualPower() const; - void setResidualPower(float pX); + float getResidualPower() const; + void setResidualPower(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const BlankingSector& rhs) const; + bool operator==(const BlankingSector& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +95,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ClockTime.cpp b/src/dis7/ClockTime.cpp index eabc4612..498c4b04 100644 --- a/src/dis7/ClockTime.cpp +++ b/src/dis7/ClockTime.cpp @@ -2,74 +2,50 @@ using namespace DIS; +ClockTime::ClockTime() : _hour(0), _timePastHour(0) {} -ClockTime::ClockTime(): - _hour(0), - _timePastHour(0) -{ -} +ClockTime::~ClockTime() {} -ClockTime::~ClockTime() -{ -} +unsigned int ClockTime::getHour() const { return _hour; } -unsigned int ClockTime::getHour() const -{ - return _hour; -} +void ClockTime::setHour(unsigned int pX) { _hour = pX; } -void ClockTime::setHour(unsigned int pX) -{ - _hour = pX; -} +unsigned int ClockTime::getTimePastHour() const { return _timePastHour; } -unsigned int ClockTime::getTimePastHour() const -{ - return _timePastHour; -} +void ClockTime::setTimePastHour(unsigned int pX) { _timePastHour = pX; } -void ClockTime::setTimePastHour(unsigned int pX) -{ - _timePastHour = pX; +void ClockTime::marshal(DataStream& dataStream) const { + dataStream << _hour; + dataStream << _timePastHour; } -void ClockTime::marshal(DataStream& dataStream) const -{ - dataStream << _hour; - dataStream << _timePastHour; -} - -void ClockTime::unmarshal(DataStream& dataStream) -{ - dataStream >> _hour; - dataStream >> _timePastHour; +void ClockTime::unmarshal(DataStream& dataStream) { + dataStream >> _hour; + dataStream >> _timePastHour; } +bool ClockTime::operator==(const ClockTime& rhs) const { + bool ivarsEqual = true; -bool ClockTime::operator ==(const ClockTime& rhs) const - { - bool ivarsEqual = true; + if (!(_hour == rhs._hour)) ivarsEqual = false; + if (!(_timePastHour == rhs._timePastHour)) ivarsEqual = false; - if( ! (_hour == rhs._hour) ) ivarsEqual = false; - if( ! (_timePastHour == rhs._timePastHour) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ClockTime::getMarshalledSize() const -{ - int marshalSize = 0; +int ClockTime::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _hour - marshalSize = marshalSize + 4; // _timePastHour - return marshalSize; + marshalSize = marshalSize + 4; // _hour + marshalSize = marshalSize + 4; // _timePastHour + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int ClockTime::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ClockTime.h b/src/dis7/ClockTime.h index a7d735ad..1b4d97cf 100644 --- a/src/dis7/ClockTime.h +++ b/src/dis7/ClockTime.h @@ -1,52 +1,51 @@ #pragma once -#include #include +#include +namespace DIS { +// Time measurements that exceed one hour are represented by this record. The +// first field is the hours since the unix epoch (Jan 1 1970, used by most Unix +// systems and java) and the second field the timestamp units since the top of +// the hour. Section 6.2.16 -namespace DIS -{ -// Time measurements that exceed one hour are represented by this record. The first field is the hours since the unix epoch (Jan 1 1970, used by most Unix systems and java) and the second field the timestamp units since the top of the hour. Section 6.2.16 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ClockTime -{ -protected: +class OPENDIS7_EXPORT ClockTime { + protected: /** Hours in UTC */ - unsigned int _hour; + unsigned int _hour; /** Time past the hour */ - unsigned int _timePastHour; - + unsigned int _timePastHour; public: - ClockTime(); - virtual ~ClockTime(); + ClockTime(); + virtual ~ClockTime(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getHour() const; - void setHour(unsigned int pX); + unsigned int getHour() const; + void setHour(unsigned int pX); - unsigned int getTimePastHour() const; - void setTimePastHour(unsigned int pX); + unsigned int getTimePastHour() const; + void setTimePastHour(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ClockTime& rhs) const; + bool operator==(const ClockTime& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CollisionElasticPdu.cpp b/src/dis7/CollisionElasticPdu.cpp index fa99bf92..24292486 100644 --- a/src/dis7/CollisionElasticPdu.cpp +++ b/src/dis7/CollisionElasticPdu.cpp @@ -2,306 +2,267 @@ using namespace DIS; - -CollisionElasticPdu::CollisionElasticPdu() : EntityInformationFamilyPdu(), - _issuingEntityID(), - _collidingEntityID(), - _collisionEventID(), - _pad(0), - _contactVelocity(), - _mass(0.0), - _locationOfImpact(), - _collisionIntermediateResultXX(0.0), - _collisionIntermediateResultXY(0.0), - _collisionIntermediateResultXZ(0.0), - _collisionIntermediateResultYY(0.0), - _collisionIntermediateResultYZ(0.0), - _collisionIntermediateResultZZ(0.0), - _unitSurfaceNormal(), - _coefficientOfRestitution(0.0) -{ - setPduType( 66 ); - setProtocolFamily( 1 ); +CollisionElasticPdu::CollisionElasticPdu() + : EntityInformationFamilyPdu(), + _issuingEntityID(), + _collidingEntityID(), + _collisionEventID(), + _pad(0), + _contactVelocity(), + _mass(0.0), + _locationOfImpact(), + _collisionIntermediateResultXX(0.0), + _collisionIntermediateResultXY(0.0), + _collisionIntermediateResultXZ(0.0), + _collisionIntermediateResultYY(0.0), + _collisionIntermediateResultYZ(0.0), + _collisionIntermediateResultZZ(0.0), + _unitSurfaceNormal(), + _coefficientOfRestitution(0.0) { + setPduType(66); + setProtocolFamily(1); } -CollisionElasticPdu::~CollisionElasticPdu() -{ -} +CollisionElasticPdu::~CollisionElasticPdu() {} -EntityID& CollisionElasticPdu::getIssuingEntityID() -{ - return _issuingEntityID; -} +EntityID& CollisionElasticPdu::getIssuingEntityID() { return _issuingEntityID; } -const EntityID& CollisionElasticPdu::getIssuingEntityID() const -{ - return _issuingEntityID; +const EntityID& CollisionElasticPdu::getIssuingEntityID() const { + return _issuingEntityID; } -void CollisionElasticPdu::setIssuingEntityID(const EntityID &pX) -{ - _issuingEntityID = pX; +void CollisionElasticPdu::setIssuingEntityID(const EntityID& pX) { + _issuingEntityID = pX; } -EntityID& CollisionElasticPdu::getCollidingEntityID() -{ - return _collidingEntityID; +EntityID& CollisionElasticPdu::getCollidingEntityID() { + return _collidingEntityID; } -const EntityID& CollisionElasticPdu::getCollidingEntityID() const -{ - return _collidingEntityID; +const EntityID& CollisionElasticPdu::getCollidingEntityID() const { + return _collidingEntityID; } -void CollisionElasticPdu::setCollidingEntityID(const EntityID &pX) -{ - _collidingEntityID = pX; +void CollisionElasticPdu::setCollidingEntityID(const EntityID& pX) { + _collidingEntityID = pX; } -EventIdentifier& CollisionElasticPdu::getCollisionEventID() -{ - return _collisionEventID; +EventIdentifier& CollisionElasticPdu::getCollisionEventID() { + return _collisionEventID; } -const EventIdentifier& CollisionElasticPdu::getCollisionEventID() const -{ - return _collisionEventID; +const EventIdentifier& CollisionElasticPdu::getCollisionEventID() const { + return _collisionEventID; } -void CollisionElasticPdu::setCollisionEventID(const EventIdentifier &pX) -{ - _collisionEventID = pX; +void CollisionElasticPdu::setCollisionEventID(const EventIdentifier& pX) { + _collisionEventID = pX; } -short CollisionElasticPdu::getPad() const -{ - return _pad; -} +short CollisionElasticPdu::getPad() const { return _pad; } -void CollisionElasticPdu::setPad(short pX) -{ - _pad = pX; -} +void CollisionElasticPdu::setPad(short pX) { _pad = pX; } -Vector3Float& CollisionElasticPdu::getContactVelocity() -{ - return _contactVelocity; +Vector3Float& CollisionElasticPdu::getContactVelocity() { + return _contactVelocity; } -const Vector3Float& CollisionElasticPdu::getContactVelocity() const -{ - return _contactVelocity; +const Vector3Float& CollisionElasticPdu::getContactVelocity() const { + return _contactVelocity; } -void CollisionElasticPdu::setContactVelocity(const Vector3Float &pX) -{ - _contactVelocity = pX; +void CollisionElasticPdu::setContactVelocity(const Vector3Float& pX) { + _contactVelocity = pX; } -float CollisionElasticPdu::getMass() const -{ - return _mass; -} +float CollisionElasticPdu::getMass() const { return _mass; } -void CollisionElasticPdu::setMass(float pX) -{ - _mass = pX; -} +void CollisionElasticPdu::setMass(float pX) { _mass = pX; } -Vector3Float& CollisionElasticPdu::getLocationOfImpact() -{ - return _locationOfImpact; +Vector3Float& CollisionElasticPdu::getLocationOfImpact() { + return _locationOfImpact; } -const Vector3Float& CollisionElasticPdu::getLocationOfImpact() const -{ - return _locationOfImpact; +const Vector3Float& CollisionElasticPdu::getLocationOfImpact() const { + return _locationOfImpact; } -void CollisionElasticPdu::setLocationOfImpact(const Vector3Float &pX) -{ - _locationOfImpact = pX; +void CollisionElasticPdu::setLocationOfImpact(const Vector3Float& pX) { + _locationOfImpact = pX; } -float CollisionElasticPdu::getCollisionIntermediateResultXX() const -{ - return _collisionIntermediateResultXX; +float CollisionElasticPdu::getCollisionIntermediateResultXX() const { + return _collisionIntermediateResultXX; } -void CollisionElasticPdu::setCollisionIntermediateResultXX(float pX) -{ - _collisionIntermediateResultXX = pX; +void CollisionElasticPdu::setCollisionIntermediateResultXX(float pX) { + _collisionIntermediateResultXX = pX; } -float CollisionElasticPdu::getCollisionIntermediateResultXY() const -{ - return _collisionIntermediateResultXY; +float CollisionElasticPdu::getCollisionIntermediateResultXY() const { + return _collisionIntermediateResultXY; } -void CollisionElasticPdu::setCollisionIntermediateResultXY(float pX) -{ - _collisionIntermediateResultXY = pX; +void CollisionElasticPdu::setCollisionIntermediateResultXY(float pX) { + _collisionIntermediateResultXY = pX; } -float CollisionElasticPdu::getCollisionIntermediateResultXZ() const -{ - return _collisionIntermediateResultXZ; +float CollisionElasticPdu::getCollisionIntermediateResultXZ() const { + return _collisionIntermediateResultXZ; } -void CollisionElasticPdu::setCollisionIntermediateResultXZ(float pX) -{ - _collisionIntermediateResultXZ = pX; +void CollisionElasticPdu::setCollisionIntermediateResultXZ(float pX) { + _collisionIntermediateResultXZ = pX; } -float CollisionElasticPdu::getCollisionIntermediateResultYY() const -{ - return _collisionIntermediateResultYY; +float CollisionElasticPdu::getCollisionIntermediateResultYY() const { + return _collisionIntermediateResultYY; } -void CollisionElasticPdu::setCollisionIntermediateResultYY(float pX) -{ - _collisionIntermediateResultYY = pX; +void CollisionElasticPdu::setCollisionIntermediateResultYY(float pX) { + _collisionIntermediateResultYY = pX; } -float CollisionElasticPdu::getCollisionIntermediateResultYZ() const -{ - return _collisionIntermediateResultYZ; +float CollisionElasticPdu::getCollisionIntermediateResultYZ() const { + return _collisionIntermediateResultYZ; } -void CollisionElasticPdu::setCollisionIntermediateResultYZ(float pX) -{ - _collisionIntermediateResultYZ = pX; +void CollisionElasticPdu::setCollisionIntermediateResultYZ(float pX) { + _collisionIntermediateResultYZ = pX; } -float CollisionElasticPdu::getCollisionIntermediateResultZZ() const -{ - return _collisionIntermediateResultZZ; +float CollisionElasticPdu::getCollisionIntermediateResultZZ() const { + return _collisionIntermediateResultZZ; } -void CollisionElasticPdu::setCollisionIntermediateResultZZ(float pX) -{ - _collisionIntermediateResultZZ = pX; +void CollisionElasticPdu::setCollisionIntermediateResultZZ(float pX) { + _collisionIntermediateResultZZ = pX; } -Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() -{ - return _unitSurfaceNormal; +Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() { + return _unitSurfaceNormal; } -const Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() const -{ - return _unitSurfaceNormal; +const Vector3Float& CollisionElasticPdu::getUnitSurfaceNormal() const { + return _unitSurfaceNormal; } -void CollisionElasticPdu::setUnitSurfaceNormal(const Vector3Float &pX) -{ - _unitSurfaceNormal = pX; +void CollisionElasticPdu::setUnitSurfaceNormal(const Vector3Float& pX) { + _unitSurfaceNormal = pX; } -float CollisionElasticPdu::getCoefficientOfRestitution() const -{ - return _coefficientOfRestitution; +float CollisionElasticPdu::getCoefficientOfRestitution() const { + return _coefficientOfRestitution; } -void CollisionElasticPdu::setCoefficientOfRestitution(float pX) -{ - _coefficientOfRestitution = pX; +void CollisionElasticPdu::setCoefficientOfRestitution(float pX) { + _coefficientOfRestitution = pX; } -void CollisionElasticPdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _issuingEntityID.marshal(dataStream); - _collidingEntityID.marshal(dataStream); - _collisionEventID.marshal(dataStream); - dataStream << _pad; - _contactVelocity.marshal(dataStream); - dataStream << _mass; - _locationOfImpact.marshal(dataStream); - dataStream << _collisionIntermediateResultXX; - dataStream << _collisionIntermediateResultXY; - dataStream << _collisionIntermediateResultXZ; - dataStream << _collisionIntermediateResultYY; - dataStream << _collisionIntermediateResultYZ; - dataStream << _collisionIntermediateResultZZ; - _unitSurfaceNormal.marshal(dataStream); - dataStream << _coefficientOfRestitution; +void CollisionElasticPdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _issuingEntityID.marshal(dataStream); + _collidingEntityID.marshal(dataStream); + _collisionEventID.marshal(dataStream); + dataStream << _pad; + _contactVelocity.marshal(dataStream); + dataStream << _mass; + _locationOfImpact.marshal(dataStream); + dataStream << _collisionIntermediateResultXX; + dataStream << _collisionIntermediateResultXY; + dataStream << _collisionIntermediateResultXZ; + dataStream << _collisionIntermediateResultYY; + dataStream << _collisionIntermediateResultYZ; + dataStream << _collisionIntermediateResultZZ; + _unitSurfaceNormal.marshal(dataStream); + dataStream << _coefficientOfRestitution; } -void CollisionElasticPdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _issuingEntityID.unmarshal(dataStream); - _collidingEntityID.unmarshal(dataStream); - _collisionEventID.unmarshal(dataStream); - dataStream >> _pad; - _contactVelocity.unmarshal(dataStream); - dataStream >> _mass; - _locationOfImpact.unmarshal(dataStream); - dataStream >> _collisionIntermediateResultXX; - dataStream >> _collisionIntermediateResultXY; - dataStream >> _collisionIntermediateResultXZ; - dataStream >> _collisionIntermediateResultYY; - dataStream >> _collisionIntermediateResultYZ; - dataStream >> _collisionIntermediateResultZZ; - _unitSurfaceNormal.unmarshal(dataStream); - dataStream >> _coefficientOfRestitution; +void CollisionElasticPdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _issuingEntityID.unmarshal(dataStream); + _collidingEntityID.unmarshal(dataStream); + _collisionEventID.unmarshal(dataStream); + dataStream >> _pad; + _contactVelocity.unmarshal(dataStream); + dataStream >> _mass; + _locationOfImpact.unmarshal(dataStream); + dataStream >> _collisionIntermediateResultXX; + dataStream >> _collisionIntermediateResultXY; + dataStream >> _collisionIntermediateResultXZ; + dataStream >> _collisionIntermediateResultYY; + dataStream >> _collisionIntermediateResultYZ; + dataStream >> _collisionIntermediateResultZZ; + _unitSurfaceNormal.unmarshal(dataStream); + dataStream >> _coefficientOfRestitution; } - -bool CollisionElasticPdu::operator ==(const CollisionElasticPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_issuingEntityID == rhs._issuingEntityID) ) ivarsEqual = false; - if( ! (_collidingEntityID == rhs._collidingEntityID) ) ivarsEqual = false; - if( ! (_collisionEventID == rhs._collisionEventID) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - if( ! (_contactVelocity == rhs._contactVelocity) ) ivarsEqual = false; - if( ! (_mass == rhs._mass) ) ivarsEqual = false; - if( ! (_locationOfImpact == rhs._locationOfImpact) ) ivarsEqual = false; - if( ! (_collisionIntermediateResultXX == rhs._collisionIntermediateResultXX) ) ivarsEqual = false; - if( ! (_collisionIntermediateResultXY == rhs._collisionIntermediateResultXY) ) ivarsEqual = false; - if( ! (_collisionIntermediateResultXZ == rhs._collisionIntermediateResultXZ) ) ivarsEqual = false; - if( ! (_collisionIntermediateResultYY == rhs._collisionIntermediateResultYY) ) ivarsEqual = false; - if( ! (_collisionIntermediateResultYZ == rhs._collisionIntermediateResultYZ) ) ivarsEqual = false; - if( ! (_collisionIntermediateResultZZ == rhs._collisionIntermediateResultZZ) ) ivarsEqual = false; - if( ! (_unitSurfaceNormal == rhs._unitSurfaceNormal) ) ivarsEqual = false; - if( ! (_coefficientOfRestitution == rhs._coefficientOfRestitution) ) ivarsEqual = false; - - return ivarsEqual; - } - -int CollisionElasticPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID - marshalSize = marshalSize + _collidingEntityID.getMarshalledSize(); // _collidingEntityID - marshalSize = marshalSize + _collisionEventID.getMarshalledSize(); // _collisionEventID - marshalSize = marshalSize + 2; // _pad - marshalSize = marshalSize + _contactVelocity.getMarshalledSize(); // _contactVelocity - marshalSize = marshalSize + 4; // _mass - marshalSize = marshalSize + _locationOfImpact.getMarshalledSize(); // _locationOfImpact - marshalSize = marshalSize + 4; // _collisionIntermediateResultXX - marshalSize = marshalSize + 4; // _collisionIntermediateResultXY - marshalSize = marshalSize + 4; // _collisionIntermediateResultXZ - marshalSize = marshalSize + 4; // _collisionIntermediateResultYY - marshalSize = marshalSize + 4; // _collisionIntermediateResultYZ - marshalSize = marshalSize + 4; // _collisionIntermediateResultZZ - marshalSize = marshalSize + _unitSurfaceNormal.getMarshalledSize(); // _unitSurfaceNormal - marshalSize = marshalSize + 4; // _coefficientOfRestitution - return marshalSize; +bool CollisionElasticPdu::operator==(const CollisionElasticPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + + if (!(_issuingEntityID == rhs._issuingEntityID)) ivarsEqual = false; + if (!(_collidingEntityID == rhs._collidingEntityID)) ivarsEqual = false; + if (!(_collisionEventID == rhs._collisionEventID)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + if (!(_contactVelocity == rhs._contactVelocity)) ivarsEqual = false; + if (!(_mass == rhs._mass)) ivarsEqual = false; + if (!(_locationOfImpact == rhs._locationOfImpact)) ivarsEqual = false; + if (!(_collisionIntermediateResultXX == rhs._collisionIntermediateResultXX)) + ivarsEqual = false; + if (!(_collisionIntermediateResultXY == rhs._collisionIntermediateResultXY)) + ivarsEqual = false; + if (!(_collisionIntermediateResultXZ == rhs._collisionIntermediateResultXZ)) + ivarsEqual = false; + if (!(_collisionIntermediateResultYY == rhs._collisionIntermediateResultYY)) + ivarsEqual = false; + if (!(_collisionIntermediateResultYZ == rhs._collisionIntermediateResultYZ)) + ivarsEqual = false; + if (!(_collisionIntermediateResultZZ == rhs._collisionIntermediateResultZZ)) + ivarsEqual = false; + if (!(_unitSurfaceNormal == rhs._unitSurfaceNormal)) ivarsEqual = false; + if (!(_coefficientOfRestitution == rhs._coefficientOfRestitution)) + ivarsEqual = false; + + return ivarsEqual; +} + +int CollisionElasticPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID + marshalSize = marshalSize + + _collidingEntityID.getMarshalledSize(); // _collidingEntityID + marshalSize = + marshalSize + _collisionEventID.getMarshalledSize(); // _collisionEventID + marshalSize = marshalSize + 2; // _pad + marshalSize = + marshalSize + _contactVelocity.getMarshalledSize(); // _contactVelocity + marshalSize = marshalSize + 4; // _mass + marshalSize = + marshalSize + _locationOfImpact.getMarshalledSize(); // _locationOfImpact + marshalSize = marshalSize + 4; // _collisionIntermediateResultXX + marshalSize = marshalSize + 4; // _collisionIntermediateResultXY + marshalSize = marshalSize + 4; // _collisionIntermediateResultXZ + marshalSize = marshalSize + 4; // _collisionIntermediateResultYY + marshalSize = marshalSize + 4; // _collisionIntermediateResultYZ + marshalSize = marshalSize + 4; // _collisionIntermediateResultZZ + marshalSize = marshalSize + + _unitSurfaceNormal.getMarshalledSize(); // _unitSurfaceNormal + marshalSize = marshalSize + 4; // _coefficientOfRestitution + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -314,7 +275,7 @@ int CollisionElasticPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CollisionElasticPdu.h b/src/dis7/CollisionElasticPdu.h index c3b016d4..c8c971db 100644 --- a/src/dis7/CollisionElasticPdu.h +++ b/src/dis7/CollisionElasticPdu.h @@ -1,143 +1,159 @@ #pragma once #include -#include +#include #include #include -#include -#include -#include -#include #include +#include +namespace DIS { +// Information about elastic collisions in a DIS exercise shall be communicated +// using a Collision-Elastic PDU. Section 7.2.4. COMPLETE -namespace DIS -{ -// Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. Section 7.2.4. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu -{ -protected: - /** This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28) */ - EntityID _issuingEntityID; +class OPENDIS7_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu { + protected: + /** This field shall identify the entity that is issuing the PDU and shall be + * represented by an Entity Identifier record (see 6.2.28) */ + EntityID _issuingEntityID; - /** This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28). */ - EntityID _collidingEntityID; + /** This field shall identify the entity that has collided with the issuing + * entity. This field shall be a valid identifier of an entity or server + * capable of responding to the receipt of this Collision-Elastic PDU. This + * field shall be represented by an Entity Identifier record (see 6.2.28). */ + EntityID _collidingEntityID; - /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */ - EventIdentifier _collisionEventID; + /** This field shall contain an identification generated by the issuing + * simulation application to associate related collision events. This field + * shall be represented by an Event Identifier record (see 6.2.34). */ + EventIdentifier _collisionEventID; /** some padding */ - short _pad; - - /** This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)] */ - Vector3Float _contactVelocity; - - /** This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms */ - float _mass; - - /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */ - Vector3Float _locationOfImpact; - - /** These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4) */ - float _collisionIntermediateResultXX; + short _pad; + + /** This field shall contain the velocity at the time the collision is + * detected at the point the collision is detected. The velocity shall be + * represented in world coordinates. This field shall be represented by the + * Linear Velocity Vector record [see 6.2.95 item c)] */ + Vector3Float _contactVelocity; + + /** This field shall contain the mass of the issuing entity and shall be + * represented by a 32-bit floating point number representing kilograms */ + float _mass; + + /** This field shall specify the location of the collision with respect to the + * entity with which the issuing entity collided. This field shall be + * represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */ + Vector3Float _locationOfImpact; + + /** These six records represent the six independent components of a positive + * semi-definite matrix formed by pre-multiplying and post-multiplying the + * tensor of inertia, by the anti-symmetric matrix generated by the moment + * arm, and shall be represented by 32-bit floating point numbers + * (see 5.3.4.4) */ + float _collisionIntermediateResultXX; /** tensor values */ - float _collisionIntermediateResultXY; + float _collisionIntermediateResultXY; /** tensor values */ - float _collisionIntermediateResultXZ; + float _collisionIntermediateResultXZ; /** tensor values */ - float _collisionIntermediateResultYY; + float _collisionIntermediateResultYY; /** tensor values */ - float _collisionIntermediateResultYZ; + float _collisionIntermediateResultYZ; /** tensor values */ - float _collisionIntermediateResultZZ; + float _collisionIntermediateResultZZ; - /** This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */ - Vector3Float _unitSurfaceNormal; - - /** This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may “tune” their collision interactions. */ - float _coefficientOfRestitution; + /** This record shall represent the normal vector to the surface at the point + * of collision detection. The surface normal shall be represented in world + * coordinates. This field shall be represented by an Entity Coordinate Vector + * record [see 6.2.95 item a)]. */ + Vector3Float _unitSurfaceNormal; + /** This field shall represent the degree to which energy is conserved in a + * collision and shall be represented by a 32-bit floating point number. In + * addition, it represents a free parameter by which simulation application + * developers may “tune” their collision interactions. */ + float _coefficientOfRestitution; public: - CollisionElasticPdu(); - virtual ~CollisionElasticPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + CollisionElasticPdu(); + virtual ~CollisionElasticPdu(); - EntityID& getIssuingEntityID(); - const EntityID& getIssuingEntityID() const; - void setIssuingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getCollidingEntityID(); - const EntityID& getCollidingEntityID() const; - void setCollidingEntityID(const EntityID &pX); + EntityID& getIssuingEntityID(); + const EntityID& getIssuingEntityID() const; + void setIssuingEntityID(const EntityID& pX); - EventIdentifier& getCollisionEventID(); - const EventIdentifier& getCollisionEventID() const; - void setCollisionEventID(const EventIdentifier &pX); + EntityID& getCollidingEntityID(); + const EntityID& getCollidingEntityID() const; + void setCollidingEntityID(const EntityID& pX); - short getPad() const; - void setPad(short pX); + EventIdentifier& getCollisionEventID(); + const EventIdentifier& getCollisionEventID() const; + void setCollisionEventID(const EventIdentifier& pX); - Vector3Float& getContactVelocity(); - const Vector3Float& getContactVelocity() const; - void setContactVelocity(const Vector3Float &pX); + short getPad() const; + void setPad(short pX); - float getMass() const; - void setMass(float pX); + Vector3Float& getContactVelocity(); + const Vector3Float& getContactVelocity() const; + void setContactVelocity(const Vector3Float& pX); - Vector3Float& getLocationOfImpact(); - const Vector3Float& getLocationOfImpact() const; - void setLocationOfImpact(const Vector3Float &pX); + float getMass() const; + void setMass(float pX); - float getCollisionIntermediateResultXX() const; - void setCollisionIntermediateResultXX(float pX); + Vector3Float& getLocationOfImpact(); + const Vector3Float& getLocationOfImpact() const; + void setLocationOfImpact(const Vector3Float& pX); - float getCollisionIntermediateResultXY() const; - void setCollisionIntermediateResultXY(float pX); + float getCollisionIntermediateResultXX() const; + void setCollisionIntermediateResultXX(float pX); - float getCollisionIntermediateResultXZ() const; - void setCollisionIntermediateResultXZ(float pX); + float getCollisionIntermediateResultXY() const; + void setCollisionIntermediateResultXY(float pX); - float getCollisionIntermediateResultYY() const; - void setCollisionIntermediateResultYY(float pX); + float getCollisionIntermediateResultXZ() const; + void setCollisionIntermediateResultXZ(float pX); - float getCollisionIntermediateResultYZ() const; - void setCollisionIntermediateResultYZ(float pX); + float getCollisionIntermediateResultYY() const; + void setCollisionIntermediateResultYY(float pX); - float getCollisionIntermediateResultZZ() const; - void setCollisionIntermediateResultZZ(float pX); + float getCollisionIntermediateResultYZ() const; + void setCollisionIntermediateResultYZ(float pX); - Vector3Float& getUnitSurfaceNormal(); - const Vector3Float& getUnitSurfaceNormal() const; - void setUnitSurfaceNormal(const Vector3Float &pX); + float getCollisionIntermediateResultZZ() const; + void setCollisionIntermediateResultZZ(float pX); - float getCoefficientOfRestitution() const; - void setCoefficientOfRestitution(float pX); + Vector3Float& getUnitSurfaceNormal(); + const Vector3Float& getUnitSurfaceNormal() const; + void setUnitSurfaceNormal(const Vector3Float& pX); + float getCoefficientOfRestitution() const; + void setCoefficientOfRestitution(float pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const CollisionElasticPdu& rhs) const; + bool operator==(const CollisionElasticPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -150,7 +166,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CollisionPdu.cpp b/src/dis7/CollisionPdu.cpp index 03b163b1..0c5bd675 100644 --- a/src/dis7/CollisionPdu.cpp +++ b/src/dis7/CollisionPdu.cpp @@ -2,196 +2,137 @@ using namespace DIS; - -CollisionPdu::CollisionPdu() : EntityInformationFamilyPdu(), - _issuingEntityID(), - _collidingEntityID(), - _eventID(), - _collisionType(0), - _pad(0), - _velocity(), - _mass(0.0), - _location() -{ - setPduType( 4 ); - setProtocolFamily( 1 ); +CollisionPdu::CollisionPdu() + : EntityInformationFamilyPdu(), + _issuingEntityID(), + _collidingEntityID(), + _eventID(), + _collisionType(0), + _pad(0), + _velocity(), + _mass(0.0), + _location() { + setPduType(4); + setProtocolFamily(1); } -CollisionPdu::~CollisionPdu() -{ -} +CollisionPdu::~CollisionPdu() {} -EntityID& CollisionPdu::getIssuingEntityID() -{ - return _issuingEntityID; -} +EntityID& CollisionPdu::getIssuingEntityID() { return _issuingEntityID; } -const EntityID& CollisionPdu::getIssuingEntityID() const -{ - return _issuingEntityID; +const EntityID& CollisionPdu::getIssuingEntityID() const { + return _issuingEntityID; } -void CollisionPdu::setIssuingEntityID(const EntityID &pX) -{ - _issuingEntityID = pX; +void CollisionPdu::setIssuingEntityID(const EntityID& pX) { + _issuingEntityID = pX; } -EntityID& CollisionPdu::getCollidingEntityID() -{ - return _collidingEntityID; -} +EntityID& CollisionPdu::getCollidingEntityID() { return _collidingEntityID; } -const EntityID& CollisionPdu::getCollidingEntityID() const -{ - return _collidingEntityID; +const EntityID& CollisionPdu::getCollidingEntityID() const { + return _collidingEntityID; } -void CollisionPdu::setCollidingEntityID(const EntityID &pX) -{ - _collidingEntityID = pX; +void CollisionPdu::setCollidingEntityID(const EntityID& pX) { + _collidingEntityID = pX; } -EventIdentifier& CollisionPdu::getEventID() -{ - return _eventID; -} +EventIdentifier& CollisionPdu::getEventID() { return _eventID; } -const EventIdentifier& CollisionPdu::getEventID() const -{ - return _eventID; -} +const EventIdentifier& CollisionPdu::getEventID() const { return _eventID; } -void CollisionPdu::setEventID(const EventIdentifier &pX) -{ - _eventID = pX; -} +void CollisionPdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -unsigned char CollisionPdu::getCollisionType() const -{ - return _collisionType; -} +unsigned char CollisionPdu::getCollisionType() const { return _collisionType; } -void CollisionPdu::setCollisionType(unsigned char pX) -{ - _collisionType = pX; -} +void CollisionPdu::setCollisionType(unsigned char pX) { _collisionType = pX; } -char CollisionPdu::getPad() const -{ - return _pad; -} +char CollisionPdu::getPad() const { return _pad; } -void CollisionPdu::setPad(char pX) -{ - _pad = pX; -} +void CollisionPdu::setPad(char pX) { _pad = pX; } -Vector3Float& CollisionPdu::getVelocity() -{ - return _velocity; -} +Vector3Float& CollisionPdu::getVelocity() { return _velocity; } -const Vector3Float& CollisionPdu::getVelocity() const -{ - return _velocity; -} +const Vector3Float& CollisionPdu::getVelocity() const { return _velocity; } -void CollisionPdu::setVelocity(const Vector3Float &pX) -{ - _velocity = pX; -} +void CollisionPdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -float CollisionPdu::getMass() const -{ - return _mass; -} +float CollisionPdu::getMass() const { return _mass; } -void CollisionPdu::setMass(float pX) -{ - _mass = pX; -} +void CollisionPdu::setMass(float pX) { _mass = pX; } -Vector3Float& CollisionPdu::getLocation() -{ - return _location; -} +Vector3Float& CollisionPdu::getLocation() { return _location; } -const Vector3Float& CollisionPdu::getLocation() const -{ - return _location; -} +const Vector3Float& CollisionPdu::getLocation() const { return _location; } + +void CollisionPdu::setLocation(const Vector3Float& pX) { _location = pX; } -void CollisionPdu::setLocation(const Vector3Float &pX) -{ - _location = pX; +void CollisionPdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _issuingEntityID.marshal(dataStream); + _collidingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _collisionType; + dataStream << _pad; + _velocity.marshal(dataStream); + dataStream << _mass; + _location.marshal(dataStream); } -void CollisionPdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _issuingEntityID.marshal(dataStream); - _collidingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _collisionType; - dataStream << _pad; - _velocity.marshal(dataStream); - dataStream << _mass; - _location.marshal(dataStream); +void CollisionPdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _issuingEntityID.unmarshal(dataStream); + _collidingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _collisionType; + dataStream >> _pad; + _velocity.unmarshal(dataStream); + dataStream >> _mass; + _location.unmarshal(dataStream); } -void CollisionPdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _issuingEntityID.unmarshal(dataStream); - _collidingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _collisionType; - dataStream >> _pad; - _velocity.unmarshal(dataStream); - dataStream >> _mass; - _location.unmarshal(dataStream); +bool CollisionPdu::operator==(const CollisionPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + + if (!(_issuingEntityID == rhs._issuingEntityID)) ivarsEqual = false; + if (!(_collidingEntityID == rhs._collidingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_collisionType == rhs._collisionType)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + if (!(_velocity == rhs._velocity)) ivarsEqual = false; + if (!(_mass == rhs._mass)) ivarsEqual = false; + if (!(_location == rhs._location)) ivarsEqual = false; + + return ivarsEqual; } +int CollisionPdu::getMarshalledSize() const { + int marshalSize = 0; -bool CollisionPdu::operator ==(const CollisionPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_issuingEntityID == rhs._issuingEntityID) ) ivarsEqual = false; - if( ! (_collidingEntityID == rhs._collidingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_collisionType == rhs._collisionType) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - if( ! (_velocity == rhs._velocity) ) ivarsEqual = false; - if( ! (_mass == rhs._mass) ) ivarsEqual = false; - if( ! (_location == rhs._location) ) ivarsEqual = false; - - return ivarsEqual; - } - -int CollisionPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID - marshalSize = marshalSize + _collidingEntityID.getMarshalledSize(); // _collidingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 1; // _collisionType - marshalSize = marshalSize + 1; // _pad - marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity - marshalSize = marshalSize + 4; // _mass - marshalSize = marshalSize + _location.getMarshalledSize(); // _location - return marshalSize; + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _issuingEntityID.getMarshalledSize(); // _issuingEntityID + marshalSize = marshalSize + + _collidingEntityID.getMarshalledSize(); // _collidingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 1; // _collisionType + marshalSize = marshalSize + 1; // _pad + marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity + marshalSize = marshalSize + 4; // _mass + marshalSize = marshalSize + _location.getMarshalledSize(); // _location + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -204,7 +145,7 @@ int CollisionPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CollisionPdu.h b/src/dis7/CollisionPdu.h index 7faf5d24..c32cdb9d 100644 --- a/src/dis7/CollisionPdu.h +++ b/src/dis7/CollisionPdu.h @@ -1,99 +1,106 @@ #pragma once #include -#include +#include #include #include -#include -#include -#include #include +#include +namespace DIS { +// Section 7.2.3 Collisions between entities shall be communicated by issuing a +// Collision PDU. COMPLETE -namespace DIS -{ -// Section 7.2.3 Collisions between entities shall be communicated by issuing a Collision PDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT CollisionPdu : public EntityInformationFamilyPdu -{ -protected: - /** This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */ - EntityID _issuingEntityID; +class OPENDIS7_EXPORT CollisionPdu : public EntityInformationFamilyPdu { + protected: + /** This field shall identify the entity that is issuing the PDU, and shall be + * represented by an Entity Identifier record (see 6.2.28). */ + EntityID _issuingEntityID; - /** This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28). */ - EntityID _collidingEntityID; + /** This field shall identify the entity that has collided with the issuing + * entity (see 5.3.3.4). This field shall be represented by an Entity + * Identifier record (see 6.2.28). */ + EntityID _collidingEntityID; - /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */ - EventIdentifier _eventID; + /** This field shall contain an identification generated by the issuing + * simulation application to associate related collision events. This field + * shall be represented by an Event Identifier record (see 6.2.34). */ + EventIdentifier _eventID; - /** This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations */ - unsigned char _collisionType; + /** This field shall identify the type of collision. The Collision Type field + * shall be represented by an 8-bit record of enumerations */ + unsigned char _collisionType; /** some padding */ - char _pad; - - /** This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]. */ - Vector3Float _velocity; + char _pad; - /** This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms. */ - float _mass; + /** This field shall contain the velocity (at the time the collision is + * detected) of the issuing entity. The velocity shall be represented in world + * coordinates. This field shall be represented by the Linear Velocity Vector + * record [see 6.2.95 item c)]. */ + Vector3Float _velocity; - /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */ - Vector3Float _location; + /** This field shall contain the mass of the issuing entity, and shall be + * represented by a 32-bit floating point number representing kilograms. */ + float _mass; + /** This field shall specify the location of the collision with respect to the + * entity with which the issuing entity collided. The Location field shall be + * represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */ + Vector3Float _location; public: - CollisionPdu(); - virtual ~CollisionPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + CollisionPdu(); + virtual ~CollisionPdu(); - EntityID& getIssuingEntityID(); - const EntityID& getIssuingEntityID() const; - void setIssuingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getCollidingEntityID(); - const EntityID& getCollidingEntityID() const; - void setCollidingEntityID(const EntityID &pX); + EntityID& getIssuingEntityID(); + const EntityID& getIssuingEntityID() const; + void setIssuingEntityID(const EntityID& pX); - EventIdentifier& getEventID(); - const EventIdentifier& getEventID() const; - void setEventID(const EventIdentifier &pX); + EntityID& getCollidingEntityID(); + const EntityID& getCollidingEntityID() const; + void setCollidingEntityID(const EntityID& pX); - unsigned char getCollisionType() const; - void setCollisionType(unsigned char pX); + EventIdentifier& getEventID(); + const EventIdentifier& getEventID() const; + void setEventID(const EventIdentifier& pX); - char getPad() const; - void setPad(char pX); + unsigned char getCollisionType() const; + void setCollisionType(unsigned char pX); - Vector3Float& getVelocity(); - const Vector3Float& getVelocity() const; - void setVelocity(const Vector3Float &pX); + char getPad() const; + void setPad(char pX); - float getMass() const; - void setMass(float pX); + Vector3Float& getVelocity(); + const Vector3Float& getVelocity() const; + void setVelocity(const Vector3Float& pX); - Vector3Float& getLocation(); - const Vector3Float& getLocation() const; - void setLocation(const Vector3Float &pX); + float getMass() const; + void setMass(float pX); + Vector3Float& getLocation(); + const Vector3Float& getLocation() const; + void setLocation(const Vector3Float& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const CollisionPdu& rhs) const; + bool operator==(const CollisionPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -106,7 +113,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CommentPdu.cpp b/src/dis7/CommentPdu.cpp index c79e16c7..bd8f1d9f 100644 --- a/src/dis7/CommentPdu.cpp +++ b/src/dis7/CommentPdu.cpp @@ -2,156 +2,127 @@ using namespace DIS; - -CommentPdu::CommentPdu() : SimulationManagementFamilyPdu(), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 22 ); +CommentPdu::CommentPdu() + : SimulationManagementFamilyPdu(), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(22); } -CommentPdu::~CommentPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +CommentPdu::~CommentPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int CommentPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int CommentPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int CommentPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int CommentPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& CommentPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& CommentPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& CommentPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& CommentPdu::getFixedDatums() const { + return _fixedDatums; } -void CommentPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void CommentPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& CommentPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& CommentPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& CommentPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& CommentPdu::getVariableDatums() const { + return _variableDatums; } -void CommentPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void CommentPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void CommentPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - +void CommentPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } + + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } -void CommentPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } +void CommentPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; + + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } + + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } } +bool CommentPdu::operator==(const CommentPdu& rhs) const { + bool ivarsEqual = true; -bool CommentPdu::operator ==(const CommentPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int CommentPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int CommentPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -164,7 +135,7 @@ int CommentPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CommentPdu.h b/src/dis7/CommentPdu.h index bdd2dab4..599e2bcf 100644 --- a/src/dis7/CommentPdu.h +++ b/src/dis7/CommentPdu.h @@ -1,68 +1,66 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Arbitrary messages can be entered into the data stream via use of this PDU. +// Section 7.5.13 COMPLETE -namespace DIS -{ -// Arbitrary messages can be entered into the data stream via use of this PDU. Section 7.5.13 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT CommentPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT CommentPdu : public SimulationManagementFamilyPdu { + protected: /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - CommentPdu(); - virtual ~CommentPdu(); + CommentPdu(); + virtual ~CommentPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CommentPdu& rhs) const; + bool operator==(const CommentPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -75,7 +73,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CommentReliablePdu.cpp b/src/dis7/CommentReliablePdu.cpp index f5afc2b6..6b7cbf2d 100644 --- a/src/dis7/CommentReliablePdu.cpp +++ b/src/dis7/CommentReliablePdu.cpp @@ -2,156 +2,136 @@ using namespace DIS; - -CommentReliablePdu::CommentReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 62 ); +CommentReliablePdu::CommentReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(62); } -CommentReliablePdu::~CommentReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +CommentReliablePdu::~CommentReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned int CommentReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int CommentReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int CommentReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int CommentReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& CommentReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& CommentReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& CommentReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& CommentReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void CommentReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void CommentReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& CommentReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& CommentReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& CommentReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& CommentReliablePdu::getVariableDatumRecords() + const { + return _variableDatumRecords; } -void CommentReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void CommentReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void CommentReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - +void CommentReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } + + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void CommentReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } - - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } +void CommentReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; + + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } + + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool CommentReliablePdu::operator==(const CommentReliablePdu& rhs) const { + bool ivarsEqual = true; -bool CommentReliablePdu::operator ==(const CommentReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int CommentReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int CommentReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -164,7 +144,7 @@ int CommentReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CommentReliablePdu.h b/src/dis7/CommentReliablePdu.h index 5d67d7d5..5df8e422 100644 --- a/src/dis7/CommentReliablePdu.h +++ b/src/dis7/CommentReliablePdu.h @@ -1,68 +1,67 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual +// intervention to fix padding in variable datums. UNFINISHED -namespace DIS -{ -// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual intervention to fix padding in variable datums. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT CommentReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT CommentReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - CommentReliablePdu(); - virtual ~CommentReliablePdu(); + CommentReliablePdu(); + virtual ~CommentReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CommentReliablePdu& rhs) const; + bool operator==(const CommentReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -75,7 +74,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CommunicationsNodeID.cpp b/src/dis7/CommunicationsNodeID.cpp index 198f503b..39e87b36 100644 --- a/src/dis7/CommunicationsNodeID.cpp +++ b/src/dis7/CommunicationsNodeID.cpp @@ -2,79 +2,52 @@ using namespace DIS; +CommunicationsNodeID::CommunicationsNodeID() : _entityID(), _elementID(0) {} -CommunicationsNodeID::CommunicationsNodeID(): - _entityID(), - _elementID(0) -{ -} +CommunicationsNodeID::~CommunicationsNodeID() {} -CommunicationsNodeID::~CommunicationsNodeID() -{ -} +EntityID& CommunicationsNodeID::getEntityID() { return _entityID; } -EntityID& CommunicationsNodeID::getEntityID() -{ - return _entityID; -} - -const EntityID& CommunicationsNodeID::getEntityID() const -{ - return _entityID; -} +const EntityID& CommunicationsNodeID::getEntityID() const { return _entityID; } -void CommunicationsNodeID::setEntityID(const EntityID &pX) -{ - _entityID = pX; -} +void CommunicationsNodeID::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned short CommunicationsNodeID::getElementID() const -{ - return _elementID; -} +unsigned short CommunicationsNodeID::getElementID() const { return _elementID; } -void CommunicationsNodeID::setElementID(unsigned short pX) -{ - _elementID = pX; -} +void CommunicationsNodeID::setElementID(unsigned short pX) { _elementID = pX; } -void CommunicationsNodeID::marshal(DataStream& dataStream) const -{ - _entityID.marshal(dataStream); - dataStream << _elementID; +void CommunicationsNodeID::marshal(DataStream& dataStream) const { + _entityID.marshal(dataStream); + dataStream << _elementID; } -void CommunicationsNodeID::unmarshal(DataStream& dataStream) -{ - _entityID.unmarshal(dataStream); - dataStream >> _elementID; +void CommunicationsNodeID::unmarshal(DataStream& dataStream) { + _entityID.unmarshal(dataStream); + dataStream >> _elementID; } +bool CommunicationsNodeID::operator==(const CommunicationsNodeID& rhs) const { + bool ivarsEqual = true; -bool CommunicationsNodeID::operator ==(const CommunicationsNodeID& rhs) const - { - bool ivarsEqual = true; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; + if (!(_elementID == rhs._elementID)) ivarsEqual = false; - if( ! (_entityID == rhs._entityID) ) ivarsEqual = false; - if( ! (_elementID == rhs._elementID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int CommunicationsNodeID::getMarshalledSize() const -{ - int marshalSize = 0; +int CommunicationsNodeID::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID - marshalSize = marshalSize + 2; // _elementID - return marshalSize; + marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID + marshalSize = marshalSize + 2; // _elementID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +60,7 @@ int CommunicationsNodeID::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CommunicationsNodeID.h b/src/dis7/CommunicationsNodeID.h index e83220e7..6f7b7553 100644 --- a/src/dis7/CommunicationsNodeID.h +++ b/src/dis7/CommunicationsNodeID.h @@ -1,52 +1,48 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Identity of a communications node. Section 6.2.49.4 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT CommunicationsNodeID -{ -protected: - EntityID _entityID; - - unsigned short _elementID; +class OPENDIS7_EXPORT CommunicationsNodeID { + protected: + EntityID _entityID; + unsigned short _elementID; public: - CommunicationsNodeID(); - virtual ~CommunicationsNodeID(); + CommunicationsNodeID(); + virtual ~CommunicationsNodeID(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEntityID(); - const EntityID& getEntityID() const; - void setEntityID(const EntityID &pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); - unsigned short getElementID() const; - void setElementID(unsigned short pX); + unsigned short getElementID() const; + void setElementID(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CommunicationsNodeID& rhs) const; + bool operator==(const CommunicationsNodeID& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CreateEntityPdu.cpp b/src/dis7/CreateEntityPdu.cpp index c3f14f14..36689353 100644 --- a/src/dis7/CreateEntityPdu.cpp +++ b/src/dis7/CreateEntityPdu.cpp @@ -2,105 +2,80 @@ using namespace DIS; - -CreateEntityPdu::CreateEntityPdu() : SimulationManagementFamilyPdu(), - _originatingID(), - _receivingID(), - _requestID(0) -{ - setPduType( 11 ); +CreateEntityPdu::CreateEntityPdu() + : SimulationManagementFamilyPdu(), + _originatingID(), + _receivingID(), + _requestID(0) { + setPduType(11); } -CreateEntityPdu::~CreateEntityPdu() -{ -} +CreateEntityPdu::~CreateEntityPdu() {} -EntityID& CreateEntityPdu::getOriginatingID() -{ - return _originatingID; -} +EntityID& CreateEntityPdu::getOriginatingID() { return _originatingID; } -const EntityID& CreateEntityPdu::getOriginatingID() const -{ - return _originatingID; +const EntityID& CreateEntityPdu::getOriginatingID() const { + return _originatingID; } -void CreateEntityPdu::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; +void CreateEntityPdu::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -EntityID& CreateEntityPdu::getReceivingID() -{ - return _receivingID; -} +EntityID& CreateEntityPdu::getReceivingID() { return _receivingID; } -const EntityID& CreateEntityPdu::getReceivingID() const -{ - return _receivingID; -} +const EntityID& CreateEntityPdu::getReceivingID() const { return _receivingID; } -void CreateEntityPdu::setReceivingID(const EntityID &pX) -{ - _receivingID = pX; -} +void CreateEntityPdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned int CreateEntityPdu::getRequestID() const -{ - return _requestID; -} +unsigned int CreateEntityPdu::getRequestID() const { return _requestID; } -void CreateEntityPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void CreateEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } -void CreateEntityPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingID.marshal(dataStream); - _receivingID.marshal(dataStream); - dataStream << _requestID; +void CreateEntityPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingID.marshal(dataStream); + _receivingID.marshal(dataStream); + dataStream << _requestID; } -void CreateEntityPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - dataStream >> _requestID; +void CreateEntityPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + dataStream >> _requestID; } +bool CreateEntityPdu::operator==(const CreateEntityPdu& rhs) const { + bool ivarsEqual = true; -bool CreateEntityPdu::operator ==(const CreateEntityPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int CreateEntityPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int CreateEntityPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -113,7 +88,7 @@ int CreateEntityPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CreateEntityPdu.h b/src/dis7/CreateEntityPdu.h index 7b72aacc..b8d7c162 100644 --- a/src/dis7/CreateEntityPdu.h +++ b/src/dis7/CreateEntityPdu.h @@ -1,63 +1,58 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 7.5.2. Create a new entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for the request */ - EntityID _originatingID; + EntityID _originatingID; /** Identifier for the request */ - EntityID _receivingID; + EntityID _receivingID; /** Identifier for the request. See 6.2.75 */ - unsigned int _requestID; - + unsigned int _requestID; public: - CreateEntityPdu(); - virtual ~CreateEntityPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + CreateEntityPdu(); + virtual ~CreateEntityPdu(); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingID(); - const EntityID& getReceivingID() const; - void setReceivingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + EntityID& getReceivingID(); + const EntityID& getReceivingID() const; + void setReceivingID(const EntityID& pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const CreateEntityPdu& rhs) const; + bool operator==(const CreateEntityPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -70,7 +65,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CreateEntityReliablePdu.cpp b/src/dis7/CreateEntityReliablePdu.cpp index 51c1eb4e..6b684a27 100644 --- a/src/dis7/CreateEntityReliablePdu.cpp +++ b/src/dis7/CreateEntityReliablePdu.cpp @@ -2,110 +2,89 @@ using namespace DIS; - -CreateEntityReliablePdu::CreateEntityReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0) -{ - setPduType( 51 ); +CreateEntityReliablePdu::CreateEntityReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0) { + setPduType(51); } -CreateEntityReliablePdu::~CreateEntityReliablePdu() -{ -} +CreateEntityReliablePdu::~CreateEntityReliablePdu() {} -unsigned char CreateEntityReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char CreateEntityReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void CreateEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void CreateEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short CreateEntityReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short CreateEntityReliablePdu::getPad1() const { return _pad1; } -void CreateEntityReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void CreateEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char CreateEntityReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char CreateEntityReliablePdu::getPad2() const { return _pad2; } -void CreateEntityReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void CreateEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int CreateEntityReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int CreateEntityReliablePdu::getRequestID() const { + return _requestID; } -void CreateEntityReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void CreateEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void CreateEntityReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; +void CreateEntityReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; } -void CreateEntityReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; +void CreateEntityReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; } +bool CreateEntityReliablePdu::operator==( + const CreateEntityReliablePdu& rhs) const { + bool ivarsEqual = true; -bool CreateEntityReliablePdu::operator ==(const CreateEntityReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int CreateEntityReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int CreateEntityReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -118,7 +97,7 @@ int CreateEntityReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/CreateEntityReliablePdu.h b/src/dis7/CreateEntityReliablePdu.h index a74885fa..53498ec5 100644 --- a/src/dis7/CreateEntityReliablePdu.h +++ b/src/dis7/CreateEntityReliablePdu.h @@ -1,65 +1,62 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.1: creation of an entity , reliable. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT CreateEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT CreateEntityReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - CreateEntityReliablePdu(); - virtual ~CreateEntityReliablePdu(); + CreateEntityReliablePdu(); + virtual ~CreateEntityReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const CreateEntityReliablePdu& rhs) const; + bool operator==(const CreateEntityReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -72,7 +69,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataPdu.cpp b/src/dis7/DataPdu.cpp index 51eb0c39..c8b210cd 100644 --- a/src/dis7/DataPdu.cpp +++ b/src/dis7/DataPdu.cpp @@ -2,186 +2,146 @@ using namespace DIS; - -DataPdu::DataPdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _padding1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 20 ); +DataPdu::DataPdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _padding1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(20); } -DataPdu::~DataPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +DataPdu::~DataPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int DataPdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataPdu::getRequestID() const { return _requestID; } -void DataPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int DataPdu::getPadding1() const -{ - return _padding1; -} +unsigned int DataPdu::getPadding1() const { return _padding1; } -void DataPdu::setPadding1(unsigned int pX) -{ - _padding1 = pX; -} +void DataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } -unsigned int DataPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int DataPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int DataPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int DataPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& DataPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& DataPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& DataPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& DataPdu::getFixedDatums() const { + return _fixedDatums; } -void DataPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void DataPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& DataPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& DataPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& DataPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& DataPdu::getVariableDatums() const { + return _variableDatums; } -void DataPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void DataPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void DataPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _padding1; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void DataPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _padding1; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void DataPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _padding1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void DataPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _padding1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool DataPdu::operator ==(const DataPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool DataPdu::operator==(const DataPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int DataPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _padding1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int DataPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _padding1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +154,7 @@ int DataPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataPdu.h b/src/dis7/DataPdu.h index 5e430061..8dc4719f 100644 --- a/src/dis7/DataPdu.h +++ b/src/dis7/DataPdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Information issued in response to a data query pdu or a set data pdu is +// communicated using a data pdu. Section 7.5.11 COMPLETE -namespace DIS -{ -// Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu. Section 7.5.11 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DataPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT DataPdu : public SimulationManagementFamilyPdu { + protected: /** ID of request */ - unsigned int _requestID; + unsigned int _requestID; /** padding */ - unsigned int _padding1; + unsigned int _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - DataPdu(); - virtual ~DataPdu(); + DataPdu(); + virtual ~DataPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + unsigned int getPadding1() const; + void setPadding1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataPdu& rhs) const; + bool operator==(const DataPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataQueryDatumSpecification.cpp b/src/dis7/DataQueryDatumSpecification.cpp index b9ec943b..d20c754b 100644 --- a/src/dis7/DataQueryDatumSpecification.cpp +++ b/src/dis7/DataQueryDatumSpecification.cpp @@ -2,150 +2,127 @@ using namespace DIS; +DataQueryDatumSpecification::DataQueryDatumSpecification() + : _numberOfFixedDatums(0), _numberOfVariableDatums(0) {} -DataQueryDatumSpecification::DataQueryDatumSpecification(): - _numberOfFixedDatums(0), - _numberOfVariableDatums(0) -{ +DataQueryDatumSpecification::~DataQueryDatumSpecification() { + _fixedDatumIDList.clear(); + _variableDatumIDList.clear(); } -DataQueryDatumSpecification::~DataQueryDatumSpecification() -{ - _fixedDatumIDList.clear(); - _variableDatumIDList.clear(); +unsigned int DataQueryDatumSpecification::getNumberOfFixedDatums() const { + return _fixedDatumIDList.size(); } -unsigned int DataQueryDatumSpecification::getNumberOfFixedDatums() const -{ - return _fixedDatumIDList.size(); +unsigned int DataQueryDatumSpecification::getNumberOfVariableDatums() const { + return _variableDatumIDList.size(); } -unsigned int DataQueryDatumSpecification::getNumberOfVariableDatums() const -{ - return _variableDatumIDList.size(); +std::vector& +DataQueryDatumSpecification::getFixedDatumIDList() { + return _fixedDatumIDList; } -std::vector& DataQueryDatumSpecification::getFixedDatumIDList() -{ - return _fixedDatumIDList; +const std::vector& +DataQueryDatumSpecification::getFixedDatumIDList() const { + return _fixedDatumIDList; } -const std::vector& DataQueryDatumSpecification::getFixedDatumIDList() const -{ - return _fixedDatumIDList; +void DataQueryDatumSpecification::setFixedDatumIDList( + const std::vector& pX) { + _fixedDatumIDList = pX; } -void DataQueryDatumSpecification::setFixedDatumIDList(const std::vector& pX) -{ - _fixedDatumIDList = pX; +std::vector& +DataQueryDatumSpecification::getVariableDatumIDList() { + return _variableDatumIDList; } -std::vector& DataQueryDatumSpecification::getVariableDatumIDList() -{ - return _variableDatumIDList; +const std::vector& +DataQueryDatumSpecification::getVariableDatumIDList() const { + return _variableDatumIDList; } -const std::vector& DataQueryDatumSpecification::getVariableDatumIDList() const -{ - return _variableDatumIDList; +void DataQueryDatumSpecification::setVariableDatumIDList( + const std::vector& pX) { + _variableDatumIDList = pX; } -void DataQueryDatumSpecification::setVariableDatumIDList(const std::vector& pX) -{ - _variableDatumIDList = pX; -} - -void DataQueryDatumSpecification::marshal(DataStream& dataStream) const -{ - dataStream << ( unsigned int )_fixedDatumIDList.size(); - dataStream << ( unsigned int )_variableDatumIDList.size(); - - for(size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) - { - UnsignedDISInteger x = _fixedDatumIDList[idx]; - x.marshal(dataStream); - } +void DataQueryDatumSpecification::marshal(DataStream& dataStream) const { + dataStream << (unsigned int)_fixedDatumIDList.size(); + dataStream << (unsigned int)_variableDatumIDList.size(); + for (size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { + UnsignedDISInteger x = _fixedDatumIDList[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumIDList.size(); idx++) - { - UnsignedDISInteger x = _variableDatumIDList[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumIDList.size(); idx++) { + UnsignedDISInteger x = _variableDatumIDList[idx]; + x.marshal(dataStream); + } } -void DataQueryDatumSpecification::unmarshal(DataStream& dataStream) -{ - dataStream >> _numberOfFixedDatums; - dataStream >> _numberOfVariableDatums; - - _fixedDatumIDList.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatums; idx++) - { - UnsignedDISInteger x; - x.unmarshal(dataStream); - _fixedDatumIDList.push_back(x); - } - - _variableDatumIDList.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatums; idx++) - { - UnsignedDISInteger x; - x.unmarshal(dataStream); - _variableDatumIDList.push_back(x); - } +void DataQueryDatumSpecification::unmarshal(DataStream& dataStream) { + dataStream >> _numberOfFixedDatums; + dataStream >> _numberOfVariableDatums; + + _fixedDatumIDList.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatums; idx++) { + UnsignedDISInteger x; + x.unmarshal(dataStream); + _fixedDatumIDList.push_back(x); + } + + _variableDatumIDList.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatums; idx++) { + UnsignedDISInteger x; + x.unmarshal(dataStream); + _variableDatumIDList.push_back(x); + } } +bool DataQueryDatumSpecification::operator==( + const DataQueryDatumSpecification& rhs) const { + bool ivarsEqual = true; -bool DataQueryDatumSpecification::operator ==(const DataQueryDatumSpecification& rhs) const - { - bool ivarsEqual = true; - + for (size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { + if (!(_fixedDatumIDList[idx] == rhs._fixedDatumIDList[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) - { - if( ! ( _fixedDatumIDList[idx] == rhs._fixedDatumIDList[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumIDList.size(); idx++) { + if (!(_variableDatumIDList[idx] == rhs._variableDatumIDList[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(size_t idx = 0; idx < _variableDatumIDList.size(); idx++) - { - if( ! ( _variableDatumIDList[idx] == rhs._variableDatumIDList[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int DataQueryDatumSpecification::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _numberOfFixedDatums - marshalSize = marshalSize + 4; // _numberOfVariableDatums +int DataQueryDatumSpecification::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumIDList.size(); idx++) - { - UnsignedDISInteger listElement = _fixedDatumIDList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = marshalSize + 4; // _numberOfFixedDatums + marshalSize = marshalSize + 4; // _numberOfVariableDatums + for (unsigned long long idx = 0; idx < _fixedDatumIDList.size(); idx++) { + UnsignedDISInteger listElement = _fixedDatumIDList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumIDList.size(); idx++) - { - UnsignedDISInteger listElement = _variableDatumIDList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumIDList.size(); idx++) { + UnsignedDISInteger listElement = _variableDatumIDList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -158,7 +135,7 @@ int DataQueryDatumSpecification::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataQueryDatumSpecification.h b/src/dis7/DataQueryDatumSpecification.h index 924430c9..25e6f601 100644 --- a/src/dis7/DataQueryDatumSpecification.h +++ b/src/dis7/DataQueryDatumSpecification.h @@ -1,67 +1,63 @@ #pragma once -#include -#include #include -#include -#include +#include +#include +#include -namespace DIS -{ -// List of fixed and variable datum records. Section 6.2.18 +namespace DIS { +// List of fixed and variable datum records. Section 6.2.18 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DataQueryDatumSpecification -{ -protected: +class OPENDIS7_EXPORT DataQueryDatumSpecification { + protected: /** Number of fixed datums */ - unsigned int _numberOfFixedDatums; + unsigned int _numberOfFixedDatums; /** Number of variable datums */ - unsigned int _numberOfVariableDatums; + unsigned int _numberOfVariableDatums; /** variable length list fixed datum IDs */ - std::vector _fixedDatumIDList; + std::vector _fixedDatumIDList; /** variable length list variable datum IDs */ - std::vector _variableDatumIDList; - + std::vector _variableDatumIDList; public: - DataQueryDatumSpecification(); - virtual ~DataQueryDatumSpecification(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DataQueryDatumSpecification(); + virtual ~DataQueryDatumSpecification(); - unsigned int getNumberOfFixedDatums() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfVariableDatums() const; + unsigned int getNumberOfFixedDatums() const; - std::vector& getFixedDatumIDList(); - const std::vector& getFixedDatumIDList() const; - void setFixedDatumIDList(const std::vector& pX); + unsigned int getNumberOfVariableDatums() const; - std::vector& getVariableDatumIDList(); - const std::vector& getVariableDatumIDList() const; - void setVariableDatumIDList(const std::vector& pX); + std::vector& getFixedDatumIDList(); + const std::vector& getFixedDatumIDList() const; + void setFixedDatumIDList(const std::vector& pX); + std::vector& getVariableDatumIDList(); + const std::vector& getVariableDatumIDList() const; + void setVariableDatumIDList(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DataQueryDatumSpecification& rhs) const; + bool operator==(const DataQueryDatumSpecification& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -74,7 +70,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataQueryPdu.cpp b/src/dis7/DataQueryPdu.cpp index 212125e1..0b1aa951 100644 --- a/src/dis7/DataQueryPdu.cpp +++ b/src/dis7/DataQueryPdu.cpp @@ -2,186 +2,146 @@ using namespace DIS; - -DataQueryPdu::DataQueryPdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _timeInterval(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 18 ); +DataQueryPdu::DataQueryPdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _timeInterval(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(18); } -DataQueryPdu::~DataQueryPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +DataQueryPdu::~DataQueryPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int DataQueryPdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataQueryPdu::getRequestID() const { return _requestID; } -void DataQueryPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataQueryPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int DataQueryPdu::getTimeInterval() const -{ - return _timeInterval; -} +unsigned int DataQueryPdu::getTimeInterval() const { return _timeInterval; } -void DataQueryPdu::setTimeInterval(unsigned int pX) -{ - _timeInterval = pX; -} +void DataQueryPdu::setTimeInterval(unsigned int pX) { _timeInterval = pX; } -unsigned int DataQueryPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int DataQueryPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int DataQueryPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int DataQueryPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& DataQueryPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& DataQueryPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& DataQueryPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& DataQueryPdu::getFixedDatums() const { + return _fixedDatums; } -void DataQueryPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void DataQueryPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& DataQueryPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& DataQueryPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& DataQueryPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& DataQueryPdu::getVariableDatums() const { + return _variableDatums; } -void DataQueryPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void DataQueryPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void DataQueryPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _timeInterval; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void DataQueryPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _timeInterval; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void DataQueryPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _timeInterval; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void DataQueryPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _timeInterval; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool DataQueryPdu::operator ==(const DataQueryPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_timeInterval == rhs._timeInterval) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool DataQueryPdu::operator==(const DataQueryPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_timeInterval == rhs._timeInterval)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int DataQueryPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _timeInterval - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int DataQueryPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _timeInterval + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +154,7 @@ int DataQueryPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataQueryPdu.h b/src/dis7/DataQueryPdu.h index b6042fe1..2195c1fb 100644 --- a/src/dis7/DataQueryPdu.h +++ b/src/dis7/DataQueryPdu.h @@ -1,80 +1,77 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 7.5.9. Request for data from an entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu { + protected: /** ID of request */ - unsigned int _requestID; + unsigned int _requestID; /** time issues between issues of Data PDUs. Zero means send once only. */ - unsigned int _timeInterval; + unsigned int _timeInterval; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - DataQueryPdu(); - virtual ~DataQueryPdu(); + DataQueryPdu(); + virtual ~DataQueryPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + unsigned int getTimeInterval() const; + void setTimeInterval(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataQueryPdu& rhs) const; + bool operator==(const DataQueryPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataQueryReliablePdu.cpp b/src/dis7/DataQueryReliablePdu.cpp index e89dd005..a1752ed5 100644 --- a/src/dis7/DataQueryReliablePdu.cpp +++ b/src/dis7/DataQueryReliablePdu.cpp @@ -2,231 +2,191 @@ using namespace DIS; - -DataQueryReliablePdu::DataQueryReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0), - _timeInterval(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 58 ); +DataQueryReliablePdu::DataQueryReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0), + _timeInterval(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(58); } -DataQueryReliablePdu::~DataQueryReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +DataQueryReliablePdu::~DataQueryReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned char DataQueryReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char DataQueryReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void DataQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void DataQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short DataQueryReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short DataQueryReliablePdu::getPad1() const { return _pad1; } -void DataQueryReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void DataQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char DataQueryReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char DataQueryReliablePdu::getPad2() const { return _pad2; } -void DataQueryReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void DataQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int DataQueryReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataQueryReliablePdu::getRequestID() const { return _requestID; } -void DataQueryReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int DataQueryReliablePdu::getTimeInterval() const -{ - return _timeInterval; +unsigned int DataQueryReliablePdu::getTimeInterval() const { + return _timeInterval; } -void DataQueryReliablePdu::setTimeInterval(unsigned int pX) -{ - _timeInterval = pX; +void DataQueryReliablePdu::setTimeInterval(unsigned int pX) { + _timeInterval = pX; } -unsigned int DataQueryReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int DataQueryReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int DataQueryReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int DataQueryReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& DataQueryReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& DataQueryReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& DataQueryReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& DataQueryReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void DataQueryReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void DataQueryReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& DataQueryReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& DataQueryReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& DataQueryReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +DataQueryReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void DataQueryReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void DataQueryReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void DataQueryReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; - dataStream << _timeInterval; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); +void DataQueryReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; + dataStream << _timeInterval; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void DataQueryReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; - dataStream >> _timeInterval; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void DataQueryReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; + dataStream >> _timeInterval; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool DataQueryReliablePdu::operator==(const DataQueryReliablePdu& rhs) const { + bool ivarsEqual = true; -bool DataQueryReliablePdu::operator ==(const DataQueryReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_timeInterval == rhs._timeInterval) ) ivarsEqual = false; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_timeInterval == rhs._timeInterval)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int DataQueryReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _timeInterval - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int DataQueryReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _timeInterval + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - return marshalSize; + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -239,7 +199,7 @@ int DataQueryReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataQueryReliablePdu.h b/src/dis7/DataQueryReliablePdu.h index 04890920..190c28ae 100644 --- a/src/dis7/DataQueryReliablePdu.h +++ b/src/dis7/DataQueryReliablePdu.h @@ -1,98 +1,96 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.8: request for data from an entity. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DataQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT DataQueryReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** time interval between issuing data query PDUs */ - unsigned int _timeInterval; + unsigned int _timeInterval; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - DataQueryReliablePdu(); - virtual ~DataQueryReliablePdu(); + DataQueryReliablePdu(); + virtual ~DataQueryReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + unsigned int getTimeInterval() const; + void setTimeInterval(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataQueryReliablePdu& rhs) const; + bool operator==(const DataQueryReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +103,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataReliablePdu.cpp b/src/dis7/DataReliablePdu.cpp index b5c4cdf0..c73c519a 100644 --- a/src/dis7/DataReliablePdu.cpp +++ b/src/dis7/DataReliablePdu.cpp @@ -2,216 +2,176 @@ using namespace DIS; - -DataReliablePdu::DataReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requestID(0), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 60 ); +DataReliablePdu::DataReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requestID(0), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(60); } -DataReliablePdu::~DataReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +DataReliablePdu::~DataReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned int DataReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int DataReliablePdu::getRequestID() const { return _requestID; } -void DataReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void DataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned char DataReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char DataReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void DataReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void DataReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short DataReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short DataReliablePdu::getPad1() const { return _pad1; } -void DataReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void DataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char DataReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char DataReliablePdu::getPad2() const { return _pad2; } -void DataReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void DataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int DataReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int DataReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int DataReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int DataReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& DataReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& DataReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& DataReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& DataReliablePdu::getFixedDatumRecords() const { + return _fixedDatumRecords; } -void DataReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void DataReliablePdu::setFixedDatumRecords(const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& DataReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& DataReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& DataReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& DataReliablePdu::getVariableDatumRecords() + const { + return _variableDatumRecords; } -void DataReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void DataReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void DataReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void DataReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void DataReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void DataReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool DataReliablePdu::operator==(const DataReliablePdu& rhs) const { + bool ivarsEqual = true; -bool DataReliablePdu::operator ==(const DataReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } - -int DataReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int DataReliablePdu::getMarshalledSize() const { + int marshalSize = 0; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -224,7 +184,7 @@ int DataReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DataReliablePdu.h b/src/dis7/DataReliablePdu.h index 34af78b0..e1738acb 100644 --- a/src/dis7/DataReliablePdu.h +++ b/src/dis7/DataReliablePdu.h @@ -1,92 +1,91 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. +// Needs manual intervention to fix padding on variable datums. UNFINSIHED -namespace DIS -{ -// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. Needs manual intervention to fix padding on variable datums. UNFINSIHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT DataReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** Request ID */ - unsigned int _requestID; + unsigned int _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - DataReliablePdu(); - virtual ~DataReliablePdu(); + DataReliablePdu(); + virtual ~DataReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DataReliablePdu& rhs) const; + bool operator==(const DataReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -99,7 +98,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DatumSpecification.cpp b/src/dis7/DatumSpecification.cpp index a0778dc5..f9811786 100644 --- a/src/dis7/DatumSpecification.cpp +++ b/src/dis7/DatumSpecification.cpp @@ -2,150 +2,123 @@ using namespace DIS; +DatumSpecification::DatumSpecification() + : _numberOfFixedDatums(0), _numberOfVariableDatums(0) {} -DatumSpecification::DatumSpecification(): - _numberOfFixedDatums(0), - _numberOfVariableDatums(0) -{ +DatumSpecification::~DatumSpecification() { + _fixedDatumIDList.clear(); + _variableDatumIDList.clear(); } -DatumSpecification::~DatumSpecification() -{ - _fixedDatumIDList.clear(); - _variableDatumIDList.clear(); +unsigned int DatumSpecification::getNumberOfFixedDatums() const { + return _fixedDatumIDList.size(); } -unsigned int DatumSpecification::getNumberOfFixedDatums() const -{ - return _fixedDatumIDList.size(); +unsigned int DatumSpecification::getNumberOfVariableDatums() const { + return _variableDatumIDList.size(); } -unsigned int DatumSpecification::getNumberOfVariableDatums() const -{ - return _variableDatumIDList.size(); +std::vector& DatumSpecification::getFixedDatumIDList() { + return _fixedDatumIDList; } -std::vector& DatumSpecification::getFixedDatumIDList() -{ - return _fixedDatumIDList; +const std::vector& DatumSpecification::getFixedDatumIDList() const { + return _fixedDatumIDList; } -const std::vector& DatumSpecification::getFixedDatumIDList() const -{ - return _fixedDatumIDList; +void DatumSpecification::setFixedDatumIDList( + const std::vector& pX) { + _fixedDatumIDList = pX; } -void DatumSpecification::setFixedDatumIDList(const std::vector& pX) -{ - _fixedDatumIDList = pX; +std::vector& DatumSpecification::getVariableDatumIDList() { + return _variableDatumIDList; } -std::vector& DatumSpecification::getVariableDatumIDList() -{ - return _variableDatumIDList; +const std::vector& DatumSpecification::getVariableDatumIDList() + const { + return _variableDatumIDList; } -const std::vector& DatumSpecification::getVariableDatumIDList() const -{ - return _variableDatumIDList; +void DatumSpecification::setVariableDatumIDList( + const std::vector& pX) { + _variableDatumIDList = pX; } -void DatumSpecification::setVariableDatumIDList(const std::vector& pX) -{ - _variableDatumIDList = pX; -} - -void DatumSpecification::marshal(DataStream& dataStream) const -{ - dataStream << ( unsigned int )_fixedDatumIDList.size(); - dataStream << ( unsigned int )_variableDatumIDList.size(); - - for(size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) - { - FixedDatum x = _fixedDatumIDList[idx]; - x.marshal(dataStream); - } +void DatumSpecification::marshal(DataStream& dataStream) const { + dataStream << (unsigned int)_fixedDatumIDList.size(); + dataStream << (unsigned int)_variableDatumIDList.size(); + for (size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { + FixedDatum x = _fixedDatumIDList[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumIDList.size(); idx++) - { - VariableDatum x = _variableDatumIDList[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumIDList.size(); idx++) { + VariableDatum x = _variableDatumIDList[idx]; + x.marshal(dataStream); + } } -void DatumSpecification::unmarshal(DataStream& dataStream) -{ - dataStream >> _numberOfFixedDatums; - dataStream >> _numberOfVariableDatums; - - _fixedDatumIDList.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatums; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumIDList.push_back(x); - } - - _variableDatumIDList.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatums; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumIDList.push_back(x); - } +void DatumSpecification::unmarshal(DataStream& dataStream) { + dataStream >> _numberOfFixedDatums; + dataStream >> _numberOfVariableDatums; + + _fixedDatumIDList.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatums; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumIDList.push_back(x); + } + + _variableDatumIDList.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatums; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumIDList.push_back(x); + } } +bool DatumSpecification::operator==(const DatumSpecification& rhs) const { + bool ivarsEqual = true; -bool DatumSpecification::operator ==(const DatumSpecification& rhs) const - { - bool ivarsEqual = true; - + for (size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { + if (!(_fixedDatumIDList[idx] == rhs._fixedDatumIDList[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) - { - if( ! ( _fixedDatumIDList[idx] == rhs._fixedDatumIDList[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumIDList.size(); idx++) { + if (!(_variableDatumIDList[idx] == rhs._variableDatumIDList[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(size_t idx = 0; idx < _variableDatumIDList.size(); idx++) - { - if( ! ( _variableDatumIDList[idx] == rhs._variableDatumIDList[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int DatumSpecification::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _numberOfFixedDatums - marshalSize = marshalSize + 4; // _numberOfVariableDatums +int DatumSpecification::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumIDList.size(); idx++) - { - FixedDatum listElement = _fixedDatumIDList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = marshalSize + 4; // _numberOfFixedDatums + marshalSize = marshalSize + 4; // _numberOfVariableDatums + for (unsigned long long idx = 0; idx < _fixedDatumIDList.size(); idx++) { + FixedDatum listElement = _fixedDatumIDList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumIDList.size(); idx++) - { - VariableDatum listElement = _variableDatumIDList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumIDList.size(); idx++) { + VariableDatum listElement = _variableDatumIDList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -158,7 +131,7 @@ int DatumSpecification::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DatumSpecification.h b/src/dis7/DatumSpecification.h index 8209073e..de8dfa98 100644 --- a/src/dis7/DatumSpecification.h +++ b/src/dis7/DatumSpecification.h @@ -1,67 +1,64 @@ #pragma once +#include + #include #include -#include -#include #include +#include +namespace DIS { +// List of fixed and variable datum records. Section 6.2.19 -namespace DIS -{ -// List of fixed and variable datum records. Section 6.2.19 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DatumSpecification -{ -protected: +class OPENDIS7_EXPORT DatumSpecification { + protected: /** Number of fixed datums */ - unsigned int _numberOfFixedDatums; + unsigned int _numberOfFixedDatums; /** Number of variable datums */ - unsigned int _numberOfVariableDatums; + unsigned int _numberOfVariableDatums; /** variable length list fixed datums */ - std::vector _fixedDatumIDList; + std::vector _fixedDatumIDList; /** variable length list variable datums */ - std::vector _variableDatumIDList; - + std::vector _variableDatumIDList; public: - DatumSpecification(); - virtual ~DatumSpecification(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DatumSpecification(); + virtual ~DatumSpecification(); - unsigned int getNumberOfFixedDatums() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfVariableDatums() const; + unsigned int getNumberOfFixedDatums() const; - std::vector& getFixedDatumIDList(); - const std::vector& getFixedDatumIDList() const; - void setFixedDatumIDList(const std::vector& pX); + unsigned int getNumberOfVariableDatums() const; - std::vector& getVariableDatumIDList(); - const std::vector& getVariableDatumIDList() const; - void setVariableDatumIDList(const std::vector& pX); + std::vector& getFixedDatumIDList(); + const std::vector& getFixedDatumIDList() const; + void setFixedDatumIDList(const std::vector& pX); + std::vector& getVariableDatumIDList(); + const std::vector& getVariableDatumIDList() const; + void setVariableDatumIDList(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DatumSpecification& rhs) const; + bool operator==(const DatumSpecification& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -74,7 +71,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DeadReckoningParameters.cpp b/src/dis7/DeadReckoningParameters.cpp index f130b184..b4377935 100644 --- a/src/dis7/DeadReckoningParameters.cpp +++ b/src/dis7/DeadReckoningParameters.cpp @@ -2,142 +2,124 @@ using namespace DIS; - -DeadReckoningParameters::DeadReckoningParameters(): - _deadReckoningAlgorithm(0), - _entityLinearAcceleration(), - _entityAngularVelocity() -{ - // Initialize fixed length array - for(int lengthparameters= 0; lengthparameters < 15; lengthparameters++) - { - _parameters[lengthparameters] = 0; - } - +DeadReckoningParameters::DeadReckoningParameters() + : _deadReckoningAlgorithm(0), + _entityLinearAcceleration(), + _entityAngularVelocity() { + // Initialize fixed length array + for (int lengthparameters = 0; lengthparameters < 15; lengthparameters++) { + _parameters[lengthparameters] = 0; + } } -DeadReckoningParameters::~DeadReckoningParameters() -{ -} +DeadReckoningParameters::~DeadReckoningParameters() {} -unsigned char DeadReckoningParameters::getDeadReckoningAlgorithm() const -{ - return _deadReckoningAlgorithm; +unsigned char DeadReckoningParameters::getDeadReckoningAlgorithm() const { + return _deadReckoningAlgorithm; } -void DeadReckoningParameters::setDeadReckoningAlgorithm(unsigned char pX) -{ - _deadReckoningAlgorithm = pX; +void DeadReckoningParameters::setDeadReckoningAlgorithm(unsigned char pX) { + _deadReckoningAlgorithm = pX; } -unsigned char* DeadReckoningParameters::getParameters() -{ - return _parameters; -} +unsigned char* DeadReckoningParameters::getParameters() { return _parameters; } -const unsigned char* DeadReckoningParameters::getParameters() const -{ - return _parameters; +const unsigned char* DeadReckoningParameters::getParameters() const { + return _parameters; } -void DeadReckoningParameters::setParameters(const unsigned char* x) -{ - for(int i = 0; i < 15; i++) - { - _parameters[i] = x[i]; - } +void DeadReckoningParameters::setParameters(const unsigned char* x) { + for (int i = 0; i < 15; i++) { + _parameters[i] = x[i]; + } } -Vector3Float& DeadReckoningParameters::getEntityLinearAcceleration() -{ - return _entityLinearAcceleration; +Vector3Float& DeadReckoningParameters::getEntityLinearAcceleration() { + return _entityLinearAcceleration; } -const Vector3Float& DeadReckoningParameters::getEntityLinearAcceleration() const -{ - return _entityLinearAcceleration; +const Vector3Float& DeadReckoningParameters::getEntityLinearAcceleration() + const { + return _entityLinearAcceleration; } -void DeadReckoningParameters::setEntityLinearAcceleration(const Vector3Float &pX) -{ - _entityLinearAcceleration = pX; +void DeadReckoningParameters::setEntityLinearAcceleration( + const Vector3Float& pX) { + _entityLinearAcceleration = pX; } -Vector3Float& DeadReckoningParameters::getEntityAngularVelocity() -{ - return _entityAngularVelocity; +Vector3Float& DeadReckoningParameters::getEntityAngularVelocity() { + return _entityAngularVelocity; } -const Vector3Float& DeadReckoningParameters::getEntityAngularVelocity() const -{ - return _entityAngularVelocity; +const Vector3Float& DeadReckoningParameters::getEntityAngularVelocity() const { + return _entityAngularVelocity; } -void DeadReckoningParameters::setEntityAngularVelocity(const Vector3Float &pX) -{ - _entityAngularVelocity = pX; +void DeadReckoningParameters::setEntityAngularVelocity(const Vector3Float& pX) { + _entityAngularVelocity = pX; } -void DeadReckoningParameters::marshal(DataStream& dataStream) const -{ - dataStream << _deadReckoningAlgorithm; +void DeadReckoningParameters::marshal(DataStream& dataStream) const { + dataStream << _deadReckoningAlgorithm; - for(size_t idx = 0; idx < 15; idx++) - { - dataStream << _parameters[idx]; - } + for (size_t idx = 0; idx < 15; idx++) { + dataStream << _parameters[idx]; + } - _entityLinearAcceleration.marshal(dataStream); - _entityAngularVelocity.marshal(dataStream); + _entityLinearAcceleration.marshal(dataStream); + _entityAngularVelocity.marshal(dataStream); } -void DeadReckoningParameters::unmarshal(DataStream& dataStream) -{ - dataStream >> _deadReckoningAlgorithm; +void DeadReckoningParameters::unmarshal(DataStream& dataStream) { + dataStream >> _deadReckoningAlgorithm; - for(size_t idx = 0; idx < 15; idx++) - { - dataStream >> _parameters[idx]; - } + for (size_t idx = 0; idx < 15; idx++) { + dataStream >> _parameters[idx]; + } - _entityLinearAcceleration.unmarshal(dataStream); - _entityAngularVelocity.unmarshal(dataStream); + _entityLinearAcceleration.unmarshal(dataStream); + _entityAngularVelocity.unmarshal(dataStream); } +bool DeadReckoningParameters::operator==( + const DeadReckoningParameters& rhs) const { + bool ivarsEqual = true; -bool DeadReckoningParameters::operator ==(const DeadReckoningParameters& rhs) const - { - bool ivarsEqual = true; - - if( ! (_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm) ) ivarsEqual = false; + if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) + ivarsEqual = false; - for(unsigned char idx = 0; idx < 15; idx++) - { - if(!(_parameters[idx] == rhs._parameters[idx]) ) ivarsEqual = false; - } + for (unsigned char idx = 0; idx < 15; idx++) { + if (!(_parameters[idx] == rhs._parameters[idx])) ivarsEqual = false; + } - if( ! (_entityLinearAcceleration == rhs._entityLinearAcceleration) ) ivarsEqual = false; - if( ! (_entityAngularVelocity == rhs._entityAngularVelocity) ) ivarsEqual = false; + if (!(_entityLinearAcceleration == rhs._entityLinearAcceleration)) + ivarsEqual = false; + if (!(_entityAngularVelocity == rhs._entityAngularVelocity)) + ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int DeadReckoningParameters::getMarshalledSize() const -{ - int marshalSize = 0; +int DeadReckoningParameters::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _deadReckoningAlgorithm - marshalSize = marshalSize + 15 * 1; // _parameters - marshalSize = marshalSize + _entityLinearAcceleration.getMarshalledSize(); // _entityLinearAcceleration - marshalSize = marshalSize + _entityAngularVelocity.getMarshalledSize(); // _entityAngularVelocity - return marshalSize; + marshalSize = marshalSize + 1; // _deadReckoningAlgorithm + marshalSize = marshalSize + 15 * 1; // _parameters + marshalSize = + marshalSize + _entityLinearAcceleration + .getMarshalledSize(); // _entityLinearAcceleration + marshalSize = + marshalSize + + _entityAngularVelocity.getMarshalledSize(); // _entityAngularVelocity + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -150,7 +132,7 @@ int DeadReckoningParameters::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DeadReckoningParameters.h b/src/dis7/DeadReckoningParameters.h index fc7406ec..aa8c398f 100644 --- a/src/dis7/DeadReckoningParameters.h +++ b/src/dis7/DeadReckoningParameters.h @@ -1,69 +1,64 @@ #pragma once #include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Not specified in the standard. This is used by the ESPDU -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DeadReckoningParameters -{ -protected: +class OPENDIS7_EXPORT DeadReckoningParameters { + protected: /** Algorithm to use in computing dead reckoning. See EBV doc. */ - unsigned char _deadReckoningAlgorithm; + unsigned char _deadReckoningAlgorithm; /** Dead reckoning parameters. Contents depends on algorithm. */ - unsigned char _parameters[15]; + unsigned char _parameters[15]; /** Linear acceleration of the entity */ - Vector3Float _entityLinearAcceleration; + Vector3Float _entityLinearAcceleration; /** Angular velocity of the entity */ - Vector3Float _entityAngularVelocity; - + Vector3Float _entityAngularVelocity; public: - DeadReckoningParameters(); - virtual ~DeadReckoningParameters(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DeadReckoningParameters(); + virtual ~DeadReckoningParameters(); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char* getParameters(); - const unsigned char* getParameters() const; - void setParameters( const unsigned char* pX); + unsigned char getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(unsigned char pX); - Vector3Float& getEntityLinearAcceleration(); - const Vector3Float& getEntityLinearAcceleration() const; - void setEntityLinearAcceleration(const Vector3Float &pX); + unsigned char* getParameters(); + const unsigned char* getParameters() const; + void setParameters(const unsigned char* pX); - Vector3Float& getEntityAngularVelocity(); - const Vector3Float& getEntityAngularVelocity() const; - void setEntityAngularVelocity(const Vector3Float &pX); + Vector3Float& getEntityLinearAcceleration(); + const Vector3Float& getEntityLinearAcceleration() const; + void setEntityLinearAcceleration(const Vector3Float& pX); + Vector3Float& getEntityAngularVelocity(); + const Vector3Float& getEntityAngularVelocity() const; + void setEntityAngularVelocity(const Vector3Float& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DeadReckoningParameters& rhs) const; + bool operator==(const DeadReckoningParameters& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -76,7 +71,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DesignatorPdu.cpp b/src/dis7/DesignatorPdu.cpp index 2fe547e6..e7298ae2 100644 --- a/src/dis7/DesignatorPdu.cpp +++ b/src/dis7/DesignatorPdu.cpp @@ -2,255 +2,215 @@ using namespace DIS; - -DesignatorPdu::DesignatorPdu() : DistributedEmissionsFamilyPdu(), - _designatingEntityID(), - _codeName(0), - _designatedEntityID(), - _designatorCode(0), - _designatorPower(0.0), - _designatorWavelength(0.0), - _designatorSpotWrtDesignated(), - _designatorSpotLocation(), - _deadReckoningAlgorithm(0), - _padding1(0), - _padding2(0), - _entityLinearAcceleration() -{ - setPduType( 24 ); +DesignatorPdu::DesignatorPdu() + : DistributedEmissionsFamilyPdu(), + _designatingEntityID(), + _codeName(0), + _designatedEntityID(), + _designatorCode(0), + _designatorPower(0.0), + _designatorWavelength(0.0), + _designatorSpotWrtDesignated(), + _designatorSpotLocation(), + _deadReckoningAlgorithm(0), + _padding1(0), + _padding2(0), + _entityLinearAcceleration() { + setPduType(24); } -DesignatorPdu::~DesignatorPdu() -{ -} +DesignatorPdu::~DesignatorPdu() {} -EntityID& DesignatorPdu::getDesignatingEntityID() -{ - return _designatingEntityID; +EntityID& DesignatorPdu::getDesignatingEntityID() { + return _designatingEntityID; } -const EntityID& DesignatorPdu::getDesignatingEntityID() const -{ - return _designatingEntityID; +const EntityID& DesignatorPdu::getDesignatingEntityID() const { + return _designatingEntityID; } -void DesignatorPdu::setDesignatingEntityID(const EntityID &pX) -{ - _designatingEntityID = pX; +void DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { + _designatingEntityID = pX; } -unsigned short DesignatorPdu::getCodeName() const -{ - return _codeName; -} +unsigned short DesignatorPdu::getCodeName() const { return _codeName; } -void DesignatorPdu::setCodeName(unsigned short pX) -{ - _codeName = pX; -} +void DesignatorPdu::setCodeName(unsigned short pX) { _codeName = pX; } -EntityID& DesignatorPdu::getDesignatedEntityID() -{ - return _designatedEntityID; -} +EntityID& DesignatorPdu::getDesignatedEntityID() { return _designatedEntityID; } -const EntityID& DesignatorPdu::getDesignatedEntityID() const -{ - return _designatedEntityID; +const EntityID& DesignatorPdu::getDesignatedEntityID() const { + return _designatedEntityID; } -void DesignatorPdu::setDesignatedEntityID(const EntityID &pX) -{ - _designatedEntityID = pX; +void DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { + _designatedEntityID = pX; } -unsigned short DesignatorPdu::getDesignatorCode() const -{ - return _designatorCode; +unsigned short DesignatorPdu::getDesignatorCode() const { + return _designatorCode; } -void DesignatorPdu::setDesignatorCode(unsigned short pX) -{ - _designatorCode = pX; +void DesignatorPdu::setDesignatorCode(unsigned short pX) { + _designatorCode = pX; } -float DesignatorPdu::getDesignatorPower() const -{ - return _designatorPower; -} +float DesignatorPdu::getDesignatorPower() const { return _designatorPower; } -void DesignatorPdu::setDesignatorPower(float pX) -{ - _designatorPower = pX; -} +void DesignatorPdu::setDesignatorPower(float pX) { _designatorPower = pX; } -float DesignatorPdu::getDesignatorWavelength() const -{ - return _designatorWavelength; +float DesignatorPdu::getDesignatorWavelength() const { + return _designatorWavelength; } -void DesignatorPdu::setDesignatorWavelength(float pX) -{ - _designatorWavelength = pX; +void DesignatorPdu::setDesignatorWavelength(float pX) { + _designatorWavelength = pX; } -Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() -{ - return _designatorSpotWrtDesignated; +Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() { + return _designatorSpotWrtDesignated; } -const Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() const -{ - return _designatorSpotWrtDesignated; +const Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() const { + return _designatorSpotWrtDesignated; } -void DesignatorPdu::setDesignatorSpotWrtDesignated(const Vector3Float &pX) -{ - _designatorSpotWrtDesignated = pX; +void DesignatorPdu::setDesignatorSpotWrtDesignated(const Vector3Float& pX) { + _designatorSpotWrtDesignated = pX; } -Vector3Double& DesignatorPdu::getDesignatorSpotLocation() -{ - return _designatorSpotLocation; +Vector3Double& DesignatorPdu::getDesignatorSpotLocation() { + return _designatorSpotLocation; } -const Vector3Double& DesignatorPdu::getDesignatorSpotLocation() const -{ - return _designatorSpotLocation; +const Vector3Double& DesignatorPdu::getDesignatorSpotLocation() const { + return _designatorSpotLocation; } -void DesignatorPdu::setDesignatorSpotLocation(const Vector3Double &pX) -{ - _designatorSpotLocation = pX; +void DesignatorPdu::setDesignatorSpotLocation(const Vector3Double& pX) { + _designatorSpotLocation = pX; } -char DesignatorPdu::getDeadReckoningAlgorithm() const -{ - return _deadReckoningAlgorithm; +char DesignatorPdu::getDeadReckoningAlgorithm() const { + return _deadReckoningAlgorithm; } -void DesignatorPdu::setDeadReckoningAlgorithm(char pX) -{ - _deadReckoningAlgorithm = pX; +void DesignatorPdu::setDeadReckoningAlgorithm(char pX) { + _deadReckoningAlgorithm = pX; } -unsigned short DesignatorPdu::getPadding1() const -{ - return _padding1; -} +unsigned short DesignatorPdu::getPadding1() const { return _padding1; } -void DesignatorPdu::setPadding1(unsigned short pX) -{ - _padding1 = pX; -} +void DesignatorPdu::setPadding1(unsigned short pX) { _padding1 = pX; } -char DesignatorPdu::getPadding2() const -{ - return _padding2; -} +char DesignatorPdu::getPadding2() const { return _padding2; } + +void DesignatorPdu::setPadding2(char pX) { _padding2 = pX; } -void DesignatorPdu::setPadding2(char pX) -{ - _padding2 = pX; +Vector3Float& DesignatorPdu::getEntityLinearAcceleration() { + return _entityLinearAcceleration; } -Vector3Float& DesignatorPdu::getEntityLinearAcceleration() -{ - return _entityLinearAcceleration; +const Vector3Float& DesignatorPdu::getEntityLinearAcceleration() const { + return _entityLinearAcceleration; } -const Vector3Float& DesignatorPdu::getEntityLinearAcceleration() const -{ - return _entityLinearAcceleration; +void DesignatorPdu::setEntityLinearAcceleration(const Vector3Float& pX) { + _entityLinearAcceleration = pX; } -void DesignatorPdu::setEntityLinearAcceleration(const Vector3Float &pX) -{ - _entityLinearAcceleration = pX; +void DesignatorPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _designatingEntityID.marshal(dataStream); + dataStream << _codeName; + _designatedEntityID.marshal(dataStream); + dataStream << _designatorCode; + dataStream << _designatorPower; + dataStream << _designatorWavelength; + _designatorSpotWrtDesignated.marshal(dataStream); + _designatorSpotLocation.marshal(dataStream); + dataStream << _deadReckoningAlgorithm; + dataStream << _padding1; + dataStream << _padding2; + _entityLinearAcceleration.marshal(dataStream); } -void DesignatorPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _designatingEntityID.marshal(dataStream); - dataStream << _codeName; - _designatedEntityID.marshal(dataStream); - dataStream << _designatorCode; - dataStream << _designatorPower; - dataStream << _designatorWavelength; - _designatorSpotWrtDesignated.marshal(dataStream); - _designatorSpotLocation.marshal(dataStream); - dataStream << _deadReckoningAlgorithm; - dataStream << _padding1; - dataStream << _padding2; - _entityLinearAcceleration.marshal(dataStream); +void DesignatorPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _designatingEntityID.unmarshal(dataStream); + dataStream >> _codeName; + _designatedEntityID.unmarshal(dataStream); + dataStream >> _designatorCode; + dataStream >> _designatorPower; + dataStream >> _designatorWavelength; + _designatorSpotWrtDesignated.unmarshal(dataStream); + _designatorSpotLocation.unmarshal(dataStream); + dataStream >> _deadReckoningAlgorithm; + dataStream >> _padding1; + dataStream >> _padding2; + _entityLinearAcceleration.unmarshal(dataStream); } -void DesignatorPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _designatingEntityID.unmarshal(dataStream); - dataStream >> _codeName; - _designatedEntityID.unmarshal(dataStream); - dataStream >> _designatorCode; - dataStream >> _designatorPower; - dataStream >> _designatorWavelength; - _designatorSpotWrtDesignated.unmarshal(dataStream); - _designatorSpotLocation.unmarshal(dataStream); - dataStream >> _deadReckoningAlgorithm; - dataStream >> _padding1; - dataStream >> _padding2; - _entityLinearAcceleration.unmarshal(dataStream); +bool DesignatorPdu::operator==(const DesignatorPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); + + if (!(_designatingEntityID == rhs._designatingEntityID)) ivarsEqual = false; + if (!(_codeName == rhs._codeName)) ivarsEqual = false; + if (!(_designatedEntityID == rhs._designatedEntityID)) ivarsEqual = false; + if (!(_designatorCode == rhs._designatorCode)) ivarsEqual = false; + if (!(_designatorPower == rhs._designatorPower)) ivarsEqual = false; + if (!(_designatorWavelength == rhs._designatorWavelength)) ivarsEqual = false; + if (!(_designatorSpotWrtDesignated == rhs._designatorSpotWrtDesignated)) + ivarsEqual = false; + if (!(_designatorSpotLocation == rhs._designatorSpotLocation)) + ivarsEqual = false; + if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) + ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_entityLinearAcceleration == rhs._entityLinearAcceleration)) + ivarsEqual = false; + + return ivarsEqual; } +int DesignatorPdu::getMarshalledSize() const { + int marshalSize = 0; -bool DesignatorPdu::operator ==(const DesignatorPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - - if( ! (_designatingEntityID == rhs._designatingEntityID) ) ivarsEqual = false; - if( ! (_codeName == rhs._codeName) ) ivarsEqual = false; - if( ! (_designatedEntityID == rhs._designatedEntityID) ) ivarsEqual = false; - if( ! (_designatorCode == rhs._designatorCode) ) ivarsEqual = false; - if( ! (_designatorPower == rhs._designatorPower) ) ivarsEqual = false; - if( ! (_designatorWavelength == rhs._designatorWavelength) ) ivarsEqual = false; - if( ! (_designatorSpotWrtDesignated == rhs._designatorSpotWrtDesignated) ) ivarsEqual = false; - if( ! (_designatorSpotLocation == rhs._designatorSpotLocation) ) ivarsEqual = false; - if( ! (_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_entityLinearAcceleration == rhs._entityLinearAcceleration) ) ivarsEqual = false; - - return ivarsEqual; - } - -int DesignatorPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _designatingEntityID.getMarshalledSize(); // _designatingEntityID - marshalSize = marshalSize + 2; // _codeName - marshalSize = marshalSize + _designatedEntityID.getMarshalledSize(); // _designatedEntityID - marshalSize = marshalSize + 2; // _designatorCode - marshalSize = marshalSize + 4; // _designatorPower - marshalSize = marshalSize + 4; // _designatorWavelength - marshalSize = marshalSize + _designatorSpotWrtDesignated.getMarshalledSize(); // _designatorSpotWrtDesignated - marshalSize = marshalSize + _designatorSpotLocation.getMarshalledSize(); // _designatorSpotLocation - marshalSize = marshalSize + 1; // _deadReckoningAlgorithm - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - marshalSize = marshalSize + _entityLinearAcceleration.getMarshalledSize(); // _entityLinearAcceleration - return marshalSize; + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + + _designatingEntityID.getMarshalledSize(); // _designatingEntityID + marshalSize = marshalSize + 2; // _codeName + marshalSize = marshalSize + + _designatedEntityID.getMarshalledSize(); // _designatedEntityID + marshalSize = marshalSize + 2; // _designatorCode + marshalSize = marshalSize + 4; // _designatorPower + marshalSize = marshalSize + 4; // _designatorWavelength + marshalSize = + marshalSize + _designatorSpotWrtDesignated + .getMarshalledSize(); // _designatorSpotWrtDesignated + marshalSize = + marshalSize + + _designatorSpotLocation.getMarshalledSize(); // _designatorSpotLocation + marshalSize = marshalSize + 1; // _deadReckoningAlgorithm + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 + marshalSize = + marshalSize + _entityLinearAcceleration + .getMarshalledSize(); // _entityLinearAcceleration + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -263,7 +223,7 @@ int DesignatorPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DesignatorPdu.h b/src/dis7/DesignatorPdu.h index a64e9fff..7f2ef166 100644 --- a/src/dis7/DesignatorPdu.h +++ b/src/dis7/DesignatorPdu.h @@ -1,123 +1,120 @@ #pragma once +#include #include -#include -#include #include #include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.7.2. Handles designating operations. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity designating */ - EntityID _designatingEntityID; + EntityID _designatingEntityID; - /** This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system. */ - unsigned short _codeName; + /** This field shall specify a unique emitter database number assigned to + * differentiate between otherwise similar or identical emitter beams within + * an emitter system. */ + unsigned short _codeName; /** ID of the entity being designated */ - EntityID _designatedEntityID; + EntityID _designatedEntityID; - /** This field shall identify the designator code being used by the designating entity */ - unsigned short _designatorCode; + /** This field shall identify the designator code being used by the + * designating entity */ + unsigned short _designatorCode; /** This field shall identify the designator output power in watts */ - float _designatorPower; + float _designatorPower; /** This field shall identify the designator wavelength in units of microns */ - float _designatorWavelength; + float _designatorWavelength; /** designtor spot wrt the designated entity */ - Vector3Float _designatorSpotWrtDesignated; + Vector3Float _designatorSpotWrtDesignated; /** designtor spot wrt the designated entity */ - Vector3Double _designatorSpotLocation; + Vector3Double _designatorSpotLocation; /** Dead reckoning algorithm */ - char _deadReckoningAlgorithm; + char _deadReckoningAlgorithm; /** padding */ - unsigned short _padding1; + unsigned short _padding1; /** padding */ - char _padding2; + char _padding2; /** linear accelleration of entity */ - Vector3Float _entityLinearAcceleration; - + Vector3Float _entityLinearAcceleration; public: - DesignatorPdu(); - virtual ~DesignatorPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DesignatorPdu(); + virtual ~DesignatorPdu(); - EntityID& getDesignatingEntityID(); - const EntityID& getDesignatingEntityID() const; - void setDesignatingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getCodeName() const; - void setCodeName(unsigned short pX); + EntityID& getDesignatingEntityID(); + const EntityID& getDesignatingEntityID() const; + void setDesignatingEntityID(const EntityID& pX); - EntityID& getDesignatedEntityID(); - const EntityID& getDesignatedEntityID() const; - void setDesignatedEntityID(const EntityID &pX); + unsigned short getCodeName() const; + void setCodeName(unsigned short pX); - unsigned short getDesignatorCode() const; - void setDesignatorCode(unsigned short pX); + EntityID& getDesignatedEntityID(); + const EntityID& getDesignatedEntityID() const; + void setDesignatedEntityID(const EntityID& pX); - float getDesignatorPower() const; - void setDesignatorPower(float pX); + unsigned short getDesignatorCode() const; + void setDesignatorCode(unsigned short pX); - float getDesignatorWavelength() const; - void setDesignatorWavelength(float pX); + float getDesignatorPower() const; + void setDesignatorPower(float pX); - Vector3Float& getDesignatorSpotWrtDesignated(); - const Vector3Float& getDesignatorSpotWrtDesignated() const; - void setDesignatorSpotWrtDesignated(const Vector3Float &pX); + float getDesignatorWavelength() const; + void setDesignatorWavelength(float pX); - Vector3Double& getDesignatorSpotLocation(); - const Vector3Double& getDesignatorSpotLocation() const; - void setDesignatorSpotLocation(const Vector3Double &pX); + Vector3Float& getDesignatorSpotWrtDesignated(); + const Vector3Float& getDesignatorSpotWrtDesignated() const; + void setDesignatorSpotWrtDesignated(const Vector3Float& pX); - char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(char pX); + Vector3Double& getDesignatorSpotLocation(); + const Vector3Double& getDesignatorSpotLocation() const; + void setDesignatorSpotLocation(const Vector3Double& pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + char getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(char pX); - char getPadding2() const; - void setPadding2(char pX); + unsigned short getPadding1() const; + void setPadding1(unsigned short pX); - Vector3Float& getEntityLinearAcceleration(); - const Vector3Float& getEntityLinearAcceleration() const; - void setEntityLinearAcceleration(const Vector3Float &pX); + char getPadding2() const; + void setPadding2(char pX); + Vector3Float& getEntityLinearAcceleration(); + const Vector3Float& getEntityLinearAcceleration() const; + void setEntityLinearAcceleration(const Vector3Float& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DesignatorPdu& rhs) const; + bool operator==(const DesignatorPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -130,7 +127,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DetonationPdu.cpp b/src/dis7/DetonationPdu.cpp index e1386dc9..a996e236 100644 --- a/src/dis7/DetonationPdu.cpp +++ b/src/dis7/DetonationPdu.cpp @@ -2,253 +2,204 @@ using namespace DIS; - -DetonationPdu::DetonationPdu() : WarfareFamilyPdu(), - _explodingEntityID(), - _eventID(), - _velocity(), - _locationInWorldCoordinates(), - _descriptor(), - _locationOfEntityCoordinates(), - _detonationResult(0), - _numberOfVariableParameters(0), - _pad(0) -{ - setPduType( 3 ); +DetonationPdu::DetonationPdu() + : WarfareFamilyPdu(), + _explodingEntityID(), + _eventID(), + _velocity(), + _locationInWorldCoordinates(), + _descriptor(), + _locationOfEntityCoordinates(), + _detonationResult(0), + _numberOfVariableParameters(0), + _pad(0) { + setPduType(3); } -DetonationPdu::~DetonationPdu() -{ - _variableParameters.clear(); -} +DetonationPdu::~DetonationPdu() { _variableParameters.clear(); } -EntityID& DetonationPdu::getExplodingEntityID() -{ - return _explodingEntityID; -} +EntityID& DetonationPdu::getExplodingEntityID() { return _explodingEntityID; } -const EntityID& DetonationPdu::getExplodingEntityID() const -{ - return _explodingEntityID; +const EntityID& DetonationPdu::getExplodingEntityID() const { + return _explodingEntityID; } -void DetonationPdu::setExplodingEntityID(const EntityID &pX) -{ - _explodingEntityID = pX; +void DetonationPdu::setExplodingEntityID(const EntityID& pX) { + _explodingEntityID = pX; } -EventIdentifier& DetonationPdu::getEventID() -{ - return _eventID; -} +EventIdentifier& DetonationPdu::getEventID() { return _eventID; } -const EventIdentifier& DetonationPdu::getEventID() const -{ - return _eventID; -} +const EventIdentifier& DetonationPdu::getEventID() const { return _eventID; } -void DetonationPdu::setEventID(const EventIdentifier &pX) -{ - _eventID = pX; -} +void DetonationPdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -Vector3Float& DetonationPdu::getVelocity() -{ - return _velocity; -} +Vector3Float& DetonationPdu::getVelocity() { return _velocity; } -const Vector3Float& DetonationPdu::getVelocity() const -{ - return _velocity; -} +const Vector3Float& DetonationPdu::getVelocity() const { return _velocity; } -void DetonationPdu::setVelocity(const Vector3Float &pX) -{ - _velocity = pX; -} +void DetonationPdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -Vector3Double& DetonationPdu::getLocationInWorldCoordinates() -{ - return _locationInWorldCoordinates; +Vector3Double& DetonationPdu::getLocationInWorldCoordinates() { + return _locationInWorldCoordinates; } -const Vector3Double& DetonationPdu::getLocationInWorldCoordinates() const -{ - return _locationInWorldCoordinates; +const Vector3Double& DetonationPdu::getLocationInWorldCoordinates() const { + return _locationInWorldCoordinates; } -void DetonationPdu::setLocationInWorldCoordinates(const Vector3Double &pX) -{ - _locationInWorldCoordinates = pX; +void DetonationPdu::setLocationInWorldCoordinates(const Vector3Double& pX) { + _locationInWorldCoordinates = pX; } -MunitionDescriptor& DetonationPdu::getDescriptor() -{ - return _descriptor; -} +MunitionDescriptor& DetonationPdu::getDescriptor() { return _descriptor; } -const MunitionDescriptor& DetonationPdu::getDescriptor() const -{ - return _descriptor; +const MunitionDescriptor& DetonationPdu::getDescriptor() const { + return _descriptor; } -void DetonationPdu::setDescriptor(const MunitionDescriptor &pX) -{ - _descriptor = pX; +void DetonationPdu::setDescriptor(const MunitionDescriptor& pX) { + _descriptor = pX; } -Vector3Float& DetonationPdu::getLocationOfEntityCoordinates() -{ - return _locationOfEntityCoordinates; +Vector3Float& DetonationPdu::getLocationOfEntityCoordinates() { + return _locationOfEntityCoordinates; } -const Vector3Float& DetonationPdu::getLocationOfEntityCoordinates() const -{ - return _locationOfEntityCoordinates; +const Vector3Float& DetonationPdu::getLocationOfEntityCoordinates() const { + return _locationOfEntityCoordinates; } -void DetonationPdu::setLocationOfEntityCoordinates(const Vector3Float &pX) -{ - _locationOfEntityCoordinates = pX; +void DetonationPdu::setLocationOfEntityCoordinates(const Vector3Float& pX) { + _locationOfEntityCoordinates = pX; } -unsigned char DetonationPdu::getDetonationResult() const -{ - return _detonationResult; +unsigned char DetonationPdu::getDetonationResult() const { + return _detonationResult; } -void DetonationPdu::setDetonationResult(unsigned char pX) -{ - _detonationResult = pX; +void DetonationPdu::setDetonationResult(unsigned char pX) { + _detonationResult = pX; } -unsigned char DetonationPdu::getNumberOfVariableParameters() const -{ - return _variableParameters.size(); +unsigned char DetonationPdu::getNumberOfVariableParameters() const { + return _variableParameters.size(); } -unsigned short DetonationPdu::getPad() const -{ - return _pad; -} +unsigned short DetonationPdu::getPad() const { return _pad; } -void DetonationPdu::setPad(unsigned short pX) -{ - _pad = pX; +void DetonationPdu::setPad(unsigned short pX) { _pad = pX; } + +std::vector& DetonationPdu::getVariableParameters() { + return _variableParameters; } -std::vector& DetonationPdu::getVariableParameters() -{ - return _variableParameters; +const std::vector& DetonationPdu::getVariableParameters() + const { + return _variableParameters; } -const std::vector& DetonationPdu::getVariableParameters() const -{ - return _variableParameters; +void DetonationPdu::setVariableParameters( + const std::vector& pX) { + _variableParameters = pX; } -void DetonationPdu::setVariableParameters(const std::vector& pX) -{ - _variableParameters = pX; +void DetonationPdu::marshal(DataStream& dataStream) const { + WarfareFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _explodingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + _velocity.marshal(dataStream); + _locationInWorldCoordinates.marshal(dataStream); + _descriptor.marshal(dataStream); + _locationOfEntityCoordinates.marshal(dataStream); + dataStream << _detonationResult; + dataStream << (unsigned char)_variableParameters.size(); + dataStream << _pad; + + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter x = _variableParameters[idx]; + x.marshal(dataStream); + } } -void DetonationPdu::marshal(DataStream& dataStream) const -{ - WarfareFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _explodingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - _velocity.marshal(dataStream); - _locationInWorldCoordinates.marshal(dataStream); - _descriptor.marshal(dataStream); - _locationOfEntityCoordinates.marshal(dataStream); - dataStream << _detonationResult; - dataStream << ( unsigned char )_variableParameters.size(); - dataStream << _pad; - - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - VariableParameter x = _variableParameters[idx]; - x.marshal(dataStream); - } +void DetonationPdu::unmarshal(DataStream& dataStream) { + WarfareFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _explodingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + _velocity.unmarshal(dataStream); + _locationInWorldCoordinates.unmarshal(dataStream); + _descriptor.unmarshal(dataStream); + _locationOfEntityCoordinates.unmarshal(dataStream); + dataStream >> _detonationResult; + dataStream >> _numberOfVariableParameters; + dataStream >> _pad; + _variableParameters.clear(); + for (size_t idx = 0; idx < _numberOfVariableParameters; idx++) { + VariableParameter x; + x.unmarshal(dataStream); + _variableParameters.push_back(x); + } } -void DetonationPdu::unmarshal(DataStream& dataStream) -{ - WarfareFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _explodingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - _velocity.unmarshal(dataStream); - _locationInWorldCoordinates.unmarshal(dataStream); - _descriptor.unmarshal(dataStream); - _locationOfEntityCoordinates.unmarshal(dataStream); - dataStream >> _detonationResult; - dataStream >> _numberOfVariableParameters; - dataStream >> _pad; - - _variableParameters.clear(); - for(size_t idx = 0; idx < _numberOfVariableParameters; idx++) - { - VariableParameter x; - x.unmarshal(dataStream); - _variableParameters.push_back(x); - } +bool DetonationPdu::operator==(const DetonationPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = WarfareFamilyPdu::operator==(rhs); + + if (!(_explodingEntityID == rhs._explodingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_velocity == rhs._velocity)) ivarsEqual = false; + if (!(_locationInWorldCoordinates == rhs._locationInWorldCoordinates)) + ivarsEqual = false; + if (!(_descriptor == rhs._descriptor)) ivarsEqual = false; + if (!(_locationOfEntityCoordinates == rhs._locationOfEntityCoordinates)) + ivarsEqual = false; + if (!(_detonationResult == rhs._detonationResult)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + if (!(_variableParameters[idx] == rhs._variableParameters[idx])) + ivarsEqual = false; + } + + return ivarsEqual; } +int DetonationPdu::getMarshalledSize() const { + int marshalSize = 0; -bool DetonationPdu::operator ==(const DetonationPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = WarfareFamilyPdu::operator==(rhs); - - if( ! (_explodingEntityID == rhs._explodingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_velocity == rhs._velocity) ) ivarsEqual = false; - if( ! (_locationInWorldCoordinates == rhs._locationInWorldCoordinates) ) ivarsEqual = false; - if( ! (_descriptor == rhs._descriptor) ) ivarsEqual = false; - if( ! (_locationOfEntityCoordinates == rhs._locationOfEntityCoordinates) ) ivarsEqual = false; - if( ! (_detonationResult == rhs._detonationResult) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - if( ! ( _variableParameters[idx] == rhs._variableParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int DetonationPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = WarfareFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _explodingEntityID.getMarshalledSize(); // _explodingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity - marshalSize = marshalSize + _locationInWorldCoordinates.getMarshalledSize(); // _locationInWorldCoordinates - marshalSize = marshalSize + _descriptor.getMarshalledSize(); // _descriptor - marshalSize = marshalSize + _locationOfEntityCoordinates.getMarshalledSize(); // _locationOfEntityCoordinates - marshalSize = marshalSize + 1; // _detonationResult - marshalSize = marshalSize + 1; // _numberOfVariableParameters - marshalSize = marshalSize + 2; // _pad - - for(unsigned long long idx=0; idx < _variableParameters.size(); idx++) - { - VariableParameter listElement = _variableParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + marshalSize = WarfareFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _explodingEntityID.getMarshalledSize(); // _explodingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity + marshalSize = + marshalSize + _locationInWorldCoordinates + .getMarshalledSize(); // _locationInWorldCoordinates + marshalSize = marshalSize + _descriptor.getMarshalledSize(); // _descriptor + marshalSize = + marshalSize + _locationOfEntityCoordinates + .getMarshalledSize(); // _locationOfEntityCoordinates + marshalSize = marshalSize + 1; // _detonationResult + marshalSize = marshalSize + 1; // _numberOfVariableParameters + marshalSize = marshalSize + 2; // _pad + + for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter listElement = _variableParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -261,7 +212,7 @@ int DetonationPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DetonationPdu.h b/src/dis7/DetonationPdu.h index 0572b7b9..54620815 100644 --- a/src/dis7/DetonationPdu.h +++ b/src/dis7/DetonationPdu.h @@ -1,115 +1,116 @@ #pragma once +#include + #include #include -#include -#include #include -#include #include -#include +#include +#include #include -#include #include +#include +namespace DIS { +// Detonation or impact of munitions, as well as, non-munition explosions, the +// burst or initial bloom of chaff, and the ignition of a flare shall be +// indicated. Section 7.3.3 COMPLETE -namespace DIS -{ -// Detonation or impact of munitions, as well as, non-munition explosions, the burst or initial bloom of chaff, and the ignition of a flare shall be indicated. Section 7.3.3 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DetonationPdu : public WarfareFamilyPdu -{ -protected: +class OPENDIS7_EXPORT DetonationPdu : public WarfareFamilyPdu { + protected: /** ID of the expendable entity, Section 7.3.3 */ - EntityID _explodingEntityID; + EntityID _explodingEntityID; /** ID of event, Section 7.3.3 */ - EventIdentifier _eventID; + EventIdentifier _eventID; - /** velocity of the munition immediately before detonation/impact, Section 7.3.3 */ - Vector3Float _velocity; + /** velocity of the munition immediately before detonation/impact, + * Section 7.3.3 */ + Vector3Float _velocity; - /** location of the munition detonation, the expendable detonation, Section 7.3.3 */ - Vector3Double _locationInWorldCoordinates; + /** location of the munition detonation, the expendable detonation, + * Section 7.3.3 */ + Vector3Double _locationInWorldCoordinates; /** Describes the detonation represented, Section 7.3.3 */ - MunitionDescriptor _descriptor; + MunitionDescriptor _descriptor; /** Velocity of the ammunition, Section 7.3.3 */ - Vector3Float _locationOfEntityCoordinates; + Vector3Float _locationOfEntityCoordinates; /** result of the detonation, Section 7.3.3 */ - unsigned char _detonationResult; + unsigned char _detonationResult; /** How many articulation parameters we have, Section 7.3.3 */ - unsigned char _numberOfVariableParameters; + unsigned char _numberOfVariableParameters; /** padding */ - unsigned short _pad; - - /** specify the parameter values for each Variable Parameter record, Section 7.3.3 */ - std::vector _variableParameters; + unsigned short _pad; + /** specify the parameter values for each Variable Parameter record, + * Section 7.3.3 */ + std::vector _variableParameters; public: - DetonationPdu(); - virtual ~DetonationPdu(); + DetonationPdu(); + virtual ~DetonationPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getExplodingEntityID(); - const EntityID& getExplodingEntityID() const; - void setExplodingEntityID(const EntityID &pX); + EntityID& getExplodingEntityID(); + const EntityID& getExplodingEntityID() const; + void setExplodingEntityID(const EntityID& pX); - EventIdentifier& getEventID(); - const EventIdentifier& getEventID() const; - void setEventID(const EventIdentifier &pX); + EventIdentifier& getEventID(); + const EventIdentifier& getEventID() const; + void setEventID(const EventIdentifier& pX); - Vector3Float& getVelocity(); - const Vector3Float& getVelocity() const; - void setVelocity(const Vector3Float &pX); + Vector3Float& getVelocity(); + const Vector3Float& getVelocity() const; + void setVelocity(const Vector3Float& pX); - Vector3Double& getLocationInWorldCoordinates(); - const Vector3Double& getLocationInWorldCoordinates() const; - void setLocationInWorldCoordinates(const Vector3Double &pX); + Vector3Double& getLocationInWorldCoordinates(); + const Vector3Double& getLocationInWorldCoordinates() const; + void setLocationInWorldCoordinates(const Vector3Double& pX); - MunitionDescriptor& getDescriptor(); - const MunitionDescriptor& getDescriptor() const; - void setDescriptor(const MunitionDescriptor &pX); + MunitionDescriptor& getDescriptor(); + const MunitionDescriptor& getDescriptor() const; + void setDescriptor(const MunitionDescriptor& pX); - Vector3Float& getLocationOfEntityCoordinates(); - const Vector3Float& getLocationOfEntityCoordinates() const; - void setLocationOfEntityCoordinates(const Vector3Float &pX); + Vector3Float& getLocationOfEntityCoordinates(); + const Vector3Float& getLocationOfEntityCoordinates() const; + void setLocationOfEntityCoordinates(const Vector3Float& pX); - unsigned char getDetonationResult() const; - void setDetonationResult(unsigned char pX); + unsigned char getDetonationResult() const; + void setDetonationResult(unsigned char pX); - unsigned char getNumberOfVariableParameters() const; + unsigned char getNumberOfVariableParameters() const; - unsigned short getPad() const; - void setPad(unsigned short pX); + unsigned short getPad() const; + void setPad(unsigned short pX); - std::vector& getVariableParameters(); - const std::vector& getVariableParameters() const; - void setVariableParameters(const std::vector& pX); + std::vector& getVariableParameters(); + const std::vector& getVariableParameters() const; + void setVariableParameters(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DetonationPdu& rhs) const; + bool operator==(const DetonationPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -122,7 +123,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyAreaAimpoint.cpp b/src/dis7/DirectedEnergyAreaAimpoint.cpp index e5a8e499..1ca9093e 100644 --- a/src/dis7/DirectedEnergyAreaAimpoint.cpp +++ b/src/dis7/DirectedEnergyAreaAimpoint.cpp @@ -2,195 +2,183 @@ using namespace DIS; +DirectedEnergyAreaAimpoint::DirectedEnergyAreaAimpoint() + : _recordType(4001), + _recordLength(0), + _padding(0), + _beamAntennaPatternRecordCount(0), + _directedEnergyTargetEnergyDepositionRecordCount(0) {} -DirectedEnergyAreaAimpoint::DirectedEnergyAreaAimpoint(): - _recordType(4001), - _recordLength(0), - _padding(0), - _beamAntennaPatternRecordCount(0), - _directedEnergyTargetEnergyDepositionRecordCount(0) -{ +DirectedEnergyAreaAimpoint::~DirectedEnergyAreaAimpoint() { + _beamAntennaParameterList.clear(); + _directedEnergyTargetEnergyDepositionRecordList.clear(); } -DirectedEnergyAreaAimpoint::~DirectedEnergyAreaAimpoint() -{ - _beamAntennaParameterList.clear(); - _directedEnergyTargetEnergyDepositionRecordList.clear(); +unsigned int DirectedEnergyAreaAimpoint::getRecordType() const { + return _recordType; } -unsigned int DirectedEnergyAreaAimpoint::getRecordType() const -{ - return _recordType; +void DirectedEnergyAreaAimpoint::setRecordType(unsigned int pX) { + _recordType = pX; } -void DirectedEnergyAreaAimpoint::setRecordType(unsigned int pX) -{ - _recordType = pX; +unsigned short DirectedEnergyAreaAimpoint::getRecordLength() const { + return _recordLength; } -unsigned short DirectedEnergyAreaAimpoint::getRecordLength() const -{ - return _recordLength; +void DirectedEnergyAreaAimpoint::setRecordLength(unsigned short pX) { + _recordLength = pX; } -void DirectedEnergyAreaAimpoint::setRecordLength(unsigned short pX) -{ - _recordLength = pX; +unsigned short DirectedEnergyAreaAimpoint::getPadding() const { + return _padding; } -unsigned short DirectedEnergyAreaAimpoint::getPadding() const -{ - return _padding; +void DirectedEnergyAreaAimpoint::setPadding(unsigned short pX) { + _padding = pX; } -void DirectedEnergyAreaAimpoint::setPadding(unsigned short pX) -{ - _padding = pX; +unsigned short DirectedEnergyAreaAimpoint::getBeamAntennaPatternRecordCount() + const { + return _beamAntennaParameterList.size(); } -unsigned short DirectedEnergyAreaAimpoint::getBeamAntennaPatternRecordCount() const -{ - return _beamAntennaParameterList.size(); +unsigned short +DirectedEnergyAreaAimpoint::getDirectedEnergyTargetEnergyDepositionRecordCount() + const { + return _directedEnergyTargetEnergyDepositionRecordList.size(); } -unsigned short DirectedEnergyAreaAimpoint::getDirectedEnergyTargetEnergyDepositionRecordCount() const -{ - return _directedEnergyTargetEnergyDepositionRecordList.size(); +std::vector& +DirectedEnergyAreaAimpoint::getBeamAntennaParameterList() { + return _beamAntennaParameterList; } -std::vector& DirectedEnergyAreaAimpoint::getBeamAntennaParameterList() -{ - return _beamAntennaParameterList; +const std::vector& +DirectedEnergyAreaAimpoint::getBeamAntennaParameterList() const { + return _beamAntennaParameterList; } -const std::vector& DirectedEnergyAreaAimpoint::getBeamAntennaParameterList() const -{ - return _beamAntennaParameterList; +void DirectedEnergyAreaAimpoint::setBeamAntennaParameterList( + const std::vector& pX) { + _beamAntennaParameterList = pX; } -void DirectedEnergyAreaAimpoint::setBeamAntennaParameterList(const std::vector& pX) -{ - _beamAntennaParameterList = pX; +std::vector& DirectedEnergyAreaAimpoint:: + getDirectedEnergyTargetEnergyDepositionRecordList() { + return _directedEnergyTargetEnergyDepositionRecordList; } -std::vector& DirectedEnergyAreaAimpoint::getDirectedEnergyTargetEnergyDepositionRecordList() -{ - return _directedEnergyTargetEnergyDepositionRecordList; +const std::vector& +DirectedEnergyAreaAimpoint::getDirectedEnergyTargetEnergyDepositionRecordList() + const { + return _directedEnergyTargetEnergyDepositionRecordList; } -const std::vector& DirectedEnergyAreaAimpoint::getDirectedEnergyTargetEnergyDepositionRecordList() const -{ - return _directedEnergyTargetEnergyDepositionRecordList; +void DirectedEnergyAreaAimpoint:: + setDirectedEnergyTargetEnergyDepositionRecordList( + const std::vector& pX) { + _directedEnergyTargetEnergyDepositionRecordList = pX; } -void DirectedEnergyAreaAimpoint::setDirectedEnergyTargetEnergyDepositionRecordList(const std::vector& pX) -{ - _directedEnergyTargetEnergyDepositionRecordList = pX; -} - -void DirectedEnergyAreaAimpoint::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _padding; - dataStream << ( unsigned short )_beamAntennaParameterList.size(); - dataStream << ( unsigned short )_directedEnergyTargetEnergyDepositionRecordList.size(); - - for(size_t idx = 0; idx < _beamAntennaParameterList.size(); idx++) - { - BeamAntennaPattern x = _beamAntennaParameterList[idx]; - x.marshal(dataStream); - } +void DirectedEnergyAreaAimpoint::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _padding; + dataStream << (unsigned short)_beamAntennaParameterList.size(); + dataStream << (unsigned short) + _directedEnergyTargetEnergyDepositionRecordList.size(); + for (size_t idx = 0; idx < _beamAntennaParameterList.size(); idx++) { + BeamAntennaPattern x = _beamAntennaParameterList[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _directedEnergyTargetEnergyDepositionRecordList.size(); idx++) - { - DirectedEnergyTargetEnergyDeposition x = _directedEnergyTargetEnergyDepositionRecordList[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; + idx < _directedEnergyTargetEnergyDepositionRecordList.size(); idx++) { + DirectedEnergyTargetEnergyDeposition x = + _directedEnergyTargetEnergyDepositionRecordList[idx]; + x.marshal(dataStream); + } } -void DirectedEnergyAreaAimpoint::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _padding; - dataStream >> _beamAntennaPatternRecordCount; - dataStream >> _directedEnergyTargetEnergyDepositionRecordCount; +void DirectedEnergyAreaAimpoint::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _padding; + dataStream >> _beamAntennaPatternRecordCount; + dataStream >> _directedEnergyTargetEnergyDepositionRecordCount; - _beamAntennaParameterList.clear(); - for(size_t idx = 0; idx < _beamAntennaPatternRecordCount; idx++) - { - BeamAntennaPattern x; - x.unmarshal(dataStream); - _beamAntennaParameterList.push_back(x); - } + _beamAntennaParameterList.clear(); + for (size_t idx = 0; idx < _beamAntennaPatternRecordCount; idx++) { + BeamAntennaPattern x; + x.unmarshal(dataStream); + _beamAntennaParameterList.push_back(x); + } - _directedEnergyTargetEnergyDepositionRecordList.clear(); - for(size_t idx = 0; idx < _directedEnergyTargetEnergyDepositionRecordCount; idx++) - { - DirectedEnergyTargetEnergyDeposition x; - x.unmarshal(dataStream); - _directedEnergyTargetEnergyDepositionRecordList.push_back(x); - } + _directedEnergyTargetEnergyDepositionRecordList.clear(); + for (size_t idx = 0; idx < _directedEnergyTargetEnergyDepositionRecordCount; + idx++) { + DirectedEnergyTargetEnergyDeposition x; + x.unmarshal(dataStream); + _directedEnergyTargetEnergyDepositionRecordList.push_back(x); + } } +bool DirectedEnergyAreaAimpoint::operator==( + const DirectedEnergyAreaAimpoint& rhs) const { + bool ivarsEqual = true; -bool DirectedEnergyAreaAimpoint::operator ==(const DirectedEnergyAreaAimpoint& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - for(size_t idx = 0; idx < _beamAntennaParameterList.size(); idx++) - { - if( ! ( _beamAntennaParameterList[idx] == rhs._beamAntennaParameterList[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _beamAntennaParameterList.size(); idx++) { + if (!(_beamAntennaParameterList[idx] == rhs._beamAntennaParameterList[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; + idx < _directedEnergyTargetEnergyDepositionRecordList.size(); idx++) { + if (!(_directedEnergyTargetEnergyDepositionRecordList[idx] == + rhs._directedEnergyTargetEnergyDepositionRecordList[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _directedEnergyTargetEnergyDepositionRecordList.size(); idx++) - { - if( ! ( _directedEnergyTargetEnergyDepositionRecordList[idx] == rhs._directedEnergyTargetEnergyDepositionRecordList[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int DirectedEnergyAreaAimpoint::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + 2; // _beamAntennaPatternRecordCount - marshalSize = marshalSize + 2; // _directedEnergyTargetEnergyDepositionRecordCount + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _beamAntennaParameterList.size(); idx++) - { - BeamAntennaPattern listElement = _beamAntennaParameterList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int DirectedEnergyAreaAimpoint::getMarshalledSize() const { + int marshalSize = 0; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 2; // _padding + marshalSize = marshalSize + 2; // _beamAntennaPatternRecordCount + marshalSize = + marshalSize + 2; // _directedEnergyTargetEnergyDepositionRecordCount - for(unsigned long long idx=0; idx < _directedEnergyTargetEnergyDepositionRecordList.size(); idx++) - { - DirectedEnergyTargetEnergyDeposition listElement = _directedEnergyTargetEnergyDepositionRecordList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _beamAntennaParameterList.size(); + idx++) { + BeamAntennaPattern listElement = _beamAntennaParameterList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + for (unsigned long long idx = 0; + idx < _directedEnergyTargetEnergyDepositionRecordList.size(); idx++) { + DirectedEnergyTargetEnergyDeposition listElement = + _directedEnergyTargetEnergyDepositionRecordList[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -203,7 +191,7 @@ int DirectedEnergyAreaAimpoint::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyAreaAimpoint.h b/src/dis7/DirectedEnergyAreaAimpoint.h index 2839c60a..119f3018 100644 --- a/src/dis7/DirectedEnergyAreaAimpoint.h +++ b/src/dis7/DirectedEnergyAreaAimpoint.h @@ -1,85 +1,86 @@ #pragma once +#include + #include #include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // DE Precision Aimpoint Record. NOT COMPLETE. Section 6.2.21.2 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DirectedEnergyAreaAimpoint -{ -protected: +class OPENDIS7_EXPORT DirectedEnergyAreaAimpoint { + protected: /** Type of Record */ - unsigned int _recordType; + unsigned int _recordType; /** Length of Record */ - unsigned short _recordLength; + unsigned short _recordLength; /** Padding */ - unsigned short _padding; + unsigned short _padding; /** Number of beam antenna pattern records */ - unsigned short _beamAntennaPatternRecordCount; + unsigned short _beamAntennaPatternRecordCount; /** Number of DE target energy depositon records */ - unsigned short _directedEnergyTargetEnergyDepositionRecordCount; + unsigned short _directedEnergyTargetEnergyDepositionRecordCount; /** list of beam antenna records. See 6.2.9.2 */ - std::vector _beamAntennaParameterList; + std::vector _beamAntennaParameterList; /** list of DE target deposition records. See 6.2.21.4 */ - std::vector _directedEnergyTargetEnergyDepositionRecordList; - + std::vector + _directedEnergyTargetEnergyDepositionRecordList; public: - DirectedEnergyAreaAimpoint(); - virtual ~DirectedEnergyAreaAimpoint(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DirectedEnergyAreaAimpoint(); + virtual ~DirectedEnergyAreaAimpoint(); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned short getBeamAntennaPatternRecordCount() const; + unsigned short getPadding() const; + void setPadding(unsigned short pX); - unsigned short getDirectedEnergyTargetEnergyDepositionRecordCount() const; + unsigned short getBeamAntennaPatternRecordCount() const; - std::vector& getBeamAntennaParameterList(); - const std::vector& getBeamAntennaParameterList() const; - void setBeamAntennaParameterList(const std::vector& pX); + unsigned short getDirectedEnergyTargetEnergyDepositionRecordCount() const; - std::vector& getDirectedEnergyTargetEnergyDepositionRecordList(); - const std::vector& getDirectedEnergyTargetEnergyDepositionRecordList() const; - void setDirectedEnergyTargetEnergyDepositionRecordList(const std::vector& pX); + std::vector& getBeamAntennaParameterList(); + const std::vector& getBeamAntennaParameterList() const; + void setBeamAntennaParameterList(const std::vector& pX); + std::vector& + getDirectedEnergyTargetEnergyDepositionRecordList(); + const std::vector& + getDirectedEnergyTargetEnergyDepositionRecordList() const; + void setDirectedEnergyTargetEnergyDepositionRecordList( + const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DirectedEnergyAreaAimpoint& rhs) const; + bool operator==(const DirectedEnergyAreaAimpoint& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -92,7 +93,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyDamage.cpp b/src/dis7/DirectedEnergyDamage.cpp index be482ca3..0ca7bfdc 100644 --- a/src/dis7/DirectedEnergyDamage.cpp +++ b/src/dis7/DirectedEnergyDamage.cpp @@ -2,234 +2,183 @@ using namespace DIS; +DirectedEnergyDamage::DirectedEnergyDamage() + : _recordType(4500), + _recordLength(40), + _padding(0), + _damageLocation(), + _damageDiameter(0.0), + _temperature(-273.15), + _componentIdentification(0), + _componentDamageStatus(0), + _componentVisualDamageStatus(0), + _componentVisualSmokeColor(0), + _fireEventID(), + _padding2(0) {} -DirectedEnergyDamage::DirectedEnergyDamage(): - _recordType(4500), - _recordLength(40), - _padding(0), - _damageLocation(), - _damageDiameter(0.0), - _temperature(-273.15), - _componentIdentification(0), - _componentDamageStatus(0), - _componentVisualDamageStatus(0), - _componentVisualSmokeColor(0), - _fireEventID(), - _padding2(0) -{ -} +DirectedEnergyDamage::~DirectedEnergyDamage() {} -DirectedEnergyDamage::~DirectedEnergyDamage() -{ -} +unsigned int DirectedEnergyDamage::getRecordType() const { return _recordType; } -unsigned int DirectedEnergyDamage::getRecordType() const -{ - return _recordType; -} +void DirectedEnergyDamage::setRecordType(unsigned int pX) { _recordType = pX; } -void DirectedEnergyDamage::setRecordType(unsigned int pX) -{ - _recordType = pX; +unsigned short DirectedEnergyDamage::getRecordLength() const { + return _recordLength; } -unsigned short DirectedEnergyDamage::getRecordLength() const -{ - return _recordLength; +void DirectedEnergyDamage::setRecordLength(unsigned short pX) { + _recordLength = pX; } -void DirectedEnergyDamage::setRecordLength(unsigned short pX) -{ - _recordLength = pX; -} +unsigned short DirectedEnergyDamage::getPadding() const { return _padding; } -unsigned short DirectedEnergyDamage::getPadding() const -{ - return _padding; -} +void DirectedEnergyDamage::setPadding(unsigned short pX) { _padding = pX; } -void DirectedEnergyDamage::setPadding(unsigned short pX) -{ - _padding = pX; +Vector3Float& DirectedEnergyDamage::getDamageLocation() { + return _damageLocation; } -Vector3Float& DirectedEnergyDamage::getDamageLocation() -{ - return _damageLocation; +const Vector3Float& DirectedEnergyDamage::getDamageLocation() const { + return _damageLocation; } -const Vector3Float& DirectedEnergyDamage::getDamageLocation() const -{ - return _damageLocation; +void DirectedEnergyDamage::setDamageLocation(const Vector3Float& pX) { + _damageLocation = pX; } -void DirectedEnergyDamage::setDamageLocation(const Vector3Float &pX) -{ - _damageLocation = pX; +float DirectedEnergyDamage::getDamageDiameter() const { + return _damageDiameter; } -float DirectedEnergyDamage::getDamageDiameter() const -{ - return _damageDiameter; -} +void DirectedEnergyDamage::setDamageDiameter(float pX) { _damageDiameter = pX; } -void DirectedEnergyDamage::setDamageDiameter(float pX) -{ - _damageDiameter = pX; -} +float DirectedEnergyDamage::getTemperature() const { return _temperature; } -float DirectedEnergyDamage::getTemperature() const -{ - return _temperature; -} +void DirectedEnergyDamage::setTemperature(float pX) { _temperature = pX; } -void DirectedEnergyDamage::setTemperature(float pX) -{ - _temperature = pX; +unsigned char DirectedEnergyDamage::getComponentIdentification() const { + return _componentIdentification; } -unsigned char DirectedEnergyDamage::getComponentIdentification() const -{ - return _componentIdentification; +void DirectedEnergyDamage::setComponentIdentification(unsigned char pX) { + _componentIdentification = pX; } -void DirectedEnergyDamage::setComponentIdentification(unsigned char pX) -{ - _componentIdentification = pX; +unsigned char DirectedEnergyDamage::getComponentDamageStatus() const { + return _componentDamageStatus; } -unsigned char DirectedEnergyDamage::getComponentDamageStatus() const -{ - return _componentDamageStatus; +void DirectedEnergyDamage::setComponentDamageStatus(unsigned char pX) { + _componentDamageStatus = pX; } -void DirectedEnergyDamage::setComponentDamageStatus(unsigned char pX) -{ - _componentDamageStatus = pX; +unsigned char DirectedEnergyDamage::getComponentVisualDamageStatus() const { + return _componentVisualDamageStatus; } -unsigned char DirectedEnergyDamage::getComponentVisualDamageStatus() const -{ - return _componentVisualDamageStatus; +void DirectedEnergyDamage::setComponentVisualDamageStatus(unsigned char pX) { + _componentVisualDamageStatus = pX; } -void DirectedEnergyDamage::setComponentVisualDamageStatus(unsigned char pX) -{ - _componentVisualDamageStatus = pX; +unsigned char DirectedEnergyDamage::getComponentVisualSmokeColor() const { + return _componentVisualSmokeColor; } -unsigned char DirectedEnergyDamage::getComponentVisualSmokeColor() const -{ - return _componentVisualSmokeColor; +void DirectedEnergyDamage::setComponentVisualSmokeColor(unsigned char pX) { + _componentVisualSmokeColor = pX; } -void DirectedEnergyDamage::setComponentVisualSmokeColor(unsigned char pX) -{ - _componentVisualSmokeColor = pX; -} +EventIdentifier& DirectedEnergyDamage::getFireEventID() { return _fireEventID; } -EventIdentifier& DirectedEnergyDamage::getFireEventID() -{ - return _fireEventID; +const EventIdentifier& DirectedEnergyDamage::getFireEventID() const { + return _fireEventID; } -const EventIdentifier& DirectedEnergyDamage::getFireEventID() const -{ - return _fireEventID; +void DirectedEnergyDamage::setFireEventID(const EventIdentifier& pX) { + _fireEventID = pX; } -void DirectedEnergyDamage::setFireEventID(const EventIdentifier &pX) -{ - _fireEventID = pX; -} +unsigned short DirectedEnergyDamage::getPadding2() const { return _padding2; } -unsigned short DirectedEnergyDamage::getPadding2() const -{ - return _padding2; -} +void DirectedEnergyDamage::setPadding2(unsigned short pX) { _padding2 = pX; } -void DirectedEnergyDamage::setPadding2(unsigned short pX) -{ - _padding2 = pX; +void DirectedEnergyDamage::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _padding; + _damageLocation.marshal(dataStream); + dataStream << _damageDiameter; + dataStream << _temperature; + dataStream << _componentIdentification; + dataStream << _componentDamageStatus; + dataStream << _componentVisualDamageStatus; + dataStream << _componentVisualSmokeColor; + _fireEventID.marshal(dataStream); + dataStream << _padding2; } -void DirectedEnergyDamage::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _padding; - _damageLocation.marshal(dataStream); - dataStream << _damageDiameter; - dataStream << _temperature; - dataStream << _componentIdentification; - dataStream << _componentDamageStatus; - dataStream << _componentVisualDamageStatus; - dataStream << _componentVisualSmokeColor; - _fireEventID.marshal(dataStream); - dataStream << _padding2; +void DirectedEnergyDamage::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _padding; + _damageLocation.unmarshal(dataStream); + dataStream >> _damageDiameter; + dataStream >> _temperature; + dataStream >> _componentIdentification; + dataStream >> _componentDamageStatus; + dataStream >> _componentVisualDamageStatus; + dataStream >> _componentVisualSmokeColor; + _fireEventID.unmarshal(dataStream); + dataStream >> _padding2; } -void DirectedEnergyDamage::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _padding; - _damageLocation.unmarshal(dataStream); - dataStream >> _damageDiameter; - dataStream >> _temperature; - dataStream >> _componentIdentification; - dataStream >> _componentDamageStatus; - dataStream >> _componentVisualDamageStatus; - dataStream >> _componentVisualSmokeColor; - _fireEventID.unmarshal(dataStream); - dataStream >> _padding2; +bool DirectedEnergyDamage::operator==(const DirectedEnergyDamage& rhs) const { + bool ivarsEqual = true; + + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_damageLocation == rhs._damageLocation)) ivarsEqual = false; + if (!(_damageDiameter == rhs._damageDiameter)) ivarsEqual = false; + if (!(_temperature == rhs._temperature)) ivarsEqual = false; + if (!(_componentIdentification == rhs._componentIdentification)) + ivarsEqual = false; + if (!(_componentDamageStatus == rhs._componentDamageStatus)) + ivarsEqual = false; + if (!(_componentVisualDamageStatus == rhs._componentVisualDamageStatus)) + ivarsEqual = false; + if (!(_componentVisualSmokeColor == rhs._componentVisualSmokeColor)) + ivarsEqual = false; + if (!(_fireEventID == rhs._fireEventID)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + + return ivarsEqual; } +int DirectedEnergyDamage::getMarshalledSize() const { + int marshalSize = 0; -bool DirectedEnergyDamage::operator ==(const DirectedEnergyDamage& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_damageLocation == rhs._damageLocation) ) ivarsEqual = false; - if( ! (_damageDiameter == rhs._damageDiameter) ) ivarsEqual = false; - if( ! (_temperature == rhs._temperature) ) ivarsEqual = false; - if( ! (_componentIdentification == rhs._componentIdentification) ) ivarsEqual = false; - if( ! (_componentDamageStatus == rhs._componentDamageStatus) ) ivarsEqual = false; - if( ! (_componentVisualDamageStatus == rhs._componentVisualDamageStatus) ) ivarsEqual = false; - if( ! (_componentVisualSmokeColor == rhs._componentVisualSmokeColor) ) ivarsEqual = false; - if( ! (_fireEventID == rhs._fireEventID) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - - return ivarsEqual; - } - -int DirectedEnergyDamage::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + _damageLocation.getMarshalledSize(); // _damageLocation - marshalSize = marshalSize + 4; // _damageDiameter - marshalSize = marshalSize + 4; // _temperature - marshalSize = marshalSize + 1; // _componentIdentification - marshalSize = marshalSize + 1; // _componentDamageStatus - marshalSize = marshalSize + 1; // _componentVisualDamageStatus - marshalSize = marshalSize + 1; // _componentVisualSmokeColor - marshalSize = marshalSize + _fireEventID.getMarshalledSize(); // _fireEventID - marshalSize = marshalSize + 2; // _padding2 - return marshalSize; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 2; // _padding + marshalSize = + marshalSize + _damageLocation.getMarshalledSize(); // _damageLocation + marshalSize = marshalSize + 4; // _damageDiameter + marshalSize = marshalSize + 4; // _temperature + marshalSize = marshalSize + 1; // _componentIdentification + marshalSize = marshalSize + 1; // _componentDamageStatus + marshalSize = marshalSize + 1; // _componentVisualDamageStatus + marshalSize = marshalSize + 1; // _componentVisualSmokeColor + marshalSize = marshalSize + _fireEventID.getMarshalledSize(); // _fireEventID + marshalSize = marshalSize + 2; // _padding2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -242,7 +191,7 @@ int DirectedEnergyDamage::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyDamage.h b/src/dis7/DirectedEnergyDamage.h index 5276a1a0..8eb140d9 100644 --- a/src/dis7/DirectedEnergyDamage.h +++ b/src/dis7/DirectedEnergyDamage.h @@ -1,116 +1,116 @@ #pragma once -#include #include -#include +#include #include +#include +namespace DIS { +// Damage sustained by an entity due to directed energy. Location of the damage +// based on a relative x,y,z location from the center of the entity. +// Section 6.2.17.2 -namespace DIS -{ -// Damage sustained by an entity due to directed energy. Location of the damage based on a relative x,y,z location from the center of the entity. Section 6.2.17.2 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DirectedEnergyDamage -{ -protected: +class OPENDIS7_EXPORT DirectedEnergyDamage { + protected: /** DE Record Type. */ - unsigned int _recordType; + unsigned int _recordType; /** DE Record Length (bytes). */ - unsigned short _recordLength; + unsigned short _recordLength; /** padding. */ - unsigned short _padding; + unsigned short _padding; /** location of damage, relative to center of entity */ - Vector3Float _damageLocation; + Vector3Float _damageLocation; /** Size of damaged area, in meters. */ - float _damageDiameter; + float _damageDiameter; - /** average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15 */ - float _temperature; + /** average temp of the damaged area, in degrees celsius. If firing entitty + * does not model this, use a value of -273.15 */ + float _temperature; /** enumeration */ - unsigned char _componentIdentification; + unsigned char _componentIdentification; /** enumeration */ - unsigned char _componentDamageStatus; + unsigned char _componentDamageStatus; /** enumeration */ - unsigned char _componentVisualDamageStatus; + unsigned char _componentVisualDamageStatus; /** enumeration */ - unsigned char _componentVisualSmokeColor; + unsigned char _componentVisualSmokeColor; - /** For any component damage resulting this field shall be set to the fire event ID from that PDU. */ - EventIdentifier _fireEventID; + /** For any component damage resulting this field shall be set to the fire + * event ID from that PDU. */ + EventIdentifier _fireEventID; /** padding */ - unsigned short _padding2; - + unsigned short _padding2; public: - DirectedEnergyDamage(); - virtual ~DirectedEnergyDamage(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DirectedEnergyDamage(); + virtual ~DirectedEnergyDamage(); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - Vector3Float& getDamageLocation(); - const Vector3Float& getDamageLocation() const; - void setDamageLocation(const Vector3Float &pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - float getDamageDiameter() const; - void setDamageDiameter(float pX); + Vector3Float& getDamageLocation(); + const Vector3Float& getDamageLocation() const; + void setDamageLocation(const Vector3Float& pX); - float getTemperature() const; - void setTemperature(float pX); + float getDamageDiameter() const; + void setDamageDiameter(float pX); - unsigned char getComponentIdentification() const; - void setComponentIdentification(unsigned char pX); + float getTemperature() const; + void setTemperature(float pX); - unsigned char getComponentDamageStatus() const; - void setComponentDamageStatus(unsigned char pX); + unsigned char getComponentIdentification() const; + void setComponentIdentification(unsigned char pX); - unsigned char getComponentVisualDamageStatus() const; - void setComponentVisualDamageStatus(unsigned char pX); + unsigned char getComponentDamageStatus() const; + void setComponentDamageStatus(unsigned char pX); - unsigned char getComponentVisualSmokeColor() const; - void setComponentVisualSmokeColor(unsigned char pX); + unsigned char getComponentVisualDamageStatus() const; + void setComponentVisualDamageStatus(unsigned char pX); - EventIdentifier& getFireEventID(); - const EventIdentifier& getFireEventID() const; - void setFireEventID(const EventIdentifier &pX); + unsigned char getComponentVisualSmokeColor() const; + void setComponentVisualSmokeColor(unsigned char pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + EventIdentifier& getFireEventID(); + const EventIdentifier& getFireEventID() const; + void setFireEventID(const EventIdentifier& pX); + unsigned short getPadding2() const; + void setPadding2(unsigned short pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DirectedEnergyDamage& rhs) const; + bool operator==(const DirectedEnergyDamage& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -123,7 +123,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyFirePdu.cpp b/src/dis7/DirectedEnergyFirePdu.cpp index 76f4aa06..661fed22 100644 --- a/src/dis7/DirectedEnergyFirePdu.cpp +++ b/src/dis7/DirectedEnergyFirePdu.cpp @@ -2,328 +2,257 @@ using namespace DIS; - -DirectedEnergyFirePdu::DirectedEnergyFirePdu() : WarfareFamilyPdu(), - _munitionType(), - _shotStartTime(), - _commulativeShotTime(0.0), - _ApertureEmitterLocation(), - _apertureDiameter(0.0), - _wavelength(0.0), - _peakIrradiance(0.0), - _pulseRepetitionFrequency(0.0), - _pulseWidth(0), - _flags(0), - _pulseShape(0), - _padding1(0), - _padding2(0), - _padding3(0), - _numberOfDERecords(0) -{ - setPduType( 68 ); +DirectedEnergyFirePdu::DirectedEnergyFirePdu() + : WarfareFamilyPdu(), + _munitionType(), + _shotStartTime(), + _commulativeShotTime(0.0), + _ApertureEmitterLocation(), + _apertureDiameter(0.0), + _wavelength(0.0), + _peakIrradiance(0.0), + _pulseRepetitionFrequency(0.0), + _pulseWidth(0), + _flags(0), + _pulseShape(0), + _padding1(0), + _padding2(0), + _padding3(0), + _numberOfDERecords(0) { + setPduType(68); } -DirectedEnergyFirePdu::~DirectedEnergyFirePdu() -{ - _dERecords.clear(); -} +DirectedEnergyFirePdu::~DirectedEnergyFirePdu() { _dERecords.clear(); } -EntityType& DirectedEnergyFirePdu::getMunitionType() -{ - return _munitionType; -} +EntityType& DirectedEnergyFirePdu::getMunitionType() { return _munitionType; } -const EntityType& DirectedEnergyFirePdu::getMunitionType() const -{ - return _munitionType; +const EntityType& DirectedEnergyFirePdu::getMunitionType() const { + return _munitionType; } -void DirectedEnergyFirePdu::setMunitionType(const EntityType &pX) -{ - _munitionType = pX; +void DirectedEnergyFirePdu::setMunitionType(const EntityType& pX) { + _munitionType = pX; } -ClockTime& DirectedEnergyFirePdu::getShotStartTime() -{ - return _shotStartTime; -} +ClockTime& DirectedEnergyFirePdu::getShotStartTime() { return _shotStartTime; } -const ClockTime& DirectedEnergyFirePdu::getShotStartTime() const -{ - return _shotStartTime; +const ClockTime& DirectedEnergyFirePdu::getShotStartTime() const { + return _shotStartTime; } -void DirectedEnergyFirePdu::setShotStartTime(const ClockTime &pX) -{ - _shotStartTime = pX; +void DirectedEnergyFirePdu::setShotStartTime(const ClockTime& pX) { + _shotStartTime = pX; } -float DirectedEnergyFirePdu::getCommulativeShotTime() const -{ - return _commulativeShotTime; +float DirectedEnergyFirePdu::getCommulativeShotTime() const { + return _commulativeShotTime; } -void DirectedEnergyFirePdu::setCommulativeShotTime(float pX) -{ - _commulativeShotTime = pX; +void DirectedEnergyFirePdu::setCommulativeShotTime(float pX) { + _commulativeShotTime = pX; } -Vector3Float& DirectedEnergyFirePdu::getApertureEmitterLocation() -{ - return _ApertureEmitterLocation; +Vector3Float& DirectedEnergyFirePdu::getApertureEmitterLocation() { + return _ApertureEmitterLocation; } -const Vector3Float& DirectedEnergyFirePdu::getApertureEmitterLocation() const -{ - return _ApertureEmitterLocation; +const Vector3Float& DirectedEnergyFirePdu::getApertureEmitterLocation() const { + return _ApertureEmitterLocation; } -void DirectedEnergyFirePdu::setApertureEmitterLocation(const Vector3Float &pX) -{ - _ApertureEmitterLocation = pX; +void DirectedEnergyFirePdu::setApertureEmitterLocation(const Vector3Float& pX) { + _ApertureEmitterLocation = pX; } -float DirectedEnergyFirePdu::getApertureDiameter() const -{ - return _apertureDiameter; +float DirectedEnergyFirePdu::getApertureDiameter() const { + return _apertureDiameter; } -void DirectedEnergyFirePdu::setApertureDiameter(float pX) -{ - _apertureDiameter = pX; +void DirectedEnergyFirePdu::setApertureDiameter(float pX) { + _apertureDiameter = pX; } -float DirectedEnergyFirePdu::getWavelength() const -{ - return _wavelength; -} +float DirectedEnergyFirePdu::getWavelength() const { return _wavelength; } -void DirectedEnergyFirePdu::setWavelength(float pX) -{ - _wavelength = pX; -} +void DirectedEnergyFirePdu::setWavelength(float pX) { _wavelength = pX; } -float DirectedEnergyFirePdu::getPeakIrradiance() const -{ - return _peakIrradiance; +float DirectedEnergyFirePdu::getPeakIrradiance() const { + return _peakIrradiance; } -void DirectedEnergyFirePdu::setPeakIrradiance(float pX) -{ - _peakIrradiance = pX; +void DirectedEnergyFirePdu::setPeakIrradiance(float pX) { + _peakIrradiance = pX; } -float DirectedEnergyFirePdu::getPulseRepetitionFrequency() const -{ - return _pulseRepetitionFrequency; +float DirectedEnergyFirePdu::getPulseRepetitionFrequency() const { + return _pulseRepetitionFrequency; } -void DirectedEnergyFirePdu::setPulseRepetitionFrequency(float pX) -{ - _pulseRepetitionFrequency = pX; +void DirectedEnergyFirePdu::setPulseRepetitionFrequency(float pX) { + _pulseRepetitionFrequency = pX; } -int DirectedEnergyFirePdu::getPulseWidth() const -{ - return _pulseWidth; -} +int DirectedEnergyFirePdu::getPulseWidth() const { return _pulseWidth; } -void DirectedEnergyFirePdu::setPulseWidth(int pX) -{ - _pulseWidth = pX; -} +void DirectedEnergyFirePdu::setPulseWidth(int pX) { _pulseWidth = pX; } -int DirectedEnergyFirePdu::getFlags() const -{ - return _flags; -} +int DirectedEnergyFirePdu::getFlags() const { return _flags; } -void DirectedEnergyFirePdu::setFlags(int pX) -{ - _flags = pX; -} +void DirectedEnergyFirePdu::setFlags(int pX) { _flags = pX; } -char DirectedEnergyFirePdu::getPulseShape() const -{ - return _pulseShape; -} +char DirectedEnergyFirePdu::getPulseShape() const { return _pulseShape; } -void DirectedEnergyFirePdu::setPulseShape(char pX) -{ - _pulseShape = pX; -} +void DirectedEnergyFirePdu::setPulseShape(char pX) { _pulseShape = pX; } -unsigned char DirectedEnergyFirePdu::getPadding1() const -{ - return _padding1; -} +unsigned char DirectedEnergyFirePdu::getPadding1() const { return _padding1; } -void DirectedEnergyFirePdu::setPadding1(unsigned char pX) -{ - _padding1 = pX; -} +void DirectedEnergyFirePdu::setPadding1(unsigned char pX) { _padding1 = pX; } -unsigned int DirectedEnergyFirePdu::getPadding2() const -{ - return _padding2; -} +unsigned int DirectedEnergyFirePdu::getPadding2() const { return _padding2; } -void DirectedEnergyFirePdu::setPadding2(unsigned int pX) -{ - _padding2 = pX; -} +void DirectedEnergyFirePdu::setPadding2(unsigned int pX) { _padding2 = pX; } -unsigned short DirectedEnergyFirePdu::getPadding3() const -{ - return _padding3; -} +unsigned short DirectedEnergyFirePdu::getPadding3() const { return _padding3; } -void DirectedEnergyFirePdu::setPadding3(unsigned short pX) -{ - _padding3 = pX; -} +void DirectedEnergyFirePdu::setPadding3(unsigned short pX) { _padding3 = pX; } -unsigned short DirectedEnergyFirePdu::getNumberOfDERecords() const -{ - return _dERecords.size(); +unsigned short DirectedEnergyFirePdu::getNumberOfDERecords() const { + return _dERecords.size(); } -std::vector& DirectedEnergyFirePdu::getDERecords() -{ - return _dERecords; +std::vector& +DirectedEnergyFirePdu::getDERecords() { + return _dERecords; } -const std::vector& DirectedEnergyFirePdu::getDERecords() const -{ - return _dERecords; +const std::vector& +DirectedEnergyFirePdu::getDERecords() const { + return _dERecords; } -void DirectedEnergyFirePdu::setDERecords(const std::vector& pX) -{ - _dERecords = pX; +void DirectedEnergyFirePdu::setDERecords( + const std::vector& pX) { + _dERecords = pX; } -void DirectedEnergyFirePdu::marshal(DataStream& dataStream) const -{ - WarfareFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _munitionType.marshal(dataStream); - _shotStartTime.marshal(dataStream); - dataStream << _commulativeShotTime; - _ApertureEmitterLocation.marshal(dataStream); - dataStream << _apertureDiameter; - dataStream << _wavelength; - dataStream << _peakIrradiance; - dataStream << _pulseRepetitionFrequency; - dataStream << _pulseWidth; - dataStream << _flags; - dataStream << _pulseShape; - dataStream << _padding1; - dataStream << _padding2; - dataStream << _padding3; - dataStream << ( unsigned short )_dERecords.size(); - - for(size_t idx = 0; idx < _dERecords.size(); idx++) - { - StandardVariableSpecification x = _dERecords[idx]; - x.marshal(dataStream); - } +void DirectedEnergyFirePdu::marshal(DataStream& dataStream) const { + WarfareFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _munitionType.marshal(dataStream); + _shotStartTime.marshal(dataStream); + dataStream << _commulativeShotTime; + _ApertureEmitterLocation.marshal(dataStream); + dataStream << _apertureDiameter; + dataStream << _wavelength; + dataStream << _peakIrradiance; + dataStream << _pulseRepetitionFrequency; + dataStream << _pulseWidth; + dataStream << _flags; + dataStream << _pulseShape; + dataStream << _padding1; + dataStream << _padding2; + dataStream << _padding3; + dataStream << (unsigned short)_dERecords.size(); + for (size_t idx = 0; idx < _dERecords.size(); idx++) { + StandardVariableSpecification x = _dERecords[idx]; + x.marshal(dataStream); + } } -void DirectedEnergyFirePdu::unmarshal(DataStream& dataStream) -{ - WarfareFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _munitionType.unmarshal(dataStream); - _shotStartTime.unmarshal(dataStream); - dataStream >> _commulativeShotTime; - _ApertureEmitterLocation.unmarshal(dataStream); - dataStream >> _apertureDiameter; - dataStream >> _wavelength; - dataStream >> _peakIrradiance; - dataStream >> _pulseRepetitionFrequency; - dataStream >> _pulseWidth; - dataStream >> _flags; - dataStream >> _pulseShape; - dataStream >> _padding1; - dataStream >> _padding2; - dataStream >> _padding3; - dataStream >> _numberOfDERecords; - - _dERecords.clear(); - for(size_t idx = 0; idx < _numberOfDERecords; idx++) - { - StandardVariableSpecification x; - x.unmarshal(dataStream); - _dERecords.push_back(x); - } +void DirectedEnergyFirePdu::unmarshal(DataStream& dataStream) { + WarfareFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _munitionType.unmarshal(dataStream); + _shotStartTime.unmarshal(dataStream); + dataStream >> _commulativeShotTime; + _ApertureEmitterLocation.unmarshal(dataStream); + dataStream >> _apertureDiameter; + dataStream >> _wavelength; + dataStream >> _peakIrradiance; + dataStream >> _pulseRepetitionFrequency; + dataStream >> _pulseWidth; + dataStream >> _flags; + dataStream >> _pulseShape; + dataStream >> _padding1; + dataStream >> _padding2; + dataStream >> _padding3; + dataStream >> _numberOfDERecords; + + _dERecords.clear(); + for (size_t idx = 0; idx < _numberOfDERecords; idx++) { + StandardVariableSpecification x; + x.unmarshal(dataStream); + _dERecords.push_back(x); + } } +bool DirectedEnergyFirePdu::operator==(const DirectedEnergyFirePdu& rhs) const { + bool ivarsEqual = true; -bool DirectedEnergyFirePdu::operator ==(const DirectedEnergyFirePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = WarfareFamilyPdu::operator==(rhs); - - if( ! (_munitionType == rhs._munitionType) ) ivarsEqual = false; - if( ! (_shotStartTime == rhs._shotStartTime) ) ivarsEqual = false; - if( ! (_commulativeShotTime == rhs._commulativeShotTime) ) ivarsEqual = false; - if( ! (_ApertureEmitterLocation == rhs._ApertureEmitterLocation) ) ivarsEqual = false; - if( ! (_apertureDiameter == rhs._apertureDiameter) ) ivarsEqual = false; - if( ! (_wavelength == rhs._wavelength) ) ivarsEqual = false; - if( ! (_peakIrradiance == rhs._peakIrradiance) ) ivarsEqual = false; - if( ! (_pulseRepetitionFrequency == rhs._pulseRepetitionFrequency) ) ivarsEqual = false; - if( ! (_pulseWidth == rhs._pulseWidth) ) ivarsEqual = false; - if( ! (_flags == rhs._flags) ) ivarsEqual = false; - if( ! (_pulseShape == rhs._pulseShape) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_padding3 == rhs._padding3) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _dERecords.size(); idx++) - { - if( ! ( _dERecords[idx] == rhs._dERecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int DirectedEnergyFirePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = WarfareFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _munitionType.getMarshalledSize(); // _munitionType - marshalSize = marshalSize + _shotStartTime.getMarshalledSize(); // _shotStartTime - marshalSize = marshalSize + 4; // _commulativeShotTime - marshalSize = marshalSize + _ApertureEmitterLocation.getMarshalledSize(); // _ApertureEmitterLocation - marshalSize = marshalSize + 4; // _apertureDiameter - marshalSize = marshalSize + 4; // _wavelength - marshalSize = marshalSize + 4; // _peakIrradiance - marshalSize = marshalSize + 4; // _pulseRepetitionFrequency - marshalSize = marshalSize + 4; // _pulseWidth - marshalSize = marshalSize + 4; // _flags - marshalSize = marshalSize + 1; // _pulseShape - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 4; // _padding2 - marshalSize = marshalSize + 2; // _padding3 - marshalSize = marshalSize + 2; // _numberOfDERecords - - for(unsigned long long idx=0; idx < _dERecords.size(); idx++) - { - StandardVariableSpecification listElement = _dERecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + ivarsEqual = WarfareFamilyPdu::operator==(rhs); + + if (!(_munitionType == rhs._munitionType)) ivarsEqual = false; + if (!(_shotStartTime == rhs._shotStartTime)) ivarsEqual = false; + if (!(_commulativeShotTime == rhs._commulativeShotTime)) ivarsEqual = false; + if (!(_ApertureEmitterLocation == rhs._ApertureEmitterLocation)) + ivarsEqual = false; + if (!(_apertureDiameter == rhs._apertureDiameter)) ivarsEqual = false; + if (!(_wavelength == rhs._wavelength)) ivarsEqual = false; + if (!(_peakIrradiance == rhs._peakIrradiance)) ivarsEqual = false; + if (!(_pulseRepetitionFrequency == rhs._pulseRepetitionFrequency)) + ivarsEqual = false; + if (!(_pulseWidth == rhs._pulseWidth)) ivarsEqual = false; + if (!(_flags == rhs._flags)) ivarsEqual = false; + if (!(_pulseShape == rhs._pulseShape)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_padding3 == rhs._padding3)) ivarsEqual = false; + + for (size_t idx = 0; idx < _dERecords.size(); idx++) { + if (!(_dERecords[idx] == rhs._dERecords[idx])) ivarsEqual = false; + } + + return ivarsEqual; +} + +int DirectedEnergyFirePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = WarfareFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _munitionType.getMarshalledSize(); // _munitionType + marshalSize = + marshalSize + _shotStartTime.getMarshalledSize(); // _shotStartTime + marshalSize = marshalSize + 4; // _commulativeShotTime + marshalSize = + marshalSize + + _ApertureEmitterLocation.getMarshalledSize(); // _ApertureEmitterLocation + marshalSize = marshalSize + 4; // _apertureDiameter + marshalSize = marshalSize + 4; // _wavelength + marshalSize = marshalSize + 4; // _peakIrradiance + marshalSize = marshalSize + 4; // _pulseRepetitionFrequency + marshalSize = marshalSize + 4; // _pulseWidth + marshalSize = marshalSize + 4; // _flags + marshalSize = marshalSize + 1; // _pulseShape + marshalSize = marshalSize + 1; // _padding1 + marshalSize = marshalSize + 4; // _padding2 + marshalSize = marshalSize + 2; // _padding3 + marshalSize = marshalSize + 2; // _numberOfDERecords + + for (unsigned long long idx = 0; idx < _dERecords.size(); idx++) { + StandardVariableSpecification listElement = _dERecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -336,7 +265,7 @@ int DirectedEnergyFirePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyFirePdu.h b/src/dis7/DirectedEnergyFirePdu.h index 4f75e74c..e5895588 100644 --- a/src/dis7/DirectedEnergyFirePdu.h +++ b/src/dis7/DirectedEnergyFirePdu.h @@ -1,145 +1,155 @@ #pragma once -#include +#include + #include -#include +#include #include -#include +#include #include -#include #include +#include +namespace DIS { +// Firing of a directed energy weapon shall be communicated by issuing a +// Directed Energy Fire PDU Section 7.3.4 COMPLETE -namespace DIS -{ -// Firing of a directed energy weapon shall be communicated by issuing a Directed Energy Fire PDU Section 7.3.4 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DirectedEnergyFirePdu : public WarfareFamilyPdu -{ -protected: - /** Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4 */ - EntityType _munitionType; +class OPENDIS7_EXPORT DirectedEnergyFirePdu : public WarfareFamilyPdu { + protected: + /** Field shall identify the munition type enumeration for the DE weapon beam, + * Section 7.3.4 */ + EntityType _munitionType; - /** Field shall indicate the simulation time at start of the shot, Section 7.3.4 */ - ClockTime _shotStartTime; + /** Field shall indicate the simulation time at start of the shot, + * Section 7.3.4 */ + ClockTime _shotStartTime; - /** Field shall indicate the current cumulative duration of the shot, Section 7.3.4 */ - float _commulativeShotTime; + /** Field shall indicate the current cumulative duration of the shot, + * Section 7.3.4 */ + float _commulativeShotTime; - /** Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4 */ - Vector3Float _ApertureEmitterLocation; + /** Field shall identify the location of the DE weapon aperture/emitter, + * Section 7.3.4 */ + Vector3Float _ApertureEmitterLocation; - /** Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4 */ - float _apertureDiameter; + /** Field shall identify the beam diameter at the aperture/emitter, + * Section 7.3.4 */ + float _apertureDiameter; - /** Field shall identify the emissions wavelength in units of meters, Section 7.3.4 */ - float _wavelength; + /** Field shall identify the emissions wavelength in units of meters, + * Section 7.3.4 */ + float _wavelength; - /** Field shall identify the current peak irradiance of emissions in units of Watts per square meter, Section 7.3.4 */ - float _peakIrradiance; + /** Field shall identify the current peak irradiance of emissions in units of + * Watts per square meter, Section 7.3.4 */ + float _peakIrradiance; - /** field shall identify the current pulse repetition frequency in units of cycles per second (Hertz), Section 7.3.4 */ - float _pulseRepetitionFrequency; + /** field shall identify the current pulse repetition frequency in units of + * cycles per second (Hertz), Section 7.3.4 */ + float _pulseRepetitionFrequency; - /** field shall identify the pulse width emissions in units of seconds, Section 7.3.4 */ - int _pulseWidth; + /** field shall identify the pulse width emissions in units of seconds, + * Section 7.3.4 */ + int _pulseWidth; - /** 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4 */ - int _flags; + /** 16bit Boolean field shall contain various flags to indicate status + * information needed to process a DE, Section 7.3.4 */ + int _flags; - /** Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4 */ - char _pulseShape; + /** Field shall identify the pulse shape and shall be represented as an 8-bit + * enumeration, Section 7.3.4 */ + char _pulseShape; /** padding, Section 7.3.4 */ - unsigned char _padding1; + unsigned char _padding1; /** padding, Section 7.3.4 */ - unsigned int _padding2; + unsigned int _padding2; /** padding, Section 7.3.4 */ - unsigned short _padding3; + unsigned short _padding3; /** Field shall specify the number of DE records, Section 7.3.4 */ - unsigned short _numberOfDERecords; - - /** Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4 */ - std::vector _dERecords; + unsigned short _numberOfDERecords; + /** Fields shall contain one or more DE records, records shall conform to the + * variable record format (Section6.2.82), Section 7.3.4 */ + std::vector _dERecords; public: - DirectedEnergyFirePdu(); - virtual ~DirectedEnergyFirePdu(); + DirectedEnergyFirePdu(); + virtual ~DirectedEnergyFirePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getMunitionType(); - const EntityType& getMunitionType() const; - void setMunitionType(const EntityType &pX); + EntityType& getMunitionType(); + const EntityType& getMunitionType() const; + void setMunitionType(const EntityType& pX); - ClockTime& getShotStartTime(); - const ClockTime& getShotStartTime() const; - void setShotStartTime(const ClockTime &pX); + ClockTime& getShotStartTime(); + const ClockTime& getShotStartTime() const; + void setShotStartTime(const ClockTime& pX); - float getCommulativeShotTime() const; - void setCommulativeShotTime(float pX); + float getCommulativeShotTime() const; + void setCommulativeShotTime(float pX); - Vector3Float& getApertureEmitterLocation(); - const Vector3Float& getApertureEmitterLocation() const; - void setApertureEmitterLocation(const Vector3Float &pX); + Vector3Float& getApertureEmitterLocation(); + const Vector3Float& getApertureEmitterLocation() const; + void setApertureEmitterLocation(const Vector3Float& pX); - float getApertureDiameter() const; - void setApertureDiameter(float pX); + float getApertureDiameter() const; + void setApertureDiameter(float pX); - float getWavelength() const; - void setWavelength(float pX); + float getWavelength() const; + void setWavelength(float pX); - float getPeakIrradiance() const; - void setPeakIrradiance(float pX); + float getPeakIrradiance() const; + void setPeakIrradiance(float pX); - float getPulseRepetitionFrequency() const; - void setPulseRepetitionFrequency(float pX); + float getPulseRepetitionFrequency() const; + void setPulseRepetitionFrequency(float pX); - int getPulseWidth() const; - void setPulseWidth(int pX); + int getPulseWidth() const; + void setPulseWidth(int pX); - int getFlags() const; - void setFlags(int pX); + int getFlags() const; + void setFlags(int pX); - char getPulseShape() const; - void setPulseShape(char pX); + char getPulseShape() const; + void setPulseShape(char pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + unsigned char getPadding1() const; + void setPadding1(unsigned char pX); - unsigned int getPadding2() const; - void setPadding2(unsigned int pX); + unsigned int getPadding2() const; + void setPadding2(unsigned int pX); - unsigned short getPadding3() const; - void setPadding3(unsigned short pX); + unsigned short getPadding3() const; + void setPadding3(unsigned short pX); - unsigned short getNumberOfDERecords() const; + unsigned short getNumberOfDERecords() const; - std::vector& getDERecords(); - const std::vector& getDERecords() const; - void setDERecords(const std::vector& pX); + std::vector& getDERecords(); + const std::vector& getDERecords() const; + void setDERecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DirectedEnergyFirePdu& rhs) const; + bool operator==(const DirectedEnergyFirePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -152,7 +162,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.cpp b/src/dis7/DirectedEnergyPrecisionAimpoint.cpp index 3afd5f3c..4072e179 100644 --- a/src/dis7/DirectedEnergyPrecisionAimpoint.cpp +++ b/src/dis7/DirectedEnergyPrecisionAimpoint.cpp @@ -2,264 +2,250 @@ using namespace DIS; +DirectedEnergyPrecisionAimpoint::DirectedEnergyPrecisionAimpoint() + : _recordType(4000), + _recordLength(88), + _padding(0), + _targetSpotLocation(), + _targetSpotEntityLocation(), + _targetSpotVelocity(), + _targetSpotAcceleration(), + _targetEntityID(), + _targetComponentID(0), + _SpotShape(0), + _BeamSpotXSecSemiMajorAxis(0), + _BeamSpotCrossSectionSemiMinorAxis(0), + _BeamSpotCrossSectionOrientAngle(0) {} -DirectedEnergyPrecisionAimpoint::DirectedEnergyPrecisionAimpoint(): - _recordType(4000), - _recordLength(88), - _padding(0), - _targetSpotLocation(), - _targetSpotEntityLocation(), - _targetSpotVelocity(), - _targetSpotAcceleration(), - _targetEntityID(), - _targetComponentID(0), - _SpotShape(0), - _BeamSpotXSecSemiMajorAxis(0), - _BeamSpotCrossSectionSemiMinorAxis(0), - _BeamSpotCrossSectionOrientAngle(0) -{ -} - -DirectedEnergyPrecisionAimpoint::~DirectedEnergyPrecisionAimpoint() -{ -} +DirectedEnergyPrecisionAimpoint::~DirectedEnergyPrecisionAimpoint() {} -unsigned int DirectedEnergyPrecisionAimpoint::getRecordType() const -{ - return _recordType; +unsigned int DirectedEnergyPrecisionAimpoint::getRecordType() const { + return _recordType; } -void DirectedEnergyPrecisionAimpoint::setRecordType(unsigned int pX) -{ - _recordType = pX; +void DirectedEnergyPrecisionAimpoint::setRecordType(unsigned int pX) { + _recordType = pX; } -unsigned short DirectedEnergyPrecisionAimpoint::getRecordLength() const -{ - return _recordLength; +unsigned short DirectedEnergyPrecisionAimpoint::getRecordLength() const { + return _recordLength; } -void DirectedEnergyPrecisionAimpoint::setRecordLength(unsigned short pX) -{ - _recordLength = pX; +void DirectedEnergyPrecisionAimpoint::setRecordLength(unsigned short pX) { + _recordLength = pX; } -unsigned short DirectedEnergyPrecisionAimpoint::getPadding() const -{ - return _padding; +unsigned short DirectedEnergyPrecisionAimpoint::getPadding() const { + return _padding; } -void DirectedEnergyPrecisionAimpoint::setPadding(unsigned short pX) -{ - _padding = pX; +void DirectedEnergyPrecisionAimpoint::setPadding(unsigned short pX) { + _padding = pX; } -Vector3Double& DirectedEnergyPrecisionAimpoint::getTargetSpotLocation() -{ - return _targetSpotLocation; +Vector3Double& DirectedEnergyPrecisionAimpoint::getTargetSpotLocation() { + return _targetSpotLocation; } -const Vector3Double& DirectedEnergyPrecisionAimpoint::getTargetSpotLocation() const -{ - return _targetSpotLocation; +const Vector3Double& DirectedEnergyPrecisionAimpoint::getTargetSpotLocation() + const { + return _targetSpotLocation; } -void DirectedEnergyPrecisionAimpoint::setTargetSpotLocation(const Vector3Double &pX) -{ - _targetSpotLocation = pX; +void DirectedEnergyPrecisionAimpoint::setTargetSpotLocation( + const Vector3Double& pX) { + _targetSpotLocation = pX; } -Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotEntityLocation() -{ - return _targetSpotEntityLocation; +Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotEntityLocation() { + return _targetSpotEntityLocation; } -const Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotEntityLocation() const -{ - return _targetSpotEntityLocation; +const Vector3Float& +DirectedEnergyPrecisionAimpoint::getTargetSpotEntityLocation() const { + return _targetSpotEntityLocation; } -void DirectedEnergyPrecisionAimpoint::setTargetSpotEntityLocation(const Vector3Float &pX) -{ - _targetSpotEntityLocation = pX; +void DirectedEnergyPrecisionAimpoint::setTargetSpotEntityLocation( + const Vector3Float& pX) { + _targetSpotEntityLocation = pX; } -Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotVelocity() -{ - return _targetSpotVelocity; +Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotVelocity() { + return _targetSpotVelocity; } -const Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotVelocity() const -{ - return _targetSpotVelocity; +const Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotVelocity() + const { + return _targetSpotVelocity; } -void DirectedEnergyPrecisionAimpoint::setTargetSpotVelocity(const Vector3Float &pX) -{ - _targetSpotVelocity = pX; +void DirectedEnergyPrecisionAimpoint::setTargetSpotVelocity( + const Vector3Float& pX) { + _targetSpotVelocity = pX; } -Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotAcceleration() -{ - return _targetSpotAcceleration; +Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotAcceleration() { + return _targetSpotAcceleration; } -const Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotAcceleration() const -{ - return _targetSpotAcceleration; +const Vector3Float& DirectedEnergyPrecisionAimpoint::getTargetSpotAcceleration() + const { + return _targetSpotAcceleration; } -void DirectedEnergyPrecisionAimpoint::setTargetSpotAcceleration(const Vector3Float &pX) -{ - _targetSpotAcceleration = pX; +void DirectedEnergyPrecisionAimpoint::setTargetSpotAcceleration( + const Vector3Float& pX) { + _targetSpotAcceleration = pX; } -EntityID& DirectedEnergyPrecisionAimpoint::getTargetEntityID() -{ - return _targetEntityID; +EntityID& DirectedEnergyPrecisionAimpoint::getTargetEntityID() { + return _targetEntityID; } -const EntityID& DirectedEnergyPrecisionAimpoint::getTargetEntityID() const -{ - return _targetEntityID; +const EntityID& DirectedEnergyPrecisionAimpoint::getTargetEntityID() const { + return _targetEntityID; } -void DirectedEnergyPrecisionAimpoint::setTargetEntityID(const EntityID &pX) -{ - _targetEntityID = pX; +void DirectedEnergyPrecisionAimpoint::setTargetEntityID(const EntityID& pX) { + _targetEntityID = pX; } -unsigned char DirectedEnergyPrecisionAimpoint::getTargetComponentID() const -{ - return _targetComponentID; +unsigned char DirectedEnergyPrecisionAimpoint::getTargetComponentID() const { + return _targetComponentID; } -void DirectedEnergyPrecisionAimpoint::setTargetComponentID(unsigned char pX) -{ - _targetComponentID = pX; +void DirectedEnergyPrecisionAimpoint::setTargetComponentID(unsigned char pX) { + _targetComponentID = pX; } -unsigned char DirectedEnergyPrecisionAimpoint::getSpotShape() const -{ - return _SpotShape; +unsigned char DirectedEnergyPrecisionAimpoint::getSpotShape() const { + return _SpotShape; } -void DirectedEnergyPrecisionAimpoint::setSpotShape(unsigned char pX) -{ - _SpotShape = pX; +void DirectedEnergyPrecisionAimpoint::setSpotShape(unsigned char pX) { + _SpotShape = pX; } -float DirectedEnergyPrecisionAimpoint::getBeamSpotXSecSemiMajorAxis() const -{ - return _BeamSpotXSecSemiMajorAxis; +float DirectedEnergyPrecisionAimpoint::getBeamSpotXSecSemiMajorAxis() const { + return _BeamSpotXSecSemiMajorAxis; } -void DirectedEnergyPrecisionAimpoint::setBeamSpotXSecSemiMajorAxis(float pX) -{ - _BeamSpotXSecSemiMajorAxis = pX; +void DirectedEnergyPrecisionAimpoint::setBeamSpotXSecSemiMajorAxis(float pX) { + _BeamSpotXSecSemiMajorAxis = pX; } -float DirectedEnergyPrecisionAimpoint::getBeamSpotCrossSectionSemiMinorAxis() const -{ - return _BeamSpotCrossSectionSemiMinorAxis; +float DirectedEnergyPrecisionAimpoint::getBeamSpotCrossSectionSemiMinorAxis() + const { + return _BeamSpotCrossSectionSemiMinorAxis; } -void DirectedEnergyPrecisionAimpoint::setBeamSpotCrossSectionSemiMinorAxis(float pX) -{ - _BeamSpotCrossSectionSemiMinorAxis = pX; +void DirectedEnergyPrecisionAimpoint::setBeamSpotCrossSectionSemiMinorAxis( + float pX) { + _BeamSpotCrossSectionSemiMinorAxis = pX; } -float DirectedEnergyPrecisionAimpoint::getBeamSpotCrossSectionOrientAngle() const -{ - return _BeamSpotCrossSectionOrientAngle; +float DirectedEnergyPrecisionAimpoint::getBeamSpotCrossSectionOrientAngle() + const { + return _BeamSpotCrossSectionOrientAngle; } -void DirectedEnergyPrecisionAimpoint::setBeamSpotCrossSectionOrientAngle(float pX) -{ - _BeamSpotCrossSectionOrientAngle = pX; +void DirectedEnergyPrecisionAimpoint::setBeamSpotCrossSectionOrientAngle( + float pX) { + _BeamSpotCrossSectionOrientAngle = pX; } -void DirectedEnergyPrecisionAimpoint::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _padding; - _targetSpotLocation.marshal(dataStream); - _targetSpotEntityLocation.marshal(dataStream); - _targetSpotVelocity.marshal(dataStream); - _targetSpotAcceleration.marshal(dataStream); - _targetEntityID.marshal(dataStream); - dataStream << _targetComponentID; - dataStream << _SpotShape; - dataStream << _BeamSpotXSecSemiMajorAxis; - dataStream << _BeamSpotCrossSectionSemiMinorAxis; - dataStream << _BeamSpotCrossSectionOrientAngle; +void DirectedEnergyPrecisionAimpoint::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _padding; + _targetSpotLocation.marshal(dataStream); + _targetSpotEntityLocation.marshal(dataStream); + _targetSpotVelocity.marshal(dataStream); + _targetSpotAcceleration.marshal(dataStream); + _targetEntityID.marshal(dataStream); + dataStream << _targetComponentID; + dataStream << _SpotShape; + dataStream << _BeamSpotXSecSemiMajorAxis; + dataStream << _BeamSpotCrossSectionSemiMinorAxis; + dataStream << _BeamSpotCrossSectionOrientAngle; } -void DirectedEnergyPrecisionAimpoint::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _padding; - _targetSpotLocation.unmarshal(dataStream); - _targetSpotEntityLocation.unmarshal(dataStream); - _targetSpotVelocity.unmarshal(dataStream); - _targetSpotAcceleration.unmarshal(dataStream); - _targetEntityID.unmarshal(dataStream); - dataStream >> _targetComponentID; - dataStream >> _SpotShape; - dataStream >> _BeamSpotXSecSemiMajorAxis; - dataStream >> _BeamSpotCrossSectionSemiMinorAxis; - dataStream >> _BeamSpotCrossSectionOrientAngle; +void DirectedEnergyPrecisionAimpoint::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _padding; + _targetSpotLocation.unmarshal(dataStream); + _targetSpotEntityLocation.unmarshal(dataStream); + _targetSpotVelocity.unmarshal(dataStream); + _targetSpotAcceleration.unmarshal(dataStream); + _targetEntityID.unmarshal(dataStream); + dataStream >> _targetComponentID; + dataStream >> _SpotShape; + dataStream >> _BeamSpotXSecSemiMajorAxis; + dataStream >> _BeamSpotCrossSectionSemiMinorAxis; + dataStream >> _BeamSpotCrossSectionOrientAngle; } +bool DirectedEnergyPrecisionAimpoint::operator==( + const DirectedEnergyPrecisionAimpoint& rhs) const { + bool ivarsEqual = true; -bool DirectedEnergyPrecisionAimpoint::operator ==(const DirectedEnergyPrecisionAimpoint& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_targetSpotLocation == rhs._targetSpotLocation) ) ivarsEqual = false; - if( ! (_targetSpotEntityLocation == rhs._targetSpotEntityLocation) ) ivarsEqual = false; - if( ! (_targetSpotVelocity == rhs._targetSpotVelocity) ) ivarsEqual = false; - if( ! (_targetSpotAcceleration == rhs._targetSpotAcceleration) ) ivarsEqual = false; - if( ! (_targetEntityID == rhs._targetEntityID) ) ivarsEqual = false; - if( ! (_targetComponentID == rhs._targetComponentID) ) ivarsEqual = false; - if( ! (_SpotShape == rhs._SpotShape) ) ivarsEqual = false; - if( ! (_BeamSpotXSecSemiMajorAxis == rhs._BeamSpotXSecSemiMajorAxis) ) ivarsEqual = false; - if( ! (_BeamSpotCrossSectionSemiMinorAxis == rhs._BeamSpotCrossSectionSemiMinorAxis) ) ivarsEqual = false; - if( ! (_BeamSpotCrossSectionOrientAngle == rhs._BeamSpotCrossSectionOrientAngle) ) ivarsEqual = false; - - return ivarsEqual; - } - -int DirectedEnergyPrecisionAimpoint::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + _targetSpotLocation.getMarshalledSize(); // _targetSpotLocation - marshalSize = marshalSize + _targetSpotEntityLocation.getMarshalledSize(); // _targetSpotEntityLocation - marshalSize = marshalSize + _targetSpotVelocity.getMarshalledSize(); // _targetSpotVelocity - marshalSize = marshalSize + _targetSpotAcceleration.getMarshalledSize(); // _targetSpotAcceleration - marshalSize = marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID - marshalSize = marshalSize + 1; // _targetComponentID - marshalSize = marshalSize + 1; // _SpotShape - marshalSize = marshalSize + 4; // _BeamSpotXSecSemiMajorAxis - marshalSize = marshalSize + 4; // _BeamSpotCrossSectionSemiMinorAxis - marshalSize = marshalSize + 4; // _BeamSpotCrossSectionOrientAngle - return marshalSize; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_targetSpotLocation == rhs._targetSpotLocation)) ivarsEqual = false; + if (!(_targetSpotEntityLocation == rhs._targetSpotEntityLocation)) + ivarsEqual = false; + if (!(_targetSpotVelocity == rhs._targetSpotVelocity)) ivarsEqual = false; + if (!(_targetSpotAcceleration == rhs._targetSpotAcceleration)) + ivarsEqual = false; + if (!(_targetEntityID == rhs._targetEntityID)) ivarsEqual = false; + if (!(_targetComponentID == rhs._targetComponentID)) ivarsEqual = false; + if (!(_SpotShape == rhs._SpotShape)) ivarsEqual = false; + if (!(_BeamSpotXSecSemiMajorAxis == rhs._BeamSpotXSecSemiMajorAxis)) + ivarsEqual = false; + if (!(_BeamSpotCrossSectionSemiMinorAxis == + rhs._BeamSpotCrossSectionSemiMinorAxis)) + ivarsEqual = false; + if (!(_BeamSpotCrossSectionOrientAngle == + rhs._BeamSpotCrossSectionOrientAngle)) + ivarsEqual = false; + + return ivarsEqual; +} + +int DirectedEnergyPrecisionAimpoint::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 2; // _padding + marshalSize = marshalSize + + _targetSpotLocation.getMarshalledSize(); // _targetSpotLocation + marshalSize = + marshalSize + _targetSpotEntityLocation + .getMarshalledSize(); // _targetSpotEntityLocation + marshalSize = marshalSize + + _targetSpotVelocity.getMarshalledSize(); // _targetSpotVelocity + marshalSize = + marshalSize + + _targetSpotAcceleration.getMarshalledSize(); // _targetSpotAcceleration + marshalSize = + marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID + marshalSize = marshalSize + 1; // _targetComponentID + marshalSize = marshalSize + 1; // _SpotShape + marshalSize = marshalSize + 4; // _BeamSpotXSecSemiMajorAxis + marshalSize = marshalSize + 4; // _BeamSpotCrossSectionSemiMinorAxis + marshalSize = marshalSize + 4; // _BeamSpotCrossSectionOrientAngle + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -272,7 +258,7 @@ int DirectedEnergyPrecisionAimpoint::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.h b/src/dis7/DirectedEnergyPrecisionAimpoint.h index 9ce4860a..ae534480 100644 --- a/src/dis7/DirectedEnergyPrecisionAimpoint.h +++ b/src/dis7/DirectedEnergyPrecisionAimpoint.h @@ -1,128 +1,122 @@ #pragma once +#include #include #include -#include -#include -#include -#include #include +#include - -namespace DIS -{ +namespace DIS { // DE Precision Aimpoint Record. Section 6.2.21.3 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DirectedEnergyPrecisionAimpoint -{ -protected: +class OPENDIS7_EXPORT DirectedEnergyPrecisionAimpoint { + protected: /** Type of Record */ - unsigned int _recordType; + unsigned int _recordType; /** Length of Record */ - unsigned short _recordLength; + unsigned short _recordLength; /** Padding */ - unsigned short _padding; + unsigned short _padding; /** Position of Target Spot in World Coordinates. */ - Vector3Double _targetSpotLocation; + Vector3Double _targetSpotLocation; /** Position (meters) of Target Spot relative to Entity Position. */ - Vector3Float _targetSpotEntityLocation; + Vector3Float _targetSpotEntityLocation; /** Velocity (meters/sec) of Target Spot. */ - Vector3Float _targetSpotVelocity; + Vector3Float _targetSpotVelocity; /** Acceleration (meters/sec/sec) of Target Spot. */ - Vector3Float _targetSpotAcceleration; + Vector3Float _targetSpotAcceleration; /** Unique ID of the target entity. */ - EntityID _targetEntityID; + EntityID _targetEntityID; /** Target Component ID ENUM, same as in DamageDescriptionRecord. */ - unsigned char _targetComponentID; + unsigned char _targetComponentID; /** Spot Shape ENUM. */ - unsigned char _SpotShape; + unsigned char _SpotShape; /** Beam Spot Cross Section Semi-Major Axis. */ - float _BeamSpotXSecSemiMajorAxis; + float _BeamSpotXSecSemiMajorAxis; /** Beam Spot Cross Section Semi-Major Axis. */ - float _BeamSpotCrossSectionSemiMinorAxis; + float _BeamSpotCrossSectionSemiMinorAxis; /** Beam Spot Cross Section Orientation Angle. */ - float _BeamSpotCrossSectionOrientAngle; - + float _BeamSpotCrossSectionOrientAngle; public: - DirectedEnergyPrecisionAimpoint(); - virtual ~DirectedEnergyPrecisionAimpoint(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + DirectedEnergyPrecisionAimpoint(); + virtual ~DirectedEnergyPrecisionAimpoint(); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - Vector3Double& getTargetSpotLocation(); - const Vector3Double& getTargetSpotLocation() const; - void setTargetSpotLocation(const Vector3Double &pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - Vector3Float& getTargetSpotEntityLocation(); - const Vector3Float& getTargetSpotEntityLocation() const; - void setTargetSpotEntityLocation(const Vector3Float &pX); + Vector3Double& getTargetSpotLocation(); + const Vector3Double& getTargetSpotLocation() const; + void setTargetSpotLocation(const Vector3Double& pX); - Vector3Float& getTargetSpotVelocity(); - const Vector3Float& getTargetSpotVelocity() const; - void setTargetSpotVelocity(const Vector3Float &pX); + Vector3Float& getTargetSpotEntityLocation(); + const Vector3Float& getTargetSpotEntityLocation() const; + void setTargetSpotEntityLocation(const Vector3Float& pX); - Vector3Float& getTargetSpotAcceleration(); - const Vector3Float& getTargetSpotAcceleration() const; - void setTargetSpotAcceleration(const Vector3Float &pX); + Vector3Float& getTargetSpotVelocity(); + const Vector3Float& getTargetSpotVelocity() const; + void setTargetSpotVelocity(const Vector3Float& pX); - EntityID& getTargetEntityID(); - const EntityID& getTargetEntityID() const; - void setTargetEntityID(const EntityID &pX); + Vector3Float& getTargetSpotAcceleration(); + const Vector3Float& getTargetSpotAcceleration() const; + void setTargetSpotAcceleration(const Vector3Float& pX); - unsigned char getTargetComponentID() const; - void setTargetComponentID(unsigned char pX); + EntityID& getTargetEntityID(); + const EntityID& getTargetEntityID() const; + void setTargetEntityID(const EntityID& pX); - unsigned char getSpotShape() const; - void setSpotShape(unsigned char pX); + unsigned char getTargetComponentID() const; + void setTargetComponentID(unsigned char pX); - float getBeamSpotXSecSemiMajorAxis() const; - void setBeamSpotXSecSemiMajorAxis(float pX); + unsigned char getSpotShape() const; + void setSpotShape(unsigned char pX); - float getBeamSpotCrossSectionSemiMinorAxis() const; - void setBeamSpotCrossSectionSemiMinorAxis(float pX); + float getBeamSpotXSecSemiMajorAxis() const; + void setBeamSpotXSecSemiMajorAxis(float pX); - float getBeamSpotCrossSectionOrientAngle() const; - void setBeamSpotCrossSectionOrientAngle(float pX); + float getBeamSpotCrossSectionSemiMinorAxis() const; + void setBeamSpotCrossSectionSemiMinorAxis(float pX); + float getBeamSpotCrossSectionOrientAngle() const; + void setBeamSpotCrossSectionOrientAngle(float pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const DirectedEnergyPrecisionAimpoint& rhs) const; + bool operator==(const DirectedEnergyPrecisionAimpoint& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -135,7 +129,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp b/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp index c7eda706..7e8829d7 100644 --- a/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp +++ b/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp @@ -2,94 +2,80 @@ using namespace DIS; +DirectedEnergyTargetEnergyDeposition::DirectedEnergyTargetEnergyDeposition() + : _targetEntityID(), _padding(0), _peakIrradiance(0.0) {} -DirectedEnergyTargetEnergyDeposition::DirectedEnergyTargetEnergyDeposition(): - _targetEntityID(), - _padding(0), - _peakIrradiance(0.0) -{ -} - -DirectedEnergyTargetEnergyDeposition::~DirectedEnergyTargetEnergyDeposition() -{ -} +DirectedEnergyTargetEnergyDeposition::~DirectedEnergyTargetEnergyDeposition() {} -EntityID& DirectedEnergyTargetEnergyDeposition::getTargetEntityID() -{ - return _targetEntityID; +EntityID& DirectedEnergyTargetEnergyDeposition::getTargetEntityID() { + return _targetEntityID; } -const EntityID& DirectedEnergyTargetEnergyDeposition::getTargetEntityID() const -{ - return _targetEntityID; +const EntityID& DirectedEnergyTargetEnergyDeposition::getTargetEntityID() + const { + return _targetEntityID; } -void DirectedEnergyTargetEnergyDeposition::setTargetEntityID(const EntityID &pX) -{ - _targetEntityID = pX; +void DirectedEnergyTargetEnergyDeposition::setTargetEntityID( + const EntityID& pX) { + _targetEntityID = pX; } -unsigned short DirectedEnergyTargetEnergyDeposition::getPadding() const -{ - return _padding; +unsigned short DirectedEnergyTargetEnergyDeposition::getPadding() const { + return _padding; } -void DirectedEnergyTargetEnergyDeposition::setPadding(unsigned short pX) -{ - _padding = pX; +void DirectedEnergyTargetEnergyDeposition::setPadding(unsigned short pX) { + _padding = pX; } -float DirectedEnergyTargetEnergyDeposition::getPeakIrradiance() const -{ - return _peakIrradiance; +float DirectedEnergyTargetEnergyDeposition::getPeakIrradiance() const { + return _peakIrradiance; } -void DirectedEnergyTargetEnergyDeposition::setPeakIrradiance(float pX) -{ - _peakIrradiance = pX; +void DirectedEnergyTargetEnergyDeposition::setPeakIrradiance(float pX) { + _peakIrradiance = pX; } -void DirectedEnergyTargetEnergyDeposition::marshal(DataStream& dataStream) const -{ - _targetEntityID.marshal(dataStream); - dataStream << _padding; - dataStream << _peakIrradiance; +void DirectedEnergyTargetEnergyDeposition::marshal( + DataStream& dataStream) const { + _targetEntityID.marshal(dataStream); + dataStream << _padding; + dataStream << _peakIrradiance; } -void DirectedEnergyTargetEnergyDeposition::unmarshal(DataStream& dataStream) -{ - _targetEntityID.unmarshal(dataStream); - dataStream >> _padding; - dataStream >> _peakIrradiance; +void DirectedEnergyTargetEnergyDeposition::unmarshal(DataStream& dataStream) { + _targetEntityID.unmarshal(dataStream); + dataStream >> _padding; + dataStream >> _peakIrradiance; } +bool DirectedEnergyTargetEnergyDeposition::operator==( + const DirectedEnergyTargetEnergyDeposition& rhs) const { + bool ivarsEqual = true; -bool DirectedEnergyTargetEnergyDeposition::operator ==(const DirectedEnergyTargetEnergyDeposition& rhs) const - { - bool ivarsEqual = true; + if (!(_targetEntityID == rhs._targetEntityID)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_peakIrradiance == rhs._peakIrradiance)) ivarsEqual = false; - if( ! (_targetEntityID == rhs._targetEntityID) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_peakIrradiance == rhs._peakIrradiance) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int DirectedEnergyTargetEnergyDeposition::getMarshalledSize() const -{ - int marshalSize = 0; +int DirectedEnergyTargetEnergyDeposition::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + 4; // _peakIrradiance - return marshalSize; + marshalSize = + marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID + marshalSize = marshalSize + 2; // _padding + marshalSize = marshalSize + 4; // _peakIrradiance + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -102,7 +88,7 @@ int DirectedEnergyTargetEnergyDeposition::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.h b/src/dis7/DirectedEnergyTargetEnergyDeposition.h index b2b91ccf..a90f6209 100644 --- a/src/dis7/DirectedEnergyTargetEnergyDeposition.h +++ b/src/dis7/DirectedEnergyTargetEnergyDeposition.h @@ -1,60 +1,56 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // DE energy depostion properties for a target entity. Section 6.2.21.4 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DirectedEnergyTargetEnergyDeposition -{ -protected: +class OPENDIS7_EXPORT DirectedEnergyTargetEnergyDeposition { + protected: /** Unique ID of the target entity. */ - EntityID _targetEntityID; + EntityID _targetEntityID; /** padding */ - unsigned short _padding; + unsigned short _padding; /** Peak irrandiance */ - float _peakIrradiance; - + float _peakIrradiance; public: - DirectedEnergyTargetEnergyDeposition(); - virtual ~DirectedEnergyTargetEnergyDeposition(); + DirectedEnergyTargetEnergyDeposition(); + virtual ~DirectedEnergyTargetEnergyDeposition(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getTargetEntityID(); - const EntityID& getTargetEntityID() const; - void setTargetEntityID(const EntityID &pX); + EntityID& getTargetEntityID(); + const EntityID& getTargetEntityID() const; + void setTargetEntityID(const EntityID& pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - float getPeakIrradiance() const; - void setPeakIrradiance(float pX); + float getPeakIrradiance() const; + void setPeakIrradiance(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DirectedEnergyTargetEnergyDeposition& rhs) const; + bool operator==(const DirectedEnergyTargetEnergyDeposition& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DistributedEmissionsFamilyPdu.cpp b/src/dis7/DistributedEmissionsFamilyPdu.cpp index 10b27295..a2ff85dc 100644 --- a/src/dis7/DistributedEmissionsFamilyPdu.cpp +++ b/src/dis7/DistributedEmissionsFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -DistributedEmissionsFamilyPdu::DistributedEmissionsFamilyPdu() : Pdu() +DistributedEmissionsFamilyPdu::DistributedEmissionsFamilyPdu() + : Pdu() { - setProtocolFamily( 6 ); + setProtocolFamily(6); } -DistributedEmissionsFamilyPdu::~DistributedEmissionsFamilyPdu() -{ -} +DistributedEmissionsFamilyPdu::~DistributedEmissionsFamilyPdu() {} -void DistributedEmissionsFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void DistributedEmissionsFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void DistributedEmissionsFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void DistributedEmissionsFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool DistributedEmissionsFamilyPdu::operator==( + const DistributedEmissionsFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool DistributedEmissionsFamilyPdu::operator ==(const DistributedEmissionsFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int DistributedEmissionsFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int DistributedEmissionsFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int DistributedEmissionsFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/DistributedEmissionsFamilyPdu.h b/src/dis7/DistributedEmissionsFamilyPdu.h index a0c784ae..aa17461b 100644 --- a/src/dis7/DistributedEmissionsFamilyPdu.h +++ b/src/dis7/DistributedEmissionsFamilyPdu.h @@ -1,41 +1,38 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.7. Electromagnetic Emissions. Abstract superclass for distirubted +// emissions PDU -namespace DIS -{ -// Section 5.3.7. Electromagnetic Emissions. Abstract superclass for distirubted emissions PDU - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT DistributedEmissionsFamilyPdu : public Pdu -{ -protected: - +class OPENDIS7_EXPORT DistributedEmissionsFamilyPdu : public Pdu { + protected: public: - DistributedEmissionsFamilyPdu(); - virtual ~DistributedEmissionsFamilyPdu(); + DistributedEmissionsFamilyPdu(); + virtual ~DistributedEmissionsFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const DistributedEmissionsFamilyPdu& rhs) const; + bool operator==(const DistributedEmissionsFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +45,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EEFundamentalParameterData.cpp b/src/dis7/EEFundamentalParameterData.cpp index 93a822d2..75209d8f 100644 --- a/src/dis7/EEFundamentalParameterData.cpp +++ b/src/dis7/EEFundamentalParameterData.cpp @@ -2,119 +2,94 @@ using namespace DIS; +EEFundamentalParameterData::EEFundamentalParameterData() + : _frequency(0.0), + _frequencyRange(0.0), + _effectiveRadiatedPower(0.0), + _pulseRepetitionFrequency(0.0), + _pulseWidth(0.0) {} -EEFundamentalParameterData::EEFundamentalParameterData(): - _frequency(0.0), - _frequencyRange(0.0), - _effectiveRadiatedPower(0.0), - _pulseRepetitionFrequency(0.0), - _pulseWidth(0.0) -{ -} +EEFundamentalParameterData::~EEFundamentalParameterData() {} -EEFundamentalParameterData::~EEFundamentalParameterData() -{ -} +float EEFundamentalParameterData::getFrequency() const { return _frequency; } -float EEFundamentalParameterData::getFrequency() const -{ - return _frequency; -} +void EEFundamentalParameterData::setFrequency(float pX) { _frequency = pX; } -void EEFundamentalParameterData::setFrequency(float pX) -{ - _frequency = pX; +float EEFundamentalParameterData::getFrequencyRange() const { + return _frequencyRange; } -float EEFundamentalParameterData::getFrequencyRange() const -{ - return _frequencyRange; +void EEFundamentalParameterData::setFrequencyRange(float pX) { + _frequencyRange = pX; } -void EEFundamentalParameterData::setFrequencyRange(float pX) -{ - _frequencyRange = pX; +float EEFundamentalParameterData::getEffectiveRadiatedPower() const { + return _effectiveRadiatedPower; } -float EEFundamentalParameterData::getEffectiveRadiatedPower() const -{ - return _effectiveRadiatedPower; +void EEFundamentalParameterData::setEffectiveRadiatedPower(float pX) { + _effectiveRadiatedPower = pX; } -void EEFundamentalParameterData::setEffectiveRadiatedPower(float pX) -{ - _effectiveRadiatedPower = pX; +float EEFundamentalParameterData::getPulseRepetitionFrequency() const { + return _pulseRepetitionFrequency; } -float EEFundamentalParameterData::getPulseRepetitionFrequency() const -{ - return _pulseRepetitionFrequency; +void EEFundamentalParameterData::setPulseRepetitionFrequency(float pX) { + _pulseRepetitionFrequency = pX; } -void EEFundamentalParameterData::setPulseRepetitionFrequency(float pX) -{ - _pulseRepetitionFrequency = pX; -} +float EEFundamentalParameterData::getPulseWidth() const { return _pulseWidth; } -float EEFundamentalParameterData::getPulseWidth() const -{ - return _pulseWidth; -} +void EEFundamentalParameterData::setPulseWidth(float pX) { _pulseWidth = pX; } -void EEFundamentalParameterData::setPulseWidth(float pX) -{ - _pulseWidth = pX; +void EEFundamentalParameterData::marshal(DataStream& dataStream) const { + dataStream << _frequency; + dataStream << _frequencyRange; + dataStream << _effectiveRadiatedPower; + dataStream << _pulseRepetitionFrequency; + dataStream << _pulseWidth; } -void EEFundamentalParameterData::marshal(DataStream& dataStream) const -{ - dataStream << _frequency; - dataStream << _frequencyRange; - dataStream << _effectiveRadiatedPower; - dataStream << _pulseRepetitionFrequency; - dataStream << _pulseWidth; -} - -void EEFundamentalParameterData::unmarshal(DataStream& dataStream) -{ - dataStream >> _frequency; - dataStream >> _frequencyRange; - dataStream >> _effectiveRadiatedPower; - dataStream >> _pulseRepetitionFrequency; - dataStream >> _pulseWidth; +void EEFundamentalParameterData::unmarshal(DataStream& dataStream) { + dataStream >> _frequency; + dataStream >> _frequencyRange; + dataStream >> _effectiveRadiatedPower; + dataStream >> _pulseRepetitionFrequency; + dataStream >> _pulseWidth; } +bool EEFundamentalParameterData::operator==( + const EEFundamentalParameterData& rhs) const { + bool ivarsEqual = true; -bool EEFundamentalParameterData::operator ==(const EEFundamentalParameterData& rhs) const - { - bool ivarsEqual = true; + if (!(_frequency == rhs._frequency)) ivarsEqual = false; + if (!(_frequencyRange == rhs._frequencyRange)) ivarsEqual = false; + if (!(_effectiveRadiatedPower == rhs._effectiveRadiatedPower)) + ivarsEqual = false; + if (!(_pulseRepetitionFrequency == rhs._pulseRepetitionFrequency)) + ivarsEqual = false; + if (!(_pulseWidth == rhs._pulseWidth)) ivarsEqual = false; - if( ! (_frequency == rhs._frequency) ) ivarsEqual = false; - if( ! (_frequencyRange == rhs._frequencyRange) ) ivarsEqual = false; - if( ! (_effectiveRadiatedPower == rhs._effectiveRadiatedPower) ) ivarsEqual = false; - if( ! (_pulseRepetitionFrequency == rhs._pulseRepetitionFrequency) ) ivarsEqual = false; - if( ! (_pulseWidth == rhs._pulseWidth) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EEFundamentalParameterData::getMarshalledSize() const -{ - int marshalSize = 0; +int EEFundamentalParameterData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _frequency - marshalSize = marshalSize + 4; // _frequencyRange - marshalSize = marshalSize + 4; // _effectiveRadiatedPower - marshalSize = marshalSize + 4; // _pulseRepetitionFrequency - marshalSize = marshalSize + 4; // _pulseWidth - return marshalSize; + marshalSize = marshalSize + 4; // _frequency + marshalSize = marshalSize + 4; // _frequencyRange + marshalSize = marshalSize + 4; // _effectiveRadiatedPower + marshalSize = marshalSize + 4; // _pulseRepetitionFrequency + marshalSize = marshalSize + 4; // _pulseWidth + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +102,7 @@ int EEFundamentalParameterData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EEFundamentalParameterData.h b/src/dis7/EEFundamentalParameterData.h index 07194123..6ed613e3 100644 --- a/src/dis7/EEFundamentalParameterData.h +++ b/src/dis7/EEFundamentalParameterData.h @@ -1,70 +1,68 @@ #pragma once -#include #include +#include +namespace DIS { +// Contains electromagnetic emmission regeneration parameters that are variable +// throught a scenario. Section 6.2.22. -namespace DIS -{ -// Contains electromagnetic emmission regeneration parameters that are variable throught a scenario. Section 6.2.22. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EEFundamentalParameterData -{ -protected: +class OPENDIS7_EXPORT EEFundamentalParameterData { + protected: /** center frequency of the emission in hertz. */ - float _frequency; + float _frequency; /** Bandwidth of the frequencies corresponding to the fequency field. */ - float _frequencyRange; + float _frequencyRange; - /** Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power. */ - float _effectiveRadiatedPower; + /** Effective radiated power for the emission in DdBm. For a radar noise + * jammer, indicates the peak of the transmitted power. */ + float _effectiveRadiatedPower; /** Average repetition frequency of the emission in hertz. */ - float _pulseRepetitionFrequency; + float _pulseRepetitionFrequency; /** Average pulse width of the emission in microseconds. */ - float _pulseWidth; - + float _pulseWidth; public: - EEFundamentalParameterData(); - virtual ~EEFundamentalParameterData(); + EEFundamentalParameterData(); + virtual ~EEFundamentalParameterData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getFrequency() const; - void setFrequency(float pX); + float getFrequency() const; + void setFrequency(float pX); - float getFrequencyRange() const; - void setFrequencyRange(float pX); + float getFrequencyRange() const; + void setFrequencyRange(float pX); - float getEffectiveRadiatedPower() const; - void setEffectiveRadiatedPower(float pX); + float getEffectiveRadiatedPower() const; + void setEffectiveRadiatedPower(float pX); - float getPulseRepetitionFrequency() const; - void setPulseRepetitionFrequency(float pX); + float getPulseRepetitionFrequency() const; + void setPulseRepetitionFrequency(float pX); - float getPulseWidth() const; - void setPulseWidth(float pX); + float getPulseWidth() const; + void setPulseWidth(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EEFundamentalParameterData& rhs) const; + bool operator==(const EEFundamentalParameterData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +75,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EightByteChunk.cpp b/src/dis7/EightByteChunk.cpp index e90afd36..ed675af6 100644 --- a/src/dis7/EightByteChunk.cpp +++ b/src/dis7/EightByteChunk.cpp @@ -2,87 +2,63 @@ using namespace DIS; - -EightByteChunk::EightByteChunk() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 8; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +EightByteChunk::EightByteChunk() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 8; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -EightByteChunk::~EightByteChunk() -{ -} +EightByteChunk::~EightByteChunk() {} -char* EightByteChunk::getOtherParameters() -{ - return _otherParameters; -} +char* EightByteChunk::getOtherParameters() { return _otherParameters; } -const char* EightByteChunk::getOtherParameters() const -{ - return _otherParameters; +const char* EightByteChunk::getOtherParameters() const { + return _otherParameters; } -void EightByteChunk::setOtherParameters(const char* x) -{ - for(int i = 0; i < 8; i++) - { - _otherParameters[i] = x[i]; - } +void EightByteChunk::setOtherParameters(const char* x) { + for (int i = 0; i < 8; i++) { + _otherParameters[i] = x[i]; + } } -void EightByteChunk::marshal(DataStream& dataStream) const -{ - - for(size_t idx = 0; idx < 8; idx++) - { - dataStream << _otherParameters[idx]; - } - +void EightByteChunk::marshal(DataStream& dataStream) const { + for (size_t idx = 0; idx < 8; idx++) { + dataStream << _otherParameters[idx]; + } } -void EightByteChunk::unmarshal(DataStream& dataStream) -{ - - for(size_t idx = 0; idx < 8; idx++) - { - dataStream >> _otherParameters[idx]; - } - +void EightByteChunk::unmarshal(DataStream& dataStream) { + for (size_t idx = 0; idx < 8; idx++) { + dataStream >> _otherParameters[idx]; + } } +bool EightByteChunk::operator==(const EightByteChunk& rhs) const { + bool ivarsEqual = true; -bool EightByteChunk::operator ==(const EightByteChunk& rhs) const - { - bool ivarsEqual = true; - + for (unsigned char idx = 0; idx < 8; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - for(unsigned char idx = 0; idx < 8; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int EightByteChunk::getMarshalledSize() const -{ - int marshalSize = 0; +int EightByteChunk::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 8 * 1; // _otherParameters - return marshalSize; + marshalSize = marshalSize + 8 * 1; // _otherParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +71,7 @@ int EightByteChunk::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EightByteChunk.h b/src/dis7/EightByteChunk.h index 946c752d..c45bff58 100644 --- a/src/dis7/EightByteChunk.h +++ b/src/dis7/EightByteChunk.h @@ -1,47 +1,43 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 64 bit piece of data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EightByteChunk -{ -protected: +class OPENDIS7_EXPORT EightByteChunk { + protected: /** Eight bytes of arbitrary data */ - char _otherParameters[8]; - + char _otherParameters[8]; public: - EightByteChunk(); - virtual ~EightByteChunk(); + EightByteChunk(); + virtual ~EightByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EightByteChunk& rhs) const; + bool operator==(const EightByteChunk& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ElectromagneticEmissionBeamData.cpp b/src/dis7/ElectromagneticEmissionBeamData.cpp index 53ef9232..34d0c6d4 100644 --- a/src/dis7/ElectromagneticEmissionBeamData.cpp +++ b/src/dis7/ElectromagneticEmissionBeamData.cpp @@ -2,245 +2,222 @@ using namespace DIS; +ElectromagneticEmissionBeamData::ElectromagneticEmissionBeamData() + : _beamDataLength(0), + _beamIDNumber(0), + _beamParameterIndex(0), + _fundamentalParameterData(), + _beamData(), + _beamFunction(0), + _numberOfTrackJamTargets(0), + _highDensityTrackJam(0), + _beamStatus(0), + _jammingTechnique() {} -ElectromagneticEmissionBeamData::ElectromagneticEmissionBeamData(): - _beamDataLength(0), - _beamIDNumber(0), - _beamParameterIndex(0), - _fundamentalParameterData(), - _beamData(), - _beamFunction(0), - _numberOfTrackJamTargets(0), - _highDensityTrackJam(0), - _beamStatus(0), - _jammingTechnique() -{ +ElectromagneticEmissionBeamData::~ElectromagneticEmissionBeamData() { + _trackJamTargets.clear(); } -ElectromagneticEmissionBeamData::~ElectromagneticEmissionBeamData() -{ - _trackJamTargets.clear(); +unsigned char ElectromagneticEmissionBeamData::getBeamDataLength() const { + return _beamDataLength; } -unsigned char ElectromagneticEmissionBeamData::getBeamDataLength() const -{ - return _beamDataLength; +void ElectromagneticEmissionBeamData::setBeamDataLength(unsigned char pX) { + _beamDataLength = pX; } -void ElectromagneticEmissionBeamData::setBeamDataLength(unsigned char pX) -{ - _beamDataLength = pX; +unsigned char ElectromagneticEmissionBeamData::getBeamIDNumber() const { + return _beamIDNumber; } -unsigned char ElectromagneticEmissionBeamData::getBeamIDNumber() const -{ - return _beamIDNumber; +void ElectromagneticEmissionBeamData::setBeamIDNumber(unsigned char pX) { + _beamIDNumber = pX; } -void ElectromagneticEmissionBeamData::setBeamIDNumber(unsigned char pX) -{ - _beamIDNumber = pX; +unsigned short ElectromagneticEmissionBeamData::getBeamParameterIndex() const { + return _beamParameterIndex; } -unsigned short ElectromagneticEmissionBeamData::getBeamParameterIndex() const -{ - return _beamParameterIndex; +void ElectromagneticEmissionBeamData::setBeamParameterIndex(unsigned short pX) { + _beamParameterIndex = pX; } -void ElectromagneticEmissionBeamData::setBeamParameterIndex(unsigned short pX) -{ - _beamParameterIndex = pX; +EEFundamentalParameterData& +ElectromagneticEmissionBeamData::getFundamentalParameterData() { + return _fundamentalParameterData; } -EEFundamentalParameterData& ElectromagneticEmissionBeamData::getFundamentalParameterData() -{ - return _fundamentalParameterData; +const EEFundamentalParameterData& +ElectromagneticEmissionBeamData::getFundamentalParameterData() const { + return _fundamentalParameterData; } -const EEFundamentalParameterData& ElectromagneticEmissionBeamData::getFundamentalParameterData() const -{ - return _fundamentalParameterData; +void ElectromagneticEmissionBeamData::setFundamentalParameterData( + const EEFundamentalParameterData& pX) { + _fundamentalParameterData = pX; } -void ElectromagneticEmissionBeamData::setFundamentalParameterData(const EEFundamentalParameterData &pX) -{ - _fundamentalParameterData = pX; +BeamData& DIS::ElectromagneticEmissionBeamData::getBeamData() { + return _beamData; } -BeamData & DIS::ElectromagneticEmissionBeamData::getBeamData() -{ - return _beamData; +const BeamData& DIS::ElectromagneticEmissionBeamData::getBeamData() const { + return _beamData; } -const BeamData & DIS::ElectromagneticEmissionBeamData::getBeamData() const -{ - return _beamData; +void DIS::ElectromagneticEmissionBeamData::setBeamData(const BeamData& pX) { + _beamData = pX; } -void DIS::ElectromagneticEmissionBeamData::setBeamData(const BeamData & pX) -{ - _beamData = pX; +unsigned char ElectromagneticEmissionBeamData::getBeamFunction() const { + return _beamFunction; } -unsigned char ElectromagneticEmissionBeamData::getBeamFunction() const -{ - return _beamFunction; +void ElectromagneticEmissionBeamData::setBeamFunction(unsigned char pX) { + _beamFunction = pX; } -void ElectromagneticEmissionBeamData::setBeamFunction(unsigned char pX) -{ - _beamFunction = pX; +unsigned char ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() + const { + return _trackJamTargets.size(); } -unsigned char ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() const -{ - return _trackJamTargets.size(); +unsigned char ElectromagneticEmissionBeamData::getHighDensityTrackJam() const { + return _highDensityTrackJam; } -unsigned char ElectromagneticEmissionBeamData::getHighDensityTrackJam() const -{ - return _highDensityTrackJam; +void ElectromagneticEmissionBeamData::setHighDensityTrackJam(unsigned char pX) { + _highDensityTrackJam = pX; } -void ElectromagneticEmissionBeamData::setHighDensityTrackJam(unsigned char pX) -{ - _highDensityTrackJam = pX; +unsigned char ElectromagneticEmissionBeamData::getBeamStatus() const { + return _beamStatus; } -unsigned char ElectromagneticEmissionBeamData::getBeamStatus() const -{ - return _beamStatus; +void ElectromagneticEmissionBeamData::setBeamStatus(unsigned char pX) { + _beamStatus = pX; } -void ElectromagneticEmissionBeamData::setBeamStatus(unsigned char pX) -{ - _beamStatus = pX; +JammingTechnique& ElectromagneticEmissionBeamData::getJammingTechnique() { + return _jammingTechnique; } -JammingTechnique& ElectromagneticEmissionBeamData::getJammingTechnique() -{ - return _jammingTechnique; +const JammingTechnique& ElectromagneticEmissionBeamData::getJammingTechnique() + const { + return _jammingTechnique; } -const JammingTechnique& ElectromagneticEmissionBeamData::getJammingTechnique() const -{ - return _jammingTechnique; +void ElectromagneticEmissionBeamData::setJammingTechnique( + const JammingTechnique& pX) { + _jammingTechnique = pX; } -void ElectromagneticEmissionBeamData::setJammingTechnique(const JammingTechnique& pX) -{ - _jammingTechnique = pX; +std::vector& +ElectromagneticEmissionBeamData::getTrackJamTargets() { + return _trackJamTargets; } -std::vector& ElectromagneticEmissionBeamData::getTrackJamTargets() -{ - return _trackJamTargets; +const std::vector& +ElectromagneticEmissionBeamData::getTrackJamTargets() const { + return _trackJamTargets; } -const std::vector& ElectromagneticEmissionBeamData::getTrackJamTargets() const -{ - return _trackJamTargets; +void ElectromagneticEmissionBeamData::setTrackJamTargets( + const std::vector& pX) { + _trackJamTargets = pX; } -void ElectromagneticEmissionBeamData::setTrackJamTargets(const std::vector& pX) -{ - _trackJamTargets = pX; +void ElectromagneticEmissionBeamData::marshal(DataStream& dataStream) const { + dataStream << _beamDataLength; + dataStream << _beamIDNumber; + dataStream << _beamParameterIndex; + _fundamentalParameterData.marshal(dataStream); + _beamData.marshal(dataStream); + dataStream << _beamFunction; + dataStream << (unsigned char)_trackJamTargets.size(); + dataStream << _highDensityTrackJam; + dataStream << _beamStatus; + _jammingTechnique.marshal(dataStream); + + for (size_t idx = 0; idx < _trackJamTargets.size(); idx++) { + TrackJamData x = _trackJamTargets[idx]; + x.marshal(dataStream); + } } -void ElectromagneticEmissionBeamData::marshal(DataStream& dataStream) const -{ - dataStream << _beamDataLength; - dataStream << _beamIDNumber; - dataStream << _beamParameterIndex; - _fundamentalParameterData.marshal(dataStream); - _beamData.marshal(dataStream); - dataStream << _beamFunction; - dataStream << ( unsigned char )_trackJamTargets.size(); - dataStream << _highDensityTrackJam; - dataStream << _beamStatus; - _jammingTechnique.marshal(dataStream); - - for(size_t idx = 0; idx < _trackJamTargets.size(); idx++) - { - TrackJamData x = _trackJamTargets[idx]; - x.marshal(dataStream); - } +void ElectromagneticEmissionBeamData::unmarshal(DataStream& dataStream) { + dataStream >> _beamDataLength; + dataStream >> _beamIDNumber; + dataStream >> _beamParameterIndex; + _fundamentalParameterData.unmarshal(dataStream); + _beamData.unmarshal(dataStream); + dataStream >> _beamFunction; + dataStream >> _numberOfTrackJamTargets; + dataStream >> _highDensityTrackJam; + dataStream >> _beamStatus; + _jammingTechnique.unmarshal(dataStream); + _trackJamTargets.clear(); + for (size_t idx = 0; idx < _numberOfTrackJamTargets; idx++) { + TrackJamData x; + x.unmarshal(dataStream); + _trackJamTargets.push_back(x); + } } -void ElectromagneticEmissionBeamData::unmarshal(DataStream& dataStream) -{ - dataStream >> _beamDataLength; - dataStream >> _beamIDNumber; - dataStream >> _beamParameterIndex; - _fundamentalParameterData.unmarshal(dataStream); - _beamData.unmarshal(dataStream); - dataStream >> _beamFunction; - dataStream >> _numberOfTrackJamTargets; - dataStream >> _highDensityTrackJam; - dataStream >> _beamStatus; - _jammingTechnique.unmarshal(dataStream); - - _trackJamTargets.clear(); - for(size_t idx = 0; idx < _numberOfTrackJamTargets; idx++) - { - TrackJamData x; - x.unmarshal(dataStream); - _trackJamTargets.push_back(x); - } -} +bool ElectromagneticEmissionBeamData::operator==( + const ElectromagneticEmissionBeamData& rhs) const { + bool ivarsEqual = true; + + if (!(_beamDataLength == rhs._beamDataLength)) ivarsEqual = false; + if (!(_beamIDNumber == rhs._beamIDNumber)) ivarsEqual = false; + if (!(_beamParameterIndex == rhs._beamParameterIndex)) ivarsEqual = false; + if (!(_fundamentalParameterData == rhs._fundamentalParameterData)) + ivarsEqual = false; + if (!(_beamData == rhs._beamData)) ivarsEqual = false; + if (!(_beamFunction == rhs._beamFunction)) ivarsEqual = false; + if (!(_highDensityTrackJam == rhs._highDensityTrackJam)) ivarsEqual = false; + if (!(_beamStatus == rhs._beamStatus)) ivarsEqual = false; + if (!(_jammingTechnique == rhs._jammingTechnique)) ivarsEqual = false; -bool ElectromagneticEmissionBeamData::operator ==(const ElectromagneticEmissionBeamData& rhs) const -{ - bool ivarsEqual = true; - - if( ! (_beamDataLength == rhs._beamDataLength) ) ivarsEqual = false; - if( ! (_beamIDNumber == rhs._beamIDNumber) ) ivarsEqual = false; - if( ! (_beamParameterIndex == rhs._beamParameterIndex) ) ivarsEqual = false; - if( ! (_fundamentalParameterData == rhs._fundamentalParameterData) ) ivarsEqual = false; - if (! (_beamData == rhs._beamData)) ivarsEqual = false; - if( ! (_beamFunction == rhs._beamFunction) ) ivarsEqual = false; - if( ! (_highDensityTrackJam == rhs._highDensityTrackJam) ) ivarsEqual = false; - if( ! (_beamStatus == rhs._beamStatus) ) ivarsEqual = false; - if( ! (_jammingTechnique == rhs._jammingTechnique) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _trackJamTargets.size(); idx++) - { - if( ! ( _trackJamTargets[idx] == rhs._trackJamTargets[idx]) ) ivarsEqual = false; - } - - return ivarsEqual; + for (size_t idx = 0; idx < _trackJamTargets.size(); idx++) { + if (!(_trackJamTargets[idx] == rhs._trackJamTargets[idx])) + ivarsEqual = false; + } + + return ivarsEqual; } -int ElectromagneticEmissionBeamData::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _beamDataLength - marshalSize = marshalSize + 1; // _beamIDNumber - marshalSize = marshalSize + 2; // _beamParameterIndex - marshalSize = marshalSize + _fundamentalParameterData.getMarshalledSize(); // _fundamentalParameterData - marshalSize = marshalSize + _beamData.getMarshalledSize(); // _beamData - marshalSize = marshalSize + 1; // _beamFunction - marshalSize = marshalSize + 1; // _numberOfTrackJamTargets - marshalSize = marshalSize + 1; // _highDensityTrackJam - marshalSize = marshalSize + 1; // _beamStatus - marshalSize = marshalSize + _jammingTechnique.getMarshalledSize(); // _jammingTechnique - - for(unsigned long long idx=0; idx < _trackJamTargets.size(); idx++) - { - TrackJamData listElement = _trackJamTargets[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; +int ElectromagneticEmissionBeamData::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = marshalSize + 1; // _beamDataLength + marshalSize = marshalSize + 1; // _beamIDNumber + marshalSize = marshalSize + 2; // _beamParameterIndex + marshalSize = + marshalSize + _fundamentalParameterData + .getMarshalledSize(); // _fundamentalParameterData + marshalSize = marshalSize + _beamData.getMarshalledSize(); // _beamData + marshalSize = marshalSize + 1; // _beamFunction + marshalSize = marshalSize + 1; // _numberOfTrackJamTargets + marshalSize = marshalSize + 1; // _highDensityTrackJam + marshalSize = marshalSize + 1; // _beamStatus + marshalSize = + marshalSize + _jammingTechnique.getMarshalledSize(); // _jammingTechnique + + for (unsigned long long idx = 0; idx < _trackJamTargets.size(); idx++) { + TrackJamData listElement = _trackJamTargets[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -253,7 +230,7 @@ int ElectromagneticEmissionBeamData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ElectromagneticEmissionBeamData.h b/src/dis7/ElectromagneticEmissionBeamData.h index 7bb56b01..7377a002 100644 --- a/src/dis7/ElectromagneticEmissionBeamData.h +++ b/src/dis7/ElectromagneticEmissionBeamData.h @@ -1,48 +1,54 @@ #pragma once +#include + +#include #include -#include #include -#include -#include -#include +#include #include +#include - -namespace DIS -{ +namespace DIS { // Description of one electronic emission beam -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ElectromagneticEmissionBeamData -{ -protected: +class OPENDIS7_EXPORT ElectromagneticEmissionBeamData { + protected: /** This field shall specify the length of this beams data in 32 bit words */ - unsigned char _beamDataLength; + unsigned char _beamDataLength; - /** This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system. */ - unsigned char _beamIDNumber; + /** This field shall specify a unique emitter database number assigned to + * differentiate between otherwise similar or identical emitter beams within + * an emitter system. */ + unsigned char _beamIDNumber; - /** This field shall specify a Beam Parameter Index number that shall be used by receiving entities in conjunction with the Emitter Name field to provide a pointer to the stored database parameters required to regenerate the beam. */ - unsigned short _beamParameterIndex; + /** This field shall specify a Beam Parameter Index number that shall be used + * by receiving entities in conjunction with the Emitter Name field to provide + * a pointer to the stored database parameters required to regenerate the + * beam. */ + unsigned short _beamParameterIndex; - /** Fundamental parameter data such as frequency range, erp, pulse width, etc. */ + /** Fundamental parameter data such as frequency range, erp, pulse width, etc. + */ EEFundamentalParameterData _fundamentalParameterData; /** Beam data contains Azimuth, Elevation, Sweep variables */ BeamData _beamData; /** beam function of a particular beam */ - unsigned char _beamFunction; + unsigned char _beamFunction; /** Number of track/jam targets */ - unsigned char _numberOfTrackJamTargets; + unsigned char _numberOfTrackJamTargets; - /** wheher or not the receiving simulation apps can assume all the targets in the scan pattern are being tracked/jammed */ - unsigned char _highDensityTrackJam; + /** wheher or not the receiving simulation apps can assume all the targets in + * the scan pattern are being tracked/jammed */ + unsigned char _highDensityTrackJam; unsigned char _beamStatus; @@ -50,63 +56,62 @@ class OPENDIS7_EXPORT ElectromagneticEmissionBeamData JammingTechnique _jammingTechnique; /** variable length list of track/jam targets */ - std::vector _trackJamTargets; + std::vector _trackJamTargets; public: - ElectromagneticEmissionBeamData(); - virtual ~ElectromagneticEmissionBeamData(); + ElectromagneticEmissionBeamData(); + virtual ~ElectromagneticEmissionBeamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getBeamDataLength() const; - void setBeamDataLength(unsigned char pX); + unsigned char getBeamDataLength() const; + void setBeamDataLength(unsigned char pX); - unsigned char getBeamIDNumber() const; - void setBeamIDNumber(unsigned char pX); + unsigned char getBeamIDNumber() const; + void setBeamIDNumber(unsigned char pX); - unsigned short getBeamParameterIndex() const; - void setBeamParameterIndex(unsigned short pX); + unsigned short getBeamParameterIndex() const; + void setBeamParameterIndex(unsigned short pX); - EEFundamentalParameterData& getFundamentalParameterData(); - const EEFundamentalParameterData& getFundamentalParameterData() const; - void setFundamentalParameterData(const EEFundamentalParameterData &pX); + EEFundamentalParameterData& getFundamentalParameterData(); + const EEFundamentalParameterData& getFundamentalParameterData() const; + void setFundamentalParameterData(const EEFundamentalParameterData& pX); - BeamData& getBeamData(); - const BeamData& getBeamData() const; - void setBeamData(const BeamData &pX); + BeamData& getBeamData(); + const BeamData& getBeamData() const; + void setBeamData(const BeamData& pX); - unsigned char getBeamFunction() const; - void setBeamFunction(unsigned char pX); + unsigned char getBeamFunction() const; + void setBeamFunction(unsigned char pX); - unsigned char getNumberOfTrackJamTargets() const; + unsigned char getNumberOfTrackJamTargets() const; - unsigned char getHighDensityTrackJam() const; - void setHighDensityTrackJam(unsigned char pX); + unsigned char getHighDensityTrackJam() const; + void setHighDensityTrackJam(unsigned char pX); - unsigned char getBeamStatus() const; - void setBeamStatus(unsigned char pX); + unsigned char getBeamStatus() const; + void setBeamStatus(unsigned char pX); - JammingTechnique& getJammingTechnique(); - const JammingTechnique& getJammingTechnique() const; - void setJammingTechnique(const JammingTechnique& pX); + JammingTechnique& getJammingTechnique(); + const JammingTechnique& getJammingTechnique() const; + void setJammingTechnique(const JammingTechnique& pX); - std::vector& getTrackJamTargets(); - const std::vector& getTrackJamTargets() const; - void setTrackJamTargets(const std::vector& pX); + std::vector& getTrackJamTargets(); + const std::vector& getTrackJamTargets() const; + void setTrackJamTargets(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ElectromagneticEmissionBeamData& rhs) const; + bool operator==(const ElectromagneticEmissionBeamData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -119,7 +124,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ElectromagneticEmissionSystemData.cpp b/src/dis7/ElectromagneticEmissionSystemData.cpp index dedc8831..c6d2a601 100644 --- a/src/dis7/ElectromagneticEmissionSystemData.cpp +++ b/src/dis7/ElectromagneticEmissionSystemData.cpp @@ -2,154 +2,137 @@ using namespace DIS; +ElectromagneticEmissionSystemData::ElectromagneticEmissionSystemData() + : _systemDataLength(0), + _emissionsPadding2(0), + _numberOfBeams(0), + _emitterSystem(), + _location() {} -ElectromagneticEmissionSystemData::ElectromagneticEmissionSystemData(): - _systemDataLength(0), - _emissionsPadding2(0), - _numberOfBeams(0), - _emitterSystem(), - _location() -{ +ElectromagneticEmissionSystemData::~ElectromagneticEmissionSystemData() { + _beamDataRecords.clear(); } -ElectromagneticEmissionSystemData::~ElectromagneticEmissionSystemData() -{ - _beamDataRecords.clear(); +unsigned char ElectromagneticEmissionSystemData::getSystemDataLength() const { + return _systemDataLength; } -unsigned char ElectromagneticEmissionSystemData::getSystemDataLength() const -{ - return _systemDataLength; +void ElectromagneticEmissionSystemData::setSystemDataLength(unsigned char pX) { + _systemDataLength = pX; } -void ElectromagneticEmissionSystemData::setSystemDataLength(unsigned char pX) -{ - _systemDataLength = pX; +unsigned char ElectromagneticEmissionSystemData::getNumberOfBeams() const { + return _beamDataRecords.size(); } -unsigned char ElectromagneticEmissionSystemData::getNumberOfBeams() const -{ - return _beamDataRecords.size(); +EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() { + return _emitterSystem; } -EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() -{ - return _emitterSystem; +const EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() + const { + return _emitterSystem; } -const EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() const -{ - return _emitterSystem; +void ElectromagneticEmissionSystemData::setEmitterSystem( + const EmitterSystem& pX) { + _emitterSystem = pX; } -void ElectromagneticEmissionSystemData::setEmitterSystem(const EmitterSystem &pX) -{ - _emitterSystem = pX; +Vector3Float& ElectromagneticEmissionSystemData::getLocation() { + return _location; } -Vector3Float& ElectromagneticEmissionSystemData::getLocation() -{ - return _location; +const Vector3Float& ElectromagneticEmissionSystemData::getLocation() const { + return _location; } -const Vector3Float& ElectromagneticEmissionSystemData::getLocation() const -{ - return _location; +void ElectromagneticEmissionSystemData::setLocation(const Vector3Float& pX) { + _location = pX; } -void ElectromagneticEmissionSystemData::setLocation(const Vector3Float &pX) -{ - _location = pX; +std::vector& +DIS::ElectromagneticEmissionSystemData::getBeamDataRecords() { + return _beamDataRecords; } -std::vector& DIS::ElectromagneticEmissionSystemData::getBeamDataRecords() -{ - return _beamDataRecords; +const std::vector& +DIS::ElectromagneticEmissionSystemData::getBeamDataRecords() const { + return _beamDataRecords; } -const std::vector& DIS::ElectromagneticEmissionSystemData::getBeamDataRecords() const -{ - return _beamDataRecords; +void DIS::ElectromagneticEmissionSystemData::setBeamDataRecords( + const std::vector& pX) { + _beamDataRecords = pX; } -void DIS::ElectromagneticEmissionSystemData::setBeamDataRecords(const std::vector& pX) -{ - _beamDataRecords = pX; -} - -void ElectromagneticEmissionSystemData::marshal(DataStream& dataStream) const -{ - dataStream << _systemDataLength; - dataStream << ( unsigned char )_beamDataRecords.size(); - dataStream << _emissionsPadding2; - _emitterSystem.marshal(dataStream); - _location.marshal(dataStream); +void ElectromagneticEmissionSystemData::marshal(DataStream& dataStream) const { + dataStream << _systemDataLength; + dataStream << (unsigned char)_beamDataRecords.size(); + dataStream << _emissionsPadding2; + _emitterSystem.marshal(dataStream); + _location.marshal(dataStream); - for(size_t idx = 0; idx < _beamDataRecords.size(); idx++) - { - ElectromagneticEmissionBeamData x = _beamDataRecords[idx]; - x.marshal(dataStream); - } + for (size_t idx = 0; idx < _beamDataRecords.size(); idx++) { + ElectromagneticEmissionBeamData x = _beamDataRecords[idx]; + x.marshal(dataStream); + } } -void ElectromagneticEmissionSystemData::unmarshal(DataStream& dataStream) -{ - dataStream >> _systemDataLength; - dataStream >> _numberOfBeams; - dataStream >> _emissionsPadding2; - _emitterSystem.unmarshal(dataStream); - _location.unmarshal(dataStream); +void ElectromagneticEmissionSystemData::unmarshal(DataStream& dataStream) { + dataStream >> _systemDataLength; + dataStream >> _numberOfBeams; + dataStream >> _emissionsPadding2; + _emitterSystem.unmarshal(dataStream); + _location.unmarshal(dataStream); - _beamDataRecords.clear(); - for(size_t idx = 0; idx < _numberOfBeams; idx++) - { - ElectromagneticEmissionBeamData x; - x.unmarshal(dataStream); - _beamDataRecords.push_back(x); - } + _beamDataRecords.clear(); + for (size_t idx = 0; idx < _numberOfBeams; idx++) { + ElectromagneticEmissionBeamData x; + x.unmarshal(dataStream); + _beamDataRecords.push_back(x); + } } -bool ElectromagneticEmissionSystemData::operator ==(const ElectromagneticEmissionSystemData& rhs) const -{ - bool ivarsEqual = true; +bool ElectromagneticEmissionSystemData::operator==( + const ElectromagneticEmissionSystemData& rhs) const { + bool ivarsEqual = true; - if( !(_systemDataLength == rhs._systemDataLength)) ivarsEqual = false; - if( !(_numberOfBeams == rhs._numberOfBeams) ) ivarsEqual = false; - if( !(_emissionsPadding2 == rhs._emissionsPadding2)) ivarsEqual = false; - if( !(_emitterSystem == rhs._emitterSystem) ) ivarsEqual = false; - if( !(_location == rhs._location) ) ivarsEqual = false; + if (!(_systemDataLength == rhs._systemDataLength)) ivarsEqual = false; + if (!(_numberOfBeams == rhs._numberOfBeams)) ivarsEqual = false; + if (!(_emissionsPadding2 == rhs._emissionsPadding2)) ivarsEqual = false; + if (!(_emitterSystem == rhs._emitterSystem)) ivarsEqual = false; + if (!(_location == rhs._location)) ivarsEqual = false; - for(size_t idx = 0; idx < _beamDataRecords.size(); idx++) - { - if( ! ( _beamDataRecords[idx] == rhs._beamDataRecords[idx]) ) ivarsEqual = false; - } - return ivarsEqual; + for (size_t idx = 0; idx < _beamDataRecords.size(); idx++) { + if (!(_beamDataRecords[idx] == rhs._beamDataRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; } -int ElectromagneticEmissionSystemData::getMarshalledSize() const -{ - int marshalSize = 0; +int ElectromagneticEmissionSystemData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize += 1; // _systemDataLength - marshalSize += 1; // _numberOfBeams - marshalSize += 2; // _eimssionsPadding2 - marshalSize += _emitterSystem.getMarshalledSize(); //_emitterSystem - marshalSize += _location.getMarshalledSize(); //_location + marshalSize += 1; // _systemDataLength + marshalSize += 1; // _numberOfBeams + marshalSize += 2; // _eimssionsPadding2 + marshalSize += _emitterSystem.getMarshalledSize(); //_emitterSystem + marshalSize += _location.getMarshalledSize(); //_location - for(unsigned long long idx=0; idx < _beamDataRecords.size(); idx++) - { - ElectromagneticEmissionBeamData listElement = _beamDataRecords[idx]; - marshalSize += listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _beamDataRecords.size(); idx++) { + ElectromagneticEmissionBeamData listElement = _beamDataRecords[idx]; + marshalSize += listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -162,7 +145,7 @@ int ElectromagneticEmissionSystemData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ElectromagneticEmissionSystemData.h b/src/dis7/ElectromagneticEmissionSystemData.h index 26e4696d..55f5f489 100644 --- a/src/dis7/ElectromagneticEmissionSystemData.h +++ b/src/dis7/ElectromagneticEmissionSystemData.h @@ -1,83 +1,90 @@ #pragma once #include -#include -#include #include #include +#include +#include - -namespace DIS -{ +namespace DIS { // Contains electromagnetic emmission system // https://www.sisostds.org/DesktopModules/Bring2mind/DMX/API/Entries/Download?Command=Core_Download&EntryId=36292&PortalId=0&TabId=105 // Page 23 -// +// // DIS Data Dictionary representation // http://faculty.nps.edu/brutzman/vrtp/mil/navy/nps/disEnumerations/JdbeHtmlFiles/pdu/b9.htm -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author semihkurt -class OPENDIS7_EXPORT ElectromagneticEmissionSystemData -{ -protected: - /** this field shall specify the length of this emitter system's data in 32-bit words. */ +class OPENDIS7_EXPORT ElectromagneticEmissionSystemData { + protected: + /** this field shall specify the length of this emitter system's data in + * 32-bit words. */ unsigned char _systemDataLength; - /** the number of beams being described in the current PDU for the emitter system being described. */ + /** the number of beams being described in the current PDU for the emitter + * system being described. */ unsigned char _numberOfBeams; /* padding. */ unsigned short _emissionsPadding2; - /** information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23). */ - EmitterSystem _emitterSystem; + /** information about a particular emitter system and shall be represented by + * an Emitter System record (see 6.2.23). */ + EmitterSystem _emitterSystem; - /** the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 */ - Vector3Float _location; + /** the location of the antenna beam source with respect to the emitting + * entity's coordinate system. This location shall be the origin of the + * emitter coordinate system that shall have the same orientation as the + * entity coordinate system. This field shall be represented by an Entity + * Coordinate Vector record see 6.2.95 */ + Vector3Float _location; /** Electromagnetic emmissions systems */ std::vector _beamDataRecords; public: - ElectromagneticEmissionSystemData(); - virtual ~ElectromagneticEmissionSystemData(); + ElectromagneticEmissionSystemData(); + virtual ~ElectromagneticEmissionSystemData(); - unsigned char getSystemDataLength() const; - void setSystemDataLength(unsigned char pX); + unsigned char getSystemDataLength() const; + void setSystemDataLength(unsigned char pX); - unsigned char getNumberOfBeams() const; + unsigned char getNumberOfBeams() const; - unsigned short getEmissionsPadding2() const; - void setEmissionsPadding2(unsigned short pX); + unsigned short getEmissionsPadding2() const; + void setEmissionsPadding2(unsigned short pX); - EmitterSystem& getEmitterSystem(); - const EmitterSystem& getEmitterSystem() const; - void setEmitterSystem(const EmitterSystem &pX); + EmitterSystem& getEmitterSystem(); + const EmitterSystem& getEmitterSystem() const; + void setEmitterSystem(const EmitterSystem& pX); - Vector3Float& getLocation(); - const Vector3Float& getLocation() const; - void setLocation(const Vector3Float &pX); + Vector3Float& getLocation(); + const Vector3Float& getLocation() const; + void setLocation(const Vector3Float& pX); - std::vector& getBeamDataRecords(); - const std::vector& getBeamDataRecords() const; - void setBeamDataRecords(const std::vector& pX); + std::vector& getBeamDataRecords(); + const std::vector& getBeamDataRecords() + const; + void setBeamDataRecords( + const std::vector& pX); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const ElectromagneticEmissionSystemData& rhs) const; + bool operator==(const ElectromagneticEmissionSystemData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -90,7 +97,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ElectromagneticEmissionsPdu.cpp b/src/dis7/ElectromagneticEmissionsPdu.cpp index e52e253c..526f4faf 100644 --- a/src/dis7/ElectromagneticEmissionsPdu.cpp +++ b/src/dis7/ElectromagneticEmissionsPdu.cpp @@ -2,173 +2,153 @@ using namespace DIS; - -ElectromagneticEmissionsPdu::ElectromagneticEmissionsPdu() : DistributedEmissionsFamilyPdu(), - _emittingEntityID(), - _eventID(), - _stateUpdateIndicator(0), - _numberOfSystems(0), - _paddingForEmissionsPdu(0) -{ - setPduType( 23 ); - setPaddingForEmissionsPdu( 0 ); +ElectromagneticEmissionsPdu::ElectromagneticEmissionsPdu() + : DistributedEmissionsFamilyPdu(), + _emittingEntityID(), + _eventID(), + _stateUpdateIndicator(0), + _numberOfSystems(0), + _paddingForEmissionsPdu(0) { + setPduType(23); + setPaddingForEmissionsPdu(0); } -ElectromagneticEmissionsPdu::~ElectromagneticEmissionsPdu() -{ - _systems.clear(); +ElectromagneticEmissionsPdu::~ElectromagneticEmissionsPdu() { + _systems.clear(); } -EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() -{ - return _emittingEntityID; +EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() { + return _emittingEntityID; } -const EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() const -{ - return _emittingEntityID; +const EntityID& ElectromagneticEmissionsPdu::getEmittingEntityID() const { + return _emittingEntityID; } -void ElectromagneticEmissionsPdu::setEmittingEntityID(const EntityID &pX) -{ - _emittingEntityID = pX; +void ElectromagneticEmissionsPdu::setEmittingEntityID(const EntityID& pX) { + _emittingEntityID = pX; } -EventIdentifier& ElectromagneticEmissionsPdu::getEventID() -{ - return _eventID; -} +EventIdentifier& ElectromagneticEmissionsPdu::getEventID() { return _eventID; } -const EventIdentifier& ElectromagneticEmissionsPdu::getEventID() const -{ - return _eventID; +const EventIdentifier& ElectromagneticEmissionsPdu::getEventID() const { + return _eventID; } -void ElectromagneticEmissionsPdu::setEventID(const EventIdentifier &pX) -{ - _eventID = pX; +void ElectromagneticEmissionsPdu::setEventID(const EventIdentifier& pX) { + _eventID = pX; } -unsigned char ElectromagneticEmissionsPdu::getStateUpdateIndicator() const -{ - return _stateUpdateIndicator; +unsigned char ElectromagneticEmissionsPdu::getStateUpdateIndicator() const { + return _stateUpdateIndicator; } -void ElectromagneticEmissionsPdu::setStateUpdateIndicator(unsigned char pX) -{ - _stateUpdateIndicator = pX; +void ElectromagneticEmissionsPdu::setStateUpdateIndicator(unsigned char pX) { + _stateUpdateIndicator = pX; } -unsigned char ElectromagneticEmissionsPdu::getNumberOfSystems() const -{ - return _systems.size(); +unsigned char ElectromagneticEmissionsPdu::getNumberOfSystems() const { + return _systems.size(); } -unsigned short ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const -{ - return _paddingForEmissionsPdu; +unsigned short ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const { + return _paddingForEmissionsPdu; } -void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(unsigned short pX) -{ - _paddingForEmissionsPdu = pX; +void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(unsigned short pX) { + _paddingForEmissionsPdu = pX; } -std::vector& ElectromagneticEmissionsPdu::getSystems() -{ - return _systems; +std::vector& +ElectromagneticEmissionsPdu::getSystems() { + return _systems; } -const std::vector& ElectromagneticEmissionsPdu::getSystems() const -{ - return _systems; +const std::vector& +ElectromagneticEmissionsPdu::getSystems() const { + return _systems; } -void ElectromagneticEmissionsPdu::setSystems(const std::vector& pX) -{ - _systems = pX; +void ElectromagneticEmissionsPdu::setSystems( + const std::vector& pX) { + _systems = pX; } -void ElectromagneticEmissionsPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _emittingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _stateUpdateIndicator; - dataStream << ( unsigned char )_systems.size(); - dataStream << _paddingForEmissionsPdu; - - for(size_t idx = 0; idx < _systems.size(); idx++) - { - ElectromagneticEmissionSystemData x = _systems[idx]; - x.marshal(dataStream); - } +void ElectromagneticEmissionsPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _emittingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _stateUpdateIndicator; + dataStream << (unsigned char)_systems.size(); + dataStream << _paddingForEmissionsPdu; + for (size_t idx = 0; idx < _systems.size(); idx++) { + ElectromagneticEmissionSystemData x = _systems[idx]; + x.marshal(dataStream); + } } -void ElectromagneticEmissionsPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _emittingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _stateUpdateIndicator; - dataStream >> _numberOfSystems; - dataStream >> _paddingForEmissionsPdu; +void ElectromagneticEmissionsPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _emittingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _stateUpdateIndicator; + dataStream >> _numberOfSystems; + dataStream >> _paddingForEmissionsPdu; - _systems.clear(); - for(size_t idx = 0; idx < _numberOfSystems; idx++) - { - ElectromagneticEmissionSystemData x; - x.unmarshal(dataStream); - _systems.push_back(x); - } + _systems.clear(); + for (size_t idx = 0; idx < _numberOfSystems; idx++) { + ElectromagneticEmissionSystemData x; + x.unmarshal(dataStream); + _systems.push_back(x); + } } +bool ElectromagneticEmissionsPdu::operator==( + const ElectromagneticEmissionsPdu& rhs) const { + bool ivarsEqual = true; -bool ElectromagneticEmissionsPdu::operator ==(const ElectromagneticEmissionsPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); + if (!(_emittingEntityID == rhs._emittingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_stateUpdateIndicator == rhs._stateUpdateIndicator)) ivarsEqual = false; + if (!(_paddingForEmissionsPdu == rhs._paddingForEmissionsPdu)) + ivarsEqual = false; - if( ! (_emittingEntityID == rhs._emittingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_stateUpdateIndicator == rhs._stateUpdateIndicator) ) ivarsEqual = false; - if( ! (_paddingForEmissionsPdu == rhs._paddingForEmissionsPdu) ) ivarsEqual = false; + for (size_t idx = 0; idx < _systems.size(); idx++) { + if (!(_systems[idx] == rhs._systems[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _systems.size(); idx++) - { - if( ! ( _systems[idx] == rhs._systems[idx]) ) ivarsEqual = false; - } - - return ivarsEqual; - } + return ivarsEqual; +} -int ElectromagneticEmissionsPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ElectromagneticEmissionsPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 1; // _stateUpdateIndicator - marshalSize = marshalSize + 1; // _numberOfSystems - marshalSize = marshalSize + 2; // _paddingForEmissionsPdu + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 1; // _stateUpdateIndicator + marshalSize = marshalSize + 1; // _numberOfSystems + marshalSize = marshalSize + 2; // _paddingForEmissionsPdu - for(unsigned long long idx=0; idx < _systems.size(); idx++) - { - ElectromagneticEmissionSystemData listElement = _systems[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _systems.size(); idx++) { + ElectromagneticEmissionSystemData listElement = _systems[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -181,7 +161,7 @@ int ElectromagneticEmissionsPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ElectromagneticEmissionsPdu.h b/src/dis7/ElectromagneticEmissionsPdu.h index 72cde8d6..2fbae78b 100644 --- a/src/dis7/ElectromagneticEmissionsPdu.h +++ b/src/dis7/ElectromagneticEmissionsPdu.h @@ -1,83 +1,87 @@ #pragma once +#include + +#include #include #include #include #include -#include -#include -#include -#include #include +#include +namespace DIS { +// Section 5.3.7.1. Information about active electronic warfare (EW) emissions +// and active EW countermeasures shall be communicated using an Electromagnetic +// Emission PDU. NOT COMPLETE -namespace DIS -{ -// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be communicated using an Electromagnetic Emission PDU. NOT COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ElectromagneticEmissionsPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ElectromagneticEmissionsPdu + : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity emitting */ - EntityID _emittingEntityID; + EntityID _emittingEntityID; /** ID of event */ - EventIdentifier _eventID; + EventIdentifier _eventID; - /** This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)]. */ - unsigned char _stateUpdateIndicator; + /** This field shall be used to indicate if the data in the PDU represents a + * state update or just data that has changed since issuance of the last + * Electromagnetic Emission PDU [relative to the identified entity and + * emission system(s)]. */ + unsigned char _stateUpdateIndicator; - /** This field shall specify the number of emission systems being described in the current PDU. */ - unsigned char _numberOfSystems; + /** This field shall specify the number of emission systems being described in + * the current PDU. */ + unsigned char _numberOfSystems; /** padding */ unsigned short _paddingForEmissionsPdu; std::vector _systems; - - public: - ElectromagneticEmissionsPdu(); - virtual ~ElectromagneticEmissionsPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + public: + ElectromagneticEmissionsPdu(); + virtual ~ElectromagneticEmissionsPdu(); - EntityID& getEmittingEntityID(); - const EntityID& getEmittingEntityID() const; - void setEmittingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EventIdentifier& getEventID(); - const EventIdentifier& getEventID() const; - void setEventID(const EventIdentifier &pX); + EntityID& getEmittingEntityID(); + const EntityID& getEmittingEntityID() const; + void setEmittingEntityID(const EntityID& pX); - unsigned char getStateUpdateIndicator() const; - void setStateUpdateIndicator(unsigned char pX); + EventIdentifier& getEventID(); + const EventIdentifier& getEventID() const; + void setEventID(const EventIdentifier& pX); - unsigned char getNumberOfSystems() const; + unsigned char getStateUpdateIndicator() const; + void setStateUpdateIndicator(unsigned char pX); - unsigned short getPaddingForEmissionsPdu() const; - void setPaddingForEmissionsPdu(unsigned short pX); + unsigned char getNumberOfSystems() const; - std::vector& getSystems(); - const std::vector& getSystems() const; - void setSystems(const std::vector& pX); + unsigned short getPaddingForEmissionsPdu() const; + void setPaddingForEmissionsPdu(unsigned short pX); + std::vector& getSystems(); + const std::vector& getSystems() const; + void setSystems(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const ElectromagneticEmissionsPdu& rhs) const; + bool operator==(const ElectromagneticEmissionsPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -90,7 +94,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EmitterSystem.cpp b/src/dis7/EmitterSystem.cpp index 44152556..893fb29f 100644 --- a/src/dis7/EmitterSystem.cpp +++ b/src/dis7/EmitterSystem.cpp @@ -2,89 +2,63 @@ using namespace DIS; +EmitterSystem::EmitterSystem() + : _emitterName(0), _function(0), _emitterIdNumber(0) {} -EmitterSystem::EmitterSystem(): - _emitterName(0), - _function(0), - _emitterIdNumber(0) -{ -} +EmitterSystem::~EmitterSystem() {} -EmitterSystem::~EmitterSystem() -{ -} +unsigned short EmitterSystem::getEmitterName() const { return _emitterName; } -unsigned short EmitterSystem::getEmitterName() const -{ - return _emitterName; -} +void EmitterSystem::setEmitterName(unsigned short pX) { _emitterName = pX; } -void EmitterSystem::setEmitterName(unsigned short pX) -{ - _emitterName = pX; -} +unsigned char EmitterSystem::getFunction() const { return _function; } -unsigned char EmitterSystem::getFunction() const -{ - return _function; -} +void EmitterSystem::setFunction(unsigned char pX) { _function = pX; } -void EmitterSystem::setFunction(unsigned char pX) -{ - _function = pX; +unsigned char EmitterSystem::getEmitterIdNumber() const { + return _emitterIdNumber; } -unsigned char EmitterSystem::getEmitterIdNumber() const -{ - return _emitterIdNumber; +void EmitterSystem::setEmitterIdNumber(unsigned char pX) { + _emitterIdNumber = pX; } -void EmitterSystem::setEmitterIdNumber(unsigned char pX) -{ - _emitterIdNumber = pX; +void EmitterSystem::marshal(DataStream& dataStream) const { + dataStream << _emitterName; + dataStream << _function; + dataStream << _emitterIdNumber; } -void EmitterSystem::marshal(DataStream& dataStream) const -{ - dataStream << _emitterName; - dataStream << _function; - dataStream << _emitterIdNumber; -} - -void EmitterSystem::unmarshal(DataStream& dataStream) -{ - dataStream >> _emitterName; - dataStream >> _function; - dataStream >> _emitterIdNumber; +void EmitterSystem::unmarshal(DataStream& dataStream) { + dataStream >> _emitterName; + dataStream >> _function; + dataStream >> _emitterIdNumber; } +bool EmitterSystem::operator==(const EmitterSystem& rhs) const { + bool ivarsEqual = true; -bool EmitterSystem::operator ==(const EmitterSystem& rhs) const - { - bool ivarsEqual = true; + if (!(_emitterName == rhs._emitterName)) ivarsEqual = false; + if (!(_function == rhs._function)) ivarsEqual = false; + if (!(_emitterIdNumber == rhs._emitterIdNumber)) ivarsEqual = false; - if( ! (_emitterName == rhs._emitterName) ) ivarsEqual = false; - if( ! (_function == rhs._function) ) ivarsEqual = false; - if( ! (_emitterIdNumber == rhs._emitterIdNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EmitterSystem::getMarshalledSize() const -{ - int marshalSize = 0; +int EmitterSystem::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _emitterName - marshalSize = marshalSize + 1; // _function - marshalSize = marshalSize + 1; // _emitterIdNumber - return marshalSize; + marshalSize = marshalSize + 2; // _emitterName + marshalSize = marshalSize + 1; // _function + marshalSize = marshalSize + 1; // _emitterIdNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +71,7 @@ int EmitterSystem::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EmitterSystem.h b/src/dis7/EmitterSystem.h index 38f00431..525e3a71 100644 --- a/src/dis7/EmitterSystem.h +++ b/src/dis7/EmitterSystem.h @@ -1,58 +1,55 @@ #pragma once -#include #include +#include +namespace DIS { +// This field shall specify information about a particular emitter system. +// Section 6.2.23. -namespace DIS -{ -// This field shall specify information about a particular emitter system. Section 6.2.23. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EmitterSystem -{ -protected: +class OPENDIS7_EXPORT EmitterSystem { + protected: /** Name of the emitter, 16 bit enumeration */ - unsigned short _emitterName; + unsigned short _emitterName; /** function of the emitter, 8 bit enumeration */ - unsigned char _function; + unsigned char _function; /** emitter ID, 8 bit enumeration */ - unsigned char _emitterIdNumber; - + unsigned char _emitterIdNumber; public: - EmitterSystem(); - virtual ~EmitterSystem(); + EmitterSystem(); + virtual ~EmitterSystem(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getEmitterName() const; - void setEmitterName(unsigned short pX); + unsigned short getEmitterName() const; + void setEmitterName(unsigned short pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + unsigned char getFunction() const; + void setFunction(unsigned char pX); - unsigned char getEmitterIdNumber() const; - void setEmitterIdNumber(unsigned char pX); + unsigned char getEmitterIdNumber() const; + void setEmitterIdNumber(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EmitterSystem& rhs) const; + bool operator==(const EmitterSystem& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EngineFuel.cpp b/src/dis7/EngineFuel.cpp index 18f0df7f..3df7f83f 100644 --- a/src/dis7/EngineFuel.cpp +++ b/src/dis7/EngineFuel.cpp @@ -2,119 +2,83 @@ using namespace DIS; +EngineFuel::EngineFuel() + : _fuelQuantity(0), + _fuelMeasurementUnits(0), + _fuelType(0), + _fuelLocation(0), + _padding(0) {} -EngineFuel::EngineFuel(): - _fuelQuantity(0), - _fuelMeasurementUnits(0), - _fuelType(0), - _fuelLocation(0), - _padding(0) -{ -} +EngineFuel::~EngineFuel() {} -EngineFuel::~EngineFuel() -{ -} +unsigned int EngineFuel::getFuelQuantity() const { return _fuelQuantity; } -unsigned int EngineFuel::getFuelQuantity() const -{ - return _fuelQuantity; -} +void EngineFuel::setFuelQuantity(unsigned int pX) { _fuelQuantity = pX; } -void EngineFuel::setFuelQuantity(unsigned int pX) -{ - _fuelQuantity = pX; +unsigned char EngineFuel::getFuelMeasurementUnits() const { + return _fuelMeasurementUnits; } -unsigned char EngineFuel::getFuelMeasurementUnits() const -{ - return _fuelMeasurementUnits; +void EngineFuel::setFuelMeasurementUnits(unsigned char pX) { + _fuelMeasurementUnits = pX; } -void EngineFuel::setFuelMeasurementUnits(unsigned char pX) -{ - _fuelMeasurementUnits = pX; -} +unsigned char EngineFuel::getFuelType() const { return _fuelType; } -unsigned char EngineFuel::getFuelType() const -{ - return _fuelType; -} +void EngineFuel::setFuelType(unsigned char pX) { _fuelType = pX; } -void EngineFuel::setFuelType(unsigned char pX) -{ - _fuelType = pX; -} +unsigned char EngineFuel::getFuelLocation() const { return _fuelLocation; } -unsigned char EngineFuel::getFuelLocation() const -{ - return _fuelLocation; -} +void EngineFuel::setFuelLocation(unsigned char pX) { _fuelLocation = pX; } -void EngineFuel::setFuelLocation(unsigned char pX) -{ - _fuelLocation = pX; -} - -unsigned char EngineFuel::getPadding() const -{ - return _padding; -} +unsigned char EngineFuel::getPadding() const { return _padding; } -void EngineFuel::setPadding(unsigned char pX) -{ - _padding = pX; -} +void EngineFuel::setPadding(unsigned char pX) { _padding = pX; } -void EngineFuel::marshal(DataStream& dataStream) const -{ - dataStream << _fuelQuantity; - dataStream << _fuelMeasurementUnits; - dataStream << _fuelType; - dataStream << _fuelLocation; - dataStream << _padding; +void EngineFuel::marshal(DataStream& dataStream) const { + dataStream << _fuelQuantity; + dataStream << _fuelMeasurementUnits; + dataStream << _fuelType; + dataStream << _fuelLocation; + dataStream << _padding; } -void EngineFuel::unmarshal(DataStream& dataStream) -{ - dataStream >> _fuelQuantity; - dataStream >> _fuelMeasurementUnits; - dataStream >> _fuelType; - dataStream >> _fuelLocation; - dataStream >> _padding; +void EngineFuel::unmarshal(DataStream& dataStream) { + dataStream >> _fuelQuantity; + dataStream >> _fuelMeasurementUnits; + dataStream >> _fuelType; + dataStream >> _fuelLocation; + dataStream >> _padding; } +bool EngineFuel::operator==(const EngineFuel& rhs) const { + bool ivarsEqual = true; -bool EngineFuel::operator ==(const EngineFuel& rhs) const - { - bool ivarsEqual = true; - - if( ! (_fuelQuantity == rhs._fuelQuantity) ) ivarsEqual = false; - if( ! (_fuelMeasurementUnits == rhs._fuelMeasurementUnits) ) ivarsEqual = false; - if( ! (_fuelType == rhs._fuelType) ) ivarsEqual = false; - if( ! (_fuelLocation == rhs._fuelLocation) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; + if (!(_fuelQuantity == rhs._fuelQuantity)) ivarsEqual = false; + if (!(_fuelMeasurementUnits == rhs._fuelMeasurementUnits)) ivarsEqual = false; + if (!(_fuelType == rhs._fuelType)) ivarsEqual = false; + if (!(_fuelLocation == rhs._fuelLocation)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int EngineFuel::getMarshalledSize() const -{ - int marshalSize = 0; +int EngineFuel::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _fuelQuantity - marshalSize = marshalSize + 1; // _fuelMeasurementUnits - marshalSize = marshalSize + 1; // _fuelType - marshalSize = marshalSize + 1; // _fuelLocation - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + 4; // _fuelQuantity + marshalSize = marshalSize + 1; // _fuelMeasurementUnits + marshalSize = marshalSize + 1; // _fuelType + marshalSize = marshalSize + 1; // _fuelLocation + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +91,7 @@ int EngineFuel::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EngineFuel.h b/src/dis7/EngineFuel.h index d4f13651..981632a7 100644 --- a/src/dis7/EngineFuel.h +++ b/src/dis7/EngineFuel.h @@ -1,70 +1,66 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Information about an entity's engine fuel. Section 6.2.24. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EngineFuel -{ -protected: +class OPENDIS7_EXPORT EngineFuel { + protected: /** Fuel quantity, units specified by next field */ - unsigned int _fuelQuantity; + unsigned int _fuelQuantity; /** Units in which the fuel is measured */ - unsigned char _fuelMeasurementUnits; + unsigned char _fuelMeasurementUnits; /** Type of fuel */ - unsigned char _fuelType; + unsigned char _fuelType; /** Location of fuel as related to entity. See section 14 of EBV document */ - unsigned char _fuelLocation; + unsigned char _fuelLocation; /** padding */ - unsigned char _padding; - + unsigned char _padding; public: - EngineFuel(); - virtual ~EngineFuel(); + EngineFuel(); + virtual ~EngineFuel(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getFuelQuantity() const; - void setFuelQuantity(unsigned int pX); + unsigned int getFuelQuantity() const; + void setFuelQuantity(unsigned int pX); - unsigned char getFuelMeasurementUnits() const; - void setFuelMeasurementUnits(unsigned char pX); + unsigned char getFuelMeasurementUnits() const; + void setFuelMeasurementUnits(unsigned char pX); - unsigned char getFuelType() const; - void setFuelType(unsigned char pX); + unsigned char getFuelType() const; + void setFuelType(unsigned char pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + unsigned char getFuelLocation() const; + void setFuelLocation(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EngineFuel& rhs) const; + bool operator==(const EngineFuel& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +73,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EngineFuelReload.cpp b/src/dis7/EngineFuelReload.cpp index d31a74cf..eab5da58 100644 --- a/src/dis7/EngineFuelReload.cpp +++ b/src/dis7/EngineFuelReload.cpp @@ -2,149 +2,121 @@ using namespace DIS; +EngineFuelReload::EngineFuelReload() + : _standardQuantity(0), + _maximumQuantity(0), + _standardQuantityReloadTime(0), + _maximumQuantityReloadTime(0), + _fuelMeasurmentUnits(0), + _fuelLocation(0), + _padding(0) {} -EngineFuelReload::EngineFuelReload(): - _standardQuantity(0), - _maximumQuantity(0), - _standardQuantityReloadTime(0), - _maximumQuantityReloadTime(0), - _fuelMeasurmentUnits(0), - _fuelLocation(0), - _padding(0) -{ -} +EngineFuelReload::~EngineFuelReload() {} -EngineFuelReload::~EngineFuelReload() -{ +unsigned int EngineFuelReload::getStandardQuantity() const { + return _standardQuantity; } -unsigned int EngineFuelReload::getStandardQuantity() const -{ - return _standardQuantity; +void EngineFuelReload::setStandardQuantity(unsigned int pX) { + _standardQuantity = pX; } -void EngineFuelReload::setStandardQuantity(unsigned int pX) -{ - _standardQuantity = pX; +unsigned int EngineFuelReload::getMaximumQuantity() const { + return _maximumQuantity; } -unsigned int EngineFuelReload::getMaximumQuantity() const -{ - return _maximumQuantity; +void EngineFuelReload::setMaximumQuantity(unsigned int pX) { + _maximumQuantity = pX; } -void EngineFuelReload::setMaximumQuantity(unsigned int pX) -{ - _maximumQuantity = pX; +unsigned int EngineFuelReload::getStandardQuantityReloadTime() const { + return _standardQuantityReloadTime; } -unsigned int EngineFuelReload::getStandardQuantityReloadTime() const -{ - return _standardQuantityReloadTime; +void EngineFuelReload::setStandardQuantityReloadTime(unsigned int pX) { + _standardQuantityReloadTime = pX; } -void EngineFuelReload::setStandardQuantityReloadTime(unsigned int pX) -{ - _standardQuantityReloadTime = pX; +unsigned int EngineFuelReload::getMaximumQuantityReloadTime() const { + return _maximumQuantityReloadTime; } -unsigned int EngineFuelReload::getMaximumQuantityReloadTime() const -{ - return _maximumQuantityReloadTime; +void EngineFuelReload::setMaximumQuantityReloadTime(unsigned int pX) { + _maximumQuantityReloadTime = pX; } -void EngineFuelReload::setMaximumQuantityReloadTime(unsigned int pX) -{ - _maximumQuantityReloadTime = pX; +unsigned char EngineFuelReload::getFuelMeasurmentUnits() const { + return _fuelMeasurmentUnits; } -unsigned char EngineFuelReload::getFuelMeasurmentUnits() const -{ - return _fuelMeasurmentUnits; +void EngineFuelReload::setFuelMeasurmentUnits(unsigned char pX) { + _fuelMeasurmentUnits = pX; } -void EngineFuelReload::setFuelMeasurmentUnits(unsigned char pX) -{ - _fuelMeasurmentUnits = pX; +unsigned char EngineFuelReload::getFuelLocation() const { + return _fuelLocation; } -unsigned char EngineFuelReload::getFuelLocation() const -{ - return _fuelLocation; -} +void EngineFuelReload::setFuelLocation(unsigned char pX) { _fuelLocation = pX; } -void EngineFuelReload::setFuelLocation(unsigned char pX) -{ - _fuelLocation = pX; -} +unsigned char EngineFuelReload::getPadding() const { return _padding; } -unsigned char EngineFuelReload::getPadding() const -{ - return _padding; -} +void EngineFuelReload::setPadding(unsigned char pX) { _padding = pX; } -void EngineFuelReload::setPadding(unsigned char pX) -{ - _padding = pX; +void EngineFuelReload::marshal(DataStream& dataStream) const { + dataStream << _standardQuantity; + dataStream << _maximumQuantity; + dataStream << _standardQuantityReloadTime; + dataStream << _maximumQuantityReloadTime; + dataStream << _fuelMeasurmentUnits; + dataStream << _fuelLocation; + dataStream << _padding; } -void EngineFuelReload::marshal(DataStream& dataStream) const -{ - dataStream << _standardQuantity; - dataStream << _maximumQuantity; - dataStream << _standardQuantityReloadTime; - dataStream << _maximumQuantityReloadTime; - dataStream << _fuelMeasurmentUnits; - dataStream << _fuelLocation; - dataStream << _padding; +void EngineFuelReload::unmarshal(DataStream& dataStream) { + dataStream >> _standardQuantity; + dataStream >> _maximumQuantity; + dataStream >> _standardQuantityReloadTime; + dataStream >> _maximumQuantityReloadTime; + dataStream >> _fuelMeasurmentUnits; + dataStream >> _fuelLocation; + dataStream >> _padding; } -void EngineFuelReload::unmarshal(DataStream& dataStream) -{ - dataStream >> _standardQuantity; - dataStream >> _maximumQuantity; - dataStream >> _standardQuantityReloadTime; - dataStream >> _maximumQuantityReloadTime; - dataStream >> _fuelMeasurmentUnits; - dataStream >> _fuelLocation; - dataStream >> _padding; +bool EngineFuelReload::operator==(const EngineFuelReload& rhs) const { + bool ivarsEqual = true; + + if (!(_standardQuantity == rhs._standardQuantity)) ivarsEqual = false; + if (!(_maximumQuantity == rhs._maximumQuantity)) ivarsEqual = false; + if (!(_standardQuantityReloadTime == rhs._standardQuantityReloadTime)) + ivarsEqual = false; + if (!(_maximumQuantityReloadTime == rhs._maximumQuantityReloadTime)) + ivarsEqual = false; + if (!(_fuelMeasurmentUnits == rhs._fuelMeasurmentUnits)) ivarsEqual = false; + if (!(_fuelLocation == rhs._fuelLocation)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + + return ivarsEqual; } +int EngineFuelReload::getMarshalledSize() const { + int marshalSize = 0; -bool EngineFuelReload::operator ==(const EngineFuelReload& rhs) const - { - bool ivarsEqual = true; - - if( ! (_standardQuantity == rhs._standardQuantity) ) ivarsEqual = false; - if( ! (_maximumQuantity == rhs._maximumQuantity) ) ivarsEqual = false; - if( ! (_standardQuantityReloadTime == rhs._standardQuantityReloadTime) ) ivarsEqual = false; - if( ! (_maximumQuantityReloadTime == rhs._maximumQuantityReloadTime) ) ivarsEqual = false; - if( ! (_fuelMeasurmentUnits == rhs._fuelMeasurmentUnits) ) ivarsEqual = false; - if( ! (_fuelLocation == rhs._fuelLocation) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } - -int EngineFuelReload::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _standardQuantity - marshalSize = marshalSize + 4; // _maximumQuantity - marshalSize = marshalSize + 4; // _standardQuantityReloadTime - marshalSize = marshalSize + 4; // _maximumQuantityReloadTime - marshalSize = marshalSize + 1; // _fuelMeasurmentUnits - marshalSize = marshalSize + 1; // _fuelLocation - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + 4; // _standardQuantity + marshalSize = marshalSize + 4; // _maximumQuantity + marshalSize = marshalSize + 4; // _standardQuantityReloadTime + marshalSize = marshalSize + 4; // _maximumQuantityReloadTime + marshalSize = marshalSize + 1; // _fuelMeasurmentUnits + marshalSize = marshalSize + 1; // _fuelLocation + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +129,7 @@ int EngineFuelReload::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EngineFuelReload.h b/src/dis7/EngineFuelReload.h index f843a1fd..a04b96ff 100644 --- a/src/dis7/EngineFuelReload.h +++ b/src/dis7/EngineFuelReload.h @@ -1,82 +1,80 @@ #pragma once -#include #include +#include +namespace DIS { +// For each type or location of engine fuell, this record specifies the type, +// location, fuel measurement units, and reload quantity and maximum quantity. +// Section 6.2.25. -namespace DIS -{ -// For each type or location of engine fuell, this record specifies the type, location, fuel measurement units, and reload quantity and maximum quantity. Section 6.2.25. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EngineFuelReload -{ -protected: +class OPENDIS7_EXPORT EngineFuelReload { + protected: /** standard quantity of fuel loaded */ - unsigned int _standardQuantity; + unsigned int _standardQuantity; /** maximum quantity of fuel loaded */ - unsigned int _maximumQuantity; + unsigned int _maximumQuantity; /** seconds normally required to to reload standard qty */ - unsigned int _standardQuantityReloadTime; + unsigned int _standardQuantityReloadTime; /** seconds normally required to to reload maximum qty */ - unsigned int _maximumQuantityReloadTime; + unsigned int _maximumQuantityReloadTime; /** Units of measure */ - unsigned char _fuelMeasurmentUnits; + unsigned char _fuelMeasurmentUnits; /** fuel location as related to the entity */ - unsigned char _fuelLocation; + unsigned char _fuelLocation; /** padding */ - unsigned char _padding; - + unsigned char _padding; public: - EngineFuelReload(); - virtual ~EngineFuelReload(); + EngineFuelReload(); + virtual ~EngineFuelReload(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getStandardQuantity() const; - void setStandardQuantity(unsigned int pX); + unsigned int getStandardQuantity() const; + void setStandardQuantity(unsigned int pX); - unsigned int getMaximumQuantity() const; - void setMaximumQuantity(unsigned int pX); + unsigned int getMaximumQuantity() const; + void setMaximumQuantity(unsigned int pX); - unsigned int getStandardQuantityReloadTime() const; - void setStandardQuantityReloadTime(unsigned int pX); + unsigned int getStandardQuantityReloadTime() const; + void setStandardQuantityReloadTime(unsigned int pX); - unsigned int getMaximumQuantityReloadTime() const; - void setMaximumQuantityReloadTime(unsigned int pX); + unsigned int getMaximumQuantityReloadTime() const; + void setMaximumQuantityReloadTime(unsigned int pX); - unsigned char getFuelMeasurmentUnits() const; - void setFuelMeasurmentUnits(unsigned char pX); + unsigned char getFuelMeasurmentUnits() const; + void setFuelMeasurmentUnits(unsigned char pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + unsigned char getFuelLocation() const; + void setFuelLocation(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EngineFuelReload& rhs) const; + bool operator==(const EngineFuelReload& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +87,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityAssociation.cpp b/src/dis7/EntityAssociation.cpp index b4dbd8f1..cc17e41c 100644 --- a/src/dis7/EntityAssociation.cpp +++ b/src/dis7/EntityAssociation.cpp @@ -2,184 +2,144 @@ using namespace DIS; +EntityAssociation::EntityAssociation() + : _recordType(2), + _changeIndicator(0), + _associationStatus(0), + _associationType(0), + _entityID(), + _owsSttionLocation(0), + _physicalConnectionType(0), + _groupMemberType(0), + _groupNumber(0) {} -EntityAssociation::EntityAssociation(): - _recordType(2), - _changeIndicator(0), - _associationStatus(0), - _associationType(0), - _entityID(), - _owsSttionLocation(0), - _physicalConnectionType(0), - _groupMemberType(0), - _groupNumber(0) -{ -} +EntityAssociation::~EntityAssociation() {} -EntityAssociation::~EntityAssociation() -{ -} +unsigned char EntityAssociation::getRecordType() const { return _recordType; } -unsigned char EntityAssociation::getRecordType() const -{ - return _recordType; -} +void EntityAssociation::setRecordType(unsigned char pX) { _recordType = pX; } -void EntityAssociation::setRecordType(unsigned char pX) -{ - _recordType = pX; +unsigned char EntityAssociation::getChangeIndicator() const { + return _changeIndicator; } -unsigned char EntityAssociation::getChangeIndicator() const -{ - return _changeIndicator; +void EntityAssociation::setChangeIndicator(unsigned char pX) { + _changeIndicator = pX; } -void EntityAssociation::setChangeIndicator(unsigned char pX) -{ - _changeIndicator = pX; +unsigned char EntityAssociation::getAssociationStatus() const { + return _associationStatus; } -unsigned char EntityAssociation::getAssociationStatus() const -{ - return _associationStatus; +void EntityAssociation::setAssociationStatus(unsigned char pX) { + _associationStatus = pX; } -void EntityAssociation::setAssociationStatus(unsigned char pX) -{ - _associationStatus = pX; +unsigned char EntityAssociation::getAssociationType() const { + return _associationType; } -unsigned char EntityAssociation::getAssociationType() const -{ - return _associationType; +void EntityAssociation::setAssociationType(unsigned char pX) { + _associationType = pX; } -void EntityAssociation::setAssociationType(unsigned char pX) -{ - _associationType = pX; -} +EntityID& EntityAssociation::getEntityID() { return _entityID; } -EntityID& EntityAssociation::getEntityID() -{ - return _entityID; -} +const EntityID& EntityAssociation::getEntityID() const { return _entityID; } -const EntityID& EntityAssociation::getEntityID() const -{ - return _entityID; -} +void EntityAssociation::setEntityID(const EntityID& pX) { _entityID = pX; } -void EntityAssociation::setEntityID(const EntityID &pX) -{ - _entityID = pX; +unsigned short EntityAssociation::getOwsSttionLocation() const { + return _owsSttionLocation; } -unsigned short EntityAssociation::getOwsSttionLocation() const -{ - return _owsSttionLocation; +void EntityAssociation::setOwsSttionLocation(unsigned short pX) { + _owsSttionLocation = pX; } -void EntityAssociation::setOwsSttionLocation(unsigned short pX) -{ - _owsSttionLocation = pX; +unsigned short EntityAssociation::getPhysicalConnectionType() const { + return _physicalConnectionType; } -unsigned short EntityAssociation::getPhysicalConnectionType() const -{ - return _physicalConnectionType; +void EntityAssociation::setPhysicalConnectionType(unsigned short pX) { + _physicalConnectionType = pX; } -void EntityAssociation::setPhysicalConnectionType(unsigned short pX) -{ - _physicalConnectionType = pX; +unsigned char EntityAssociation::getGroupMemberType() const { + return _groupMemberType; } -unsigned char EntityAssociation::getGroupMemberType() const -{ - return _groupMemberType; +void EntityAssociation::setGroupMemberType(unsigned char pX) { + _groupMemberType = pX; } -void EntityAssociation::setGroupMemberType(unsigned char pX) -{ - _groupMemberType = pX; +unsigned short EntityAssociation::getGroupNumber() const { + return _groupNumber; } -unsigned short EntityAssociation::getGroupNumber() const -{ - return _groupNumber; -} - -void EntityAssociation::setGroupNumber(unsigned short pX) -{ - _groupNumber = pX; -} +void EntityAssociation::setGroupNumber(unsigned short pX) { _groupNumber = pX; } -void EntityAssociation::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _changeIndicator; - dataStream << _associationStatus; - dataStream << _associationType; - _entityID.marshal(dataStream); - dataStream << _owsSttionLocation; - dataStream << _physicalConnectionType; - dataStream << _groupMemberType; - dataStream << _groupNumber; +void EntityAssociation::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _changeIndicator; + dataStream << _associationStatus; + dataStream << _associationType; + _entityID.marshal(dataStream); + dataStream << _owsSttionLocation; + dataStream << _physicalConnectionType; + dataStream << _groupMemberType; + dataStream << _groupNumber; } -void EntityAssociation::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _changeIndicator; - dataStream >> _associationStatus; - dataStream >> _associationType; - _entityID.unmarshal(dataStream); - dataStream >> _owsSttionLocation; - dataStream >> _physicalConnectionType; - dataStream >> _groupMemberType; - dataStream >> _groupNumber; +void EntityAssociation::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _changeIndicator; + dataStream >> _associationStatus; + dataStream >> _associationType; + _entityID.unmarshal(dataStream); + dataStream >> _owsSttionLocation; + dataStream >> _physicalConnectionType; + dataStream >> _groupMemberType; + dataStream >> _groupNumber; } +bool EntityAssociation::operator==(const EntityAssociation& rhs) const { + bool ivarsEqual = true; -bool EntityAssociation::operator ==(const EntityAssociation& rhs) const - { - bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_changeIndicator == rhs._changeIndicator)) ivarsEqual = false; + if (!(_associationStatus == rhs._associationStatus)) ivarsEqual = false; + if (!(_associationType == rhs._associationType)) ivarsEqual = false; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; + if (!(_owsSttionLocation == rhs._owsSttionLocation)) ivarsEqual = false; + if (!(_physicalConnectionType == rhs._physicalConnectionType)) + ivarsEqual = false; + if (!(_groupMemberType == rhs._groupMemberType)) ivarsEqual = false; + if (!(_groupNumber == rhs._groupNumber)) ivarsEqual = false; - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_changeIndicator == rhs._changeIndicator) ) ivarsEqual = false; - if( ! (_associationStatus == rhs._associationStatus) ) ivarsEqual = false; - if( ! (_associationType == rhs._associationType) ) ivarsEqual = false; - if( ! (_entityID == rhs._entityID) ) ivarsEqual = false; - if( ! (_owsSttionLocation == rhs._owsSttionLocation) ) ivarsEqual = false; - if( ! (_physicalConnectionType == rhs._physicalConnectionType) ) ivarsEqual = false; - if( ! (_groupMemberType == rhs._groupMemberType) ) ivarsEqual = false; - if( ! (_groupNumber == rhs._groupNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EntityAssociation::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityAssociation::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _recordType - marshalSize = marshalSize + 1; // _changeIndicator - marshalSize = marshalSize + 1; // _associationStatus - marshalSize = marshalSize + 1; // _associationType - marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID - marshalSize = marshalSize + 2; // _owsSttionLocation - marshalSize = marshalSize + 2; // _physicalConnectionType - marshalSize = marshalSize + 1; // _groupMemberType - marshalSize = marshalSize + 2; // _groupNumber - return marshalSize; + marshalSize = marshalSize + 1; // _recordType + marshalSize = marshalSize + 1; // _changeIndicator + marshalSize = marshalSize + 1; // _associationStatus + marshalSize = marshalSize + 1; // _associationType + marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID + marshalSize = marshalSize + 2; // _owsSttionLocation + marshalSize = marshalSize + 2; // _physicalConnectionType + marshalSize = marshalSize + 1; // _groupMemberType + marshalSize = marshalSize + 2; // _groupNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -192,7 +152,7 @@ int EntityAssociation::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityAssociation.h b/src/dis7/EntityAssociation.h index 8d5772d0..3046b9f7 100644 --- a/src/dis7/EntityAssociation.h +++ b/src/dis7/EntityAssociation.h @@ -1,96 +1,93 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Association or disassociation of two entities. Section 6.2.93.4 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityAssociation -{ -protected: - /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; +class OPENDIS7_EXPORT EntityAssociation { + protected: + /** the identification of the Variable Parameter record. Enumeration from EBV + */ + unsigned char _recordType; /** Indicates if this VP has changed since last issuance */ - unsigned char _changeIndicator; + unsigned char _changeIndicator; /** Indicates association status between two entities; 8 bit enum */ - unsigned char _associationStatus; + unsigned char _associationStatus; /** Type of association; 8 bit enum */ - unsigned char _associationType; + unsigned char _associationType; /** Object ID of entity associated with this entity */ - EntityID _entityID; + EntityID _entityID; /** Station location on one's own entity. EBV doc. */ - unsigned short _owsSttionLocation; + unsigned short _owsSttionLocation; /** Type of physical connection. EBV doc */ - unsigned short _physicalConnectionType; + unsigned short _physicalConnectionType; /** Type of member the entity is within th egroup */ - unsigned char _groupMemberType; + unsigned char _groupMemberType; /** Group if any to which the entity belongs */ - unsigned short _groupNumber; - + unsigned short _groupNumber; public: - EntityAssociation(); - virtual ~EntityAssociation(); + EntityAssociation(); + virtual ~EntityAssociation(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + unsigned char getRecordType() const; + void setRecordType(unsigned char pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + unsigned char getChangeIndicator() const; + void setChangeIndicator(unsigned char pX); - unsigned char getAssociationStatus() const; - void setAssociationStatus(unsigned char pX); + unsigned char getAssociationStatus() const; + void setAssociationStatus(unsigned char pX); - unsigned char getAssociationType() const; - void setAssociationType(unsigned char pX); + unsigned char getAssociationType() const; + void setAssociationType(unsigned char pX); - EntityID& getEntityID(); - const EntityID& getEntityID() const; - void setEntityID(const EntityID &pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); - unsigned short getOwsSttionLocation() const; - void setOwsSttionLocation(unsigned short pX); + unsigned short getOwsSttionLocation() const; + void setOwsSttionLocation(unsigned short pX); - unsigned short getPhysicalConnectionType() const; - void setPhysicalConnectionType(unsigned short pX); + unsigned short getPhysicalConnectionType() const; + void setPhysicalConnectionType(unsigned short pX); - unsigned char getGroupMemberType() const; - void setGroupMemberType(unsigned char pX); + unsigned char getGroupMemberType() const; + void setGroupMemberType(unsigned char pX); - unsigned short getGroupNumber() const; - void setGroupNumber(unsigned short pX); + unsigned short getGroupNumber() const; + void setGroupNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityAssociation& rhs) const; + bool operator==(const EntityAssociation& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -103,7 +100,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityDamageStatusPdu.cpp b/src/dis7/EntityDamageStatusPdu.cpp index e6e88ddb..52bf7385 100644 --- a/src/dis7/EntityDamageStatusPdu.cpp +++ b/src/dis7/EntityDamageStatusPdu.cpp @@ -2,153 +2,129 @@ using namespace DIS; - -EntityDamageStatusPdu::EntityDamageStatusPdu() : WarfareFamilyPdu(), - _damagedEntityID(), - _padding1(0), - _padding2(0), - _numberOfDamageDescription(0) -{ - setPduType( 69 ); +EntityDamageStatusPdu::EntityDamageStatusPdu() + : WarfareFamilyPdu(), + _damagedEntityID(), + _padding1(0), + _padding2(0), + _numberOfDamageDescription(0) { + setPduType(69); } -EntityDamageStatusPdu::~EntityDamageStatusPdu() -{ - _damageDescriptionRecords.clear(); +EntityDamageStatusPdu::~EntityDamageStatusPdu() { + _damageDescriptionRecords.clear(); } -EntityID& EntityDamageStatusPdu::getDamagedEntityID() -{ - return _damagedEntityID; +EntityID& EntityDamageStatusPdu::getDamagedEntityID() { + return _damagedEntityID; } -const EntityID& EntityDamageStatusPdu::getDamagedEntityID() const -{ - return _damagedEntityID; +const EntityID& EntityDamageStatusPdu::getDamagedEntityID() const { + return _damagedEntityID; } -void EntityDamageStatusPdu::setDamagedEntityID(const EntityID &pX) -{ - _damagedEntityID = pX; +void EntityDamageStatusPdu::setDamagedEntityID(const EntityID& pX) { + _damagedEntityID = pX; } -unsigned short EntityDamageStatusPdu::getPadding1() const -{ - return _padding1; -} +unsigned short EntityDamageStatusPdu::getPadding1() const { return _padding1; } -void EntityDamageStatusPdu::setPadding1(unsigned short pX) -{ - _padding1 = pX; -} +void EntityDamageStatusPdu::setPadding1(unsigned short pX) { _padding1 = pX; } -unsigned short EntityDamageStatusPdu::getPadding2() const -{ - return _padding2; -} +unsigned short EntityDamageStatusPdu::getPadding2() const { return _padding2; } -void EntityDamageStatusPdu::setPadding2(unsigned short pX) -{ - _padding2 = pX; -} +void EntityDamageStatusPdu::setPadding2(unsigned short pX) { _padding2 = pX; } -unsigned short EntityDamageStatusPdu::getNumberOfDamageDescription() const -{ - return _damageDescriptionRecords.size(); +unsigned short EntityDamageStatusPdu::getNumberOfDamageDescription() const { + return _damageDescriptionRecords.size(); } -std::vector& EntityDamageStatusPdu::getDamageDescriptionRecords() -{ - return _damageDescriptionRecords; +std::vector& +EntityDamageStatusPdu::getDamageDescriptionRecords() { + return _damageDescriptionRecords; } -const std::vector& EntityDamageStatusPdu::getDamageDescriptionRecords() const -{ - return _damageDescriptionRecords; +const std::vector& +EntityDamageStatusPdu::getDamageDescriptionRecords() const { + return _damageDescriptionRecords; } -void EntityDamageStatusPdu::setDamageDescriptionRecords(const std::vector& pX) -{ - _damageDescriptionRecords = pX; +void EntityDamageStatusPdu::setDamageDescriptionRecords( + const std::vector& pX) { + _damageDescriptionRecords = pX; } -void EntityDamageStatusPdu::marshal(DataStream& dataStream) const -{ - WarfareFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _damagedEntityID.marshal(dataStream); - dataStream << _padding1; - dataStream << _padding2; - dataStream << ( unsigned short )_damageDescriptionRecords.size(); +void EntityDamageStatusPdu::marshal(DataStream& dataStream) const { + WarfareFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _damagedEntityID.marshal(dataStream); + dataStream << _padding1; + dataStream << _padding2; + dataStream << (unsigned short)_damageDescriptionRecords.size(); - for(size_t idx = 0; idx < _damageDescriptionRecords.size(); idx++) - { - DirectedEnergyDamage x = _damageDescriptionRecords[idx]; - x.marshal(dataStream); - } - -} - -void EntityDamageStatusPdu::unmarshal(DataStream& dataStream) -{ - WarfareFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _damagedEntityID.unmarshal(dataStream); - dataStream >> _padding1; - dataStream >> _padding2; - dataStream >> _numberOfDamageDescription; - - _damageDescriptionRecords.clear(); - for(size_t idx = 0; idx < _numberOfDamageDescription; idx++) - { - DirectedEnergyDamage x; - x.unmarshal(dataStream); - _damageDescriptionRecords.push_back(x); - } + for (size_t idx = 0; idx < _damageDescriptionRecords.size(); idx++) { + DirectedEnergyDamage x = _damageDescriptionRecords[idx]; + x.marshal(dataStream); + } } +void EntityDamageStatusPdu::unmarshal(DataStream& dataStream) { + WarfareFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _damagedEntityID.unmarshal(dataStream); + dataStream >> _padding1; + dataStream >> _padding2; + dataStream >> _numberOfDamageDescription; -bool EntityDamageStatusPdu::operator ==(const EntityDamageStatusPdu& rhs) const - { - bool ivarsEqual = true; + _damageDescriptionRecords.clear(); + for (size_t idx = 0; idx < _numberOfDamageDescription; idx++) { + DirectedEnergyDamage x; + x.unmarshal(dataStream); + _damageDescriptionRecords.push_back(x); + } +} - ivarsEqual = WarfareFamilyPdu::operator==(rhs); +bool EntityDamageStatusPdu::operator==(const EntityDamageStatusPdu& rhs) const { + bool ivarsEqual = true; - if( ! (_damagedEntityID == rhs._damagedEntityID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; + ivarsEqual = WarfareFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _damageDescriptionRecords.size(); idx++) - { - if( ! ( _damageDescriptionRecords[idx] == rhs._damageDescriptionRecords[idx]) ) ivarsEqual = false; - } + if (!(_damagedEntityID == rhs._damagedEntityID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + for (size_t idx = 0; idx < _damageDescriptionRecords.size(); idx++) { + if (!(_damageDescriptionRecords[idx] == rhs._damageDescriptionRecords[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int EntityDamageStatusPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityDamageStatusPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = WarfareFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _damagedEntityID.getMarshalledSize(); // _damagedEntityID - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 2; // _padding2 - marshalSize = marshalSize + 2; // _numberOfDamageDescription + marshalSize = WarfareFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _damagedEntityID.getMarshalledSize(); // _damagedEntityID + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 2; // _padding2 + marshalSize = marshalSize + 2; // _numberOfDamageDescription - for(unsigned long long idx=0; idx < _damageDescriptionRecords.size(); idx++) - { - DirectedEnergyDamage listElement = _damageDescriptionRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _damageDescriptionRecords.size(); + idx++) { + DirectedEnergyDamage listElement = _damageDescriptionRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -161,7 +137,7 @@ int EntityDamageStatusPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityDamageStatusPdu.h b/src/dis7/EntityDamageStatusPdu.h index 566e7452..b181747a 100644 --- a/src/dis7/EntityDamageStatusPdu.h +++ b/src/dis7/EntityDamageStatusPdu.h @@ -1,75 +1,76 @@ #pragma once -#include -#include #include + +#include +#include #include -#include #include +#include +namespace DIS { +// shall be used to communicate detailed damage information sustained by an +// entity regardless of the source of the damage Section 7.3.5 COMPLETE -namespace DIS -{ -// shall be used to communicate detailed damage information sustained by an entity regardless of the source of the damage Section 7.3.5 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityDamageStatusPdu : public WarfareFamilyPdu -{ -protected: - /** Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 COMPLETE */ - EntityID _damagedEntityID; +class OPENDIS7_EXPORT EntityDamageStatusPdu : public WarfareFamilyPdu { + protected: + /** Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 + * COMPLETE */ + EntityID _damagedEntityID; /** Padding. */ - unsigned short _padding1; + unsigned short _padding1; /** Padding. */ - unsigned short _padding2; - - /** field shall specify the number of Damage Description records, Section 7.3.5 */ - unsigned short _numberOfDamageDescription; + unsigned short _padding2; - /** Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5 */ - std::vector _damageDescriptionRecords; + /** field shall specify the number of Damage Description records, + * Section 7.3.5 */ + unsigned short _numberOfDamageDescription; + /** Fields shall contain one or more Damage Description records (see 6.2.17) + * and may contain other Standard Variable records, Section 7.3.5 */ + std::vector _damageDescriptionRecords; public: - EntityDamageStatusPdu(); - virtual ~EntityDamageStatusPdu(); + EntityDamageStatusPdu(); + virtual ~EntityDamageStatusPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getDamagedEntityID(); - const EntityID& getDamagedEntityID() const; - void setDamagedEntityID(const EntityID &pX); + EntityID& getDamagedEntityID(); + const EntityID& getDamagedEntityID() const; + void setDamagedEntityID(const EntityID& pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + unsigned short getPadding1() const; + void setPadding1(unsigned short pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + unsigned short getPadding2() const; + void setPadding2(unsigned short pX); - unsigned short getNumberOfDamageDescription() const; + unsigned short getNumberOfDamageDescription() const; - std::vector& getDamageDescriptionRecords(); - const std::vector& getDamageDescriptionRecords() const; - void setDamageDescriptionRecords(const std::vector& pX); + std::vector& getDamageDescriptionRecords(); + const std::vector& getDamageDescriptionRecords() const; + void setDamageDescriptionRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityDamageStatusPdu& rhs) const; + bool operator==(const EntityDamageStatusPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +83,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityID.cpp b/src/dis7/EntityID.cpp index c5fbb14f..97cc6cfd 100644 --- a/src/dis7/EntityID.cpp +++ b/src/dis7/EntityID.cpp @@ -2,79 +2,59 @@ using namespace DIS; +EntityID::EntityID() : _simulationAddress(), _entityNumber(0) {} -EntityID::EntityID(): - _simulationAddress(), - _entityNumber(0) -{ -} +EntityID::~EntityID() {} -EntityID::~EntityID() -{ +SimulationAddress& EntityID::getSimulationAddress() { + return _simulationAddress; } -SimulationAddress& EntityID::getSimulationAddress() -{ - return _simulationAddress; +const SimulationAddress& EntityID::getSimulationAddress() const { + return _simulationAddress; } -const SimulationAddress& EntityID::getSimulationAddress() const -{ - return _simulationAddress; +void EntityID::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -void EntityID::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; -} +unsigned short EntityID::getEntityNumber() const { return _entityNumber; } -unsigned short EntityID::getEntityNumber() const -{ - return _entityNumber; -} +void EntityID::setEntityNumber(unsigned short pX) { _entityNumber = pX; } -void EntityID::setEntityNumber(unsigned short pX) -{ - _entityNumber = pX; +void EntityID::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _entityNumber; } -void EntityID::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _entityNumber; +void EntityID::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _entityNumber; } -void EntityID::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _entityNumber; -} +bool EntityID::operator==(const EntityID& rhs) const { + bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_entityNumber == rhs._entityNumber)) ivarsEqual = false; -bool EntityID::operator ==(const EntityID& rhs) const - { - bool ivarsEqual = true; - - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_entityNumber == rhs._entityNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EntityID::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityID::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _entityNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _entityNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +67,7 @@ int EntityID::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityID.h b/src/dis7/EntityID.h index 9b73c15c..8ce733ab 100644 --- a/src/dis7/EntityID.h +++ b/src/dis7/EntityID.h @@ -1,54 +1,51 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Entity Identifier. Unique ID for entities in the world. Consists of an +// simulation address and a entity number. Section 6.2.28. -namespace DIS -{ -// Entity Identifier. Unique ID for entities in the world. Consists of an simulation address and a entity number. Section 6.2.28. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityID -{ -protected: +class OPENDIS7_EXPORT EntityID { + protected: /** Site and application IDs */ - SimulationAddress _simulationAddress; + SimulationAddress _simulationAddress; /** Entity number */ - unsigned short _entityNumber; - + unsigned short _entityNumber; public: - EntityID(); - virtual ~EntityID(); + EntityID(); + virtual ~EntityID(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getEntityNumber() const; - void setEntityNumber(unsigned short pX); + unsigned short getEntityNumber() const; + void setEntityNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityID& rhs) const; + bool operator==(const EntityID& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityInformationFamilyPdu.cpp b/src/dis7/EntityInformationFamilyPdu.cpp index 024e9cf7..2e93287f 100644 --- a/src/dis7/EntityInformationFamilyPdu.cpp +++ b/src/dis7/EntityInformationFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -EntityInformationFamilyPdu::EntityInformationFamilyPdu() : Pdu() +EntityInformationFamilyPdu::EntityInformationFamilyPdu() + : Pdu() { - setProtocolFamily( 1 ); + setProtocolFamily(1); } -EntityInformationFamilyPdu::~EntityInformationFamilyPdu() -{ -} +EntityInformationFamilyPdu::~EntityInformationFamilyPdu() {} -void EntityInformationFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void EntityInformationFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void EntityInformationFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void EntityInformationFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool EntityInformationFamilyPdu::operator==( + const EntityInformationFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool EntityInformationFamilyPdu::operator ==(const EntityInformationFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int EntityInformationFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityInformationFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int EntityInformationFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityInformationFamilyPdu.h b/src/dis7/EntityInformationFamilyPdu.h index b4f8db58..ca4182b8 100644 --- a/src/dis7/EntityInformationFamilyPdu.h +++ b/src/dis7/EntityInformationFamilyPdu.h @@ -1,41 +1,39 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Section 5.3.3. Common superclass for EntityState, Collision, +// collision-elastic, and entity state update PDUs. This should be abstract. +// COMPLETE -namespace DIS -{ -// Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs. This should be abstract. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityInformationFamilyPdu : public Pdu -{ -protected: - +class OPENDIS7_EXPORT EntityInformationFamilyPdu : public Pdu { + protected: public: - EntityInformationFamilyPdu(); - virtual ~EntityInformationFamilyPdu(); + EntityInformationFamilyPdu(); + virtual ~EntityInformationFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityInformationFamilyPdu& rhs) const; + bool operator==(const EntityInformationFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +46,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityManagementFamilyPdu.cpp b/src/dis7/EntityManagementFamilyPdu.cpp index e53cbc01..54ad5b0d 100644 --- a/src/dis7/EntityManagementFamilyPdu.cpp +++ b/src/dis7/EntityManagementFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -EntityManagementFamilyPdu::EntityManagementFamilyPdu() : Pdu() +EntityManagementFamilyPdu::EntityManagementFamilyPdu() + : Pdu() { - setProtocolFamily( 7 ); + setProtocolFamily(7); } -EntityManagementFamilyPdu::~EntityManagementFamilyPdu() -{ -} +EntityManagementFamilyPdu::~EntityManagementFamilyPdu() {} -void EntityManagementFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void EntityManagementFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void EntityManagementFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void EntityManagementFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool EntityManagementFamilyPdu::operator==( + const EntityManagementFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool EntityManagementFamilyPdu::operator ==(const EntityManagementFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int EntityManagementFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityManagementFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int EntityManagementFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityManagementFamilyPdu.h b/src/dis7/EntityManagementFamilyPdu.h index 506bf032..361f4444 100644 --- a/src/dis7/EntityManagementFamilyPdu.h +++ b/src/dis7/EntityManagementFamilyPdu.h @@ -1,41 +1,37 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Managment of grouping of PDUs, and more. Section 7.8 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityManagementFamilyPdu : public Pdu -{ -protected: - +class OPENDIS7_EXPORT EntityManagementFamilyPdu : public Pdu { + protected: public: - EntityManagementFamilyPdu(); - virtual ~EntityManagementFamilyPdu(); + EntityManagementFamilyPdu(); + virtual ~EntityManagementFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityManagementFamilyPdu& rhs) const; + bool operator==(const EntityManagementFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityMarking.cpp b/src/dis7/EntityMarking.cpp index f820314a..974d81f4 100644 --- a/src/dis7/EntityMarking.cpp +++ b/src/dis7/EntityMarking.cpp @@ -1,112 +1,80 @@ -#include - #include -using namespace DIS; - +#include -EntityMarking::EntityMarking(): - _characterSet(0) -{ - // Initialize fixed length array - for(int lengthcharacters= 0; lengthcharacters < 11; lengthcharacters++) - { - _characters[lengthcharacters] = 0; - } +using namespace DIS; +EntityMarking::EntityMarking() : _characterSet(0) { + // Initialize fixed length array + for (int lengthcharacters = 0; lengthcharacters < 11; lengthcharacters++) { + _characters[lengthcharacters] = 0; + } } -EntityMarking::~EntityMarking() -{ -} +EntityMarking::~EntityMarking() {} -unsigned char EntityMarking::getCharacterSet() const -{ - return _characterSet; -} +unsigned char EntityMarking::getCharacterSet() const { return _characterSet; } -void EntityMarking::setCharacterSet(unsigned char pX) -{ - _characterSet = pX; -} +void EntityMarking::setCharacterSet(unsigned char pX) { _characterSet = pX; } -char* EntityMarking::getCharacters() -{ - return _characters; -} +char* EntityMarking::getCharacters() { return _characters; } -const char* EntityMarking::getCharacters() const -{ - return _characters; -} +const char* EntityMarking::getCharacters() const { return _characters; } -void EntityMarking::setCharacters(const char* x) -{ - for(int i = 0; i < 11; i++) - { - _characters[i] = x[i]; - } +void EntityMarking::setCharacters(const char* x) { + for (int i = 0; i < 11; i++) { + _characters[i] = x[i]; + } } -// An alternate method to set the value if this could be a string. This is not strictly comnpliant with the DIS standard. -void EntityMarking::setByStringCharacters(const char* x) -{ - std::strncpy(_characters, x, 11-1); - _characters[11 -1] = '\0'; +// An alternate method to set the value if this could be a string. This is not +// strictly comnpliant with the DIS standard. +void EntityMarking::setByStringCharacters(const char* x) { + std::strncpy(_characters, x, 11 - 1); + _characters[11 - 1] = '\0'; } -void EntityMarking::marshal(DataStream& dataStream) const -{ - dataStream << _characterSet; - - for(size_t idx = 0; idx < 11; idx++) - { - dataStream << _characters[idx]; - } +void EntityMarking::marshal(DataStream& dataStream) const { + dataStream << _characterSet; + for (size_t idx = 0; idx < 11; idx++) { + dataStream << _characters[idx]; + } } -void EntityMarking::unmarshal(DataStream& dataStream) -{ - dataStream >> _characterSet; - - for(size_t idx = 0; idx < 11; idx++) - { - dataStream >> _characters[idx]; - } +void EntityMarking::unmarshal(DataStream& dataStream) { + dataStream >> _characterSet; + for (size_t idx = 0; idx < 11; idx++) { + dataStream >> _characters[idx]; + } } +bool EntityMarking::operator==(const EntityMarking& rhs) const { + bool ivarsEqual = true; -bool EntityMarking::operator ==(const EntityMarking& rhs) const - { - bool ivarsEqual = true; - - if( ! (_characterSet == rhs._characterSet) ) ivarsEqual = false; + if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for(unsigned char idx = 0; idx < 11; idx++) - { - if(!(_characters[idx] == rhs._characters[idx]) ) ivarsEqual = false; - } + for (unsigned char idx = 0; idx < 11; idx++) { + if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int EntityMarking::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityMarking::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _characterSet - marshalSize = marshalSize + 11 * 1; // _characters - return marshalSize; + marshalSize = marshalSize + 1; // _characterSet + marshalSize = marshalSize + 11 * 1; // _characters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -119,7 +87,7 @@ int EntityMarking::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityMarking.h b/src/dis7/EntityMarking.h index 62b1a397..6807c2ff 100644 --- a/src/dis7/EntityMarking.h +++ b/src/dis7/EntityMarking.h @@ -1,54 +1,51 @@ #pragma once -#include #include +#include +namespace DIS { +// Specifies the character set used inthe first byte, followed by 11 characters +// of text data. Section 6.29 -namespace DIS -{ -// Specifies the character set used inthe first byte, followed by 11 characters of text data. Section 6.29 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityMarking -{ -protected: +class OPENDIS7_EXPORT EntityMarking { + protected: /** The character set */ - unsigned char _characterSet; + unsigned char _characterSet; /** The characters */ - char _characters[11]; - + char _characters[11]; public: - EntityMarking(); - virtual ~EntityMarking(); + EntityMarking(); + virtual ~EntityMarking(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + unsigned char getCharacterSet() const; + void setCharacterSet(unsigned char pX); - char* getCharacters(); - const char* getCharacters() const; - void setCharacters( const char* pX); - void setByStringCharacters(const char* pX); + char* getCharacters(); + const char* getCharacters() const; + void setCharacters(const char* pX); + void setByStringCharacters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityMarking& rhs) const; + bool operator==(const EntityMarking& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityStatePdu.cpp b/src/dis7/EntityStatePdu.cpp index 827ce5f7..d8cb0c8c 100644 --- a/src/dis7/EntityStatePdu.cpp +++ b/src/dis7/EntityStatePdu.cpp @@ -2,308 +2,248 @@ using namespace DIS; - -EntityStatePdu::EntityStatePdu() : EntityInformationFamilyPdu(), - _entityID(), - _forceId(0), - _numberOfVariableParameters(0), - _entityType(), - _alternativeEntityType(), - _entityLinearVelocity(), - _entityLocation(), - _entityOrientation(), - _entityAppearance(0), - _deadReckoningParameters(), - _marking(), - _capabilities(0) -{ - setPduType( 1 ); +EntityStatePdu::EntityStatePdu() + : EntityInformationFamilyPdu(), + _entityID(), + _forceId(0), + _numberOfVariableParameters(0), + _entityType(), + _alternativeEntityType(), + _entityLinearVelocity(), + _entityLocation(), + _entityOrientation(), + _entityAppearance(0), + _deadReckoningParameters(), + _marking(), + _capabilities(0) { + setPduType(1); } -EntityStatePdu::~EntityStatePdu() -{ - _variableParameters.clear(); -} +EntityStatePdu::~EntityStatePdu() { _variableParameters.clear(); } -EntityID& EntityStatePdu::getEntityID() -{ - return _entityID; -} +EntityID& EntityStatePdu::getEntityID() { return _entityID; } -const EntityID& EntityStatePdu::getEntityID() const -{ - return _entityID; -} +const EntityID& EntityStatePdu::getEntityID() const { return _entityID; } -void EntityStatePdu::setEntityID(const EntityID &pX) -{ - _entityID = pX; -} +void EntityStatePdu::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned char EntityStatePdu::getForceId() const -{ - return _forceId; -} +unsigned char EntityStatePdu::getForceId() const { return _forceId; } -void EntityStatePdu::setForceId(unsigned char pX) -{ - _forceId = pX; -} +void EntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } -unsigned char EntityStatePdu::getNumberOfVariableParameters() const -{ - return _variableParameters.size(); +unsigned char EntityStatePdu::getNumberOfVariableParameters() const { + return _variableParameters.size(); } -EntityType& EntityStatePdu::getEntityType() -{ - return _entityType; -} +EntityType& EntityStatePdu::getEntityType() { return _entityType; } -const EntityType& EntityStatePdu::getEntityType() const -{ - return _entityType; -} +const EntityType& EntityStatePdu::getEntityType() const { return _entityType; } -void EntityStatePdu::setEntityType(const EntityType &pX) -{ - _entityType = pX; -} +void EntityStatePdu::setEntityType(const EntityType& pX) { _entityType = pX; } -EntityType& EntityStatePdu::getAlternativeEntityType() -{ - return _alternativeEntityType; +EntityType& EntityStatePdu::getAlternativeEntityType() { + return _alternativeEntityType; } -const EntityType& EntityStatePdu::getAlternativeEntityType() const -{ - return _alternativeEntityType; +const EntityType& EntityStatePdu::getAlternativeEntityType() const { + return _alternativeEntityType; } -void EntityStatePdu::setAlternativeEntityType(const EntityType &pX) -{ - _alternativeEntityType = pX; +void EntityStatePdu::setAlternativeEntityType(const EntityType& pX) { + _alternativeEntityType = pX; } -Vector3Float& EntityStatePdu::getEntityLinearVelocity() -{ - return _entityLinearVelocity; +Vector3Float& EntityStatePdu::getEntityLinearVelocity() { + return _entityLinearVelocity; } -const Vector3Float& EntityStatePdu::getEntityLinearVelocity() const -{ - return _entityLinearVelocity; +const Vector3Float& EntityStatePdu::getEntityLinearVelocity() const { + return _entityLinearVelocity; } -void EntityStatePdu::setEntityLinearVelocity(const Vector3Float &pX) -{ - _entityLinearVelocity = pX; +void EntityStatePdu::setEntityLinearVelocity(const Vector3Float& pX) { + _entityLinearVelocity = pX; } -Vector3Double& EntityStatePdu::getEntityLocation() -{ - return _entityLocation; -} +Vector3Double& EntityStatePdu::getEntityLocation() { return _entityLocation; } -const Vector3Double& EntityStatePdu::getEntityLocation() const -{ - return _entityLocation; +const Vector3Double& EntityStatePdu::getEntityLocation() const { + return _entityLocation; } -void EntityStatePdu::setEntityLocation(const Vector3Double &pX) -{ - _entityLocation = pX; +void EntityStatePdu::setEntityLocation(const Vector3Double& pX) { + _entityLocation = pX; } -EulerAngles& EntityStatePdu::getEntityOrientation() -{ - return _entityOrientation; +EulerAngles& EntityStatePdu::getEntityOrientation() { + return _entityOrientation; } -const EulerAngles& EntityStatePdu::getEntityOrientation() const -{ - return _entityOrientation; +const EulerAngles& EntityStatePdu::getEntityOrientation() const { + return _entityOrientation; } -void EntityStatePdu::setEntityOrientation(const EulerAngles &pX) -{ - _entityOrientation = pX; +void EntityStatePdu::setEntityOrientation(const EulerAngles& pX) { + _entityOrientation = pX; } -unsigned int EntityStatePdu::getEntityAppearance() const -{ - return _entityAppearance; +unsigned int EntityStatePdu::getEntityAppearance() const { + return _entityAppearance; } -void EntityStatePdu::setEntityAppearance(unsigned int pX) -{ - _entityAppearance = pX; +void EntityStatePdu::setEntityAppearance(unsigned int pX) { + _entityAppearance = pX; } -DeadReckoningParameters& EntityStatePdu::getDeadReckoningParameters() -{ - return _deadReckoningParameters; +DeadReckoningParameters& EntityStatePdu::getDeadReckoningParameters() { + return _deadReckoningParameters; } -const DeadReckoningParameters& EntityStatePdu::getDeadReckoningParameters() const -{ - return _deadReckoningParameters; +const DeadReckoningParameters& EntityStatePdu::getDeadReckoningParameters() + const { + return _deadReckoningParameters; } -void EntityStatePdu::setDeadReckoningParameters(const DeadReckoningParameters &pX) -{ - _deadReckoningParameters = pX; +void EntityStatePdu::setDeadReckoningParameters( + const DeadReckoningParameters& pX) { + _deadReckoningParameters = pX; } -EntityMarking& EntityStatePdu::getMarking() -{ - return _marking; -} +EntityMarking& EntityStatePdu::getMarking() { return _marking; } -const EntityMarking& EntityStatePdu::getMarking() const -{ - return _marking; -} +const EntityMarking& EntityStatePdu::getMarking() const { return _marking; } -void EntityStatePdu::setMarking(const EntityMarking &pX) -{ - _marking = pX; -} +void EntityStatePdu::setMarking(const EntityMarking& pX) { _marking = pX; } -unsigned int EntityStatePdu::getCapabilities() const -{ - return _capabilities; -} +unsigned int EntityStatePdu::getCapabilities() const { return _capabilities; } -void EntityStatePdu::setCapabilities(unsigned int pX) -{ - _capabilities = pX; -} +void EntityStatePdu::setCapabilities(unsigned int pX) { _capabilities = pX; } -std::vector& EntityStatePdu::getVariableParameters() -{ - return _variableParameters; +std::vector& EntityStatePdu::getVariableParameters() { + return _variableParameters; } -const std::vector& EntityStatePdu::getVariableParameters() const -{ - return _variableParameters; +const std::vector& EntityStatePdu::getVariableParameters() + const { + return _variableParameters; } -void EntityStatePdu::setVariableParameters(const std::vector& pX) -{ - _variableParameters = pX; +void EntityStatePdu::setVariableParameters( + const std::vector& pX) { + _variableParameters = pX; } -void EntityStatePdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _entityID.marshal(dataStream); - dataStream << _forceId; - dataStream << ( unsigned char )_variableParameters.size(); - _entityType.marshal(dataStream); - _alternativeEntityType.marshal(dataStream); - _entityLinearVelocity.marshal(dataStream); - _entityLocation.marshal(dataStream); - _entityOrientation.marshal(dataStream); - dataStream << _entityAppearance; - _deadReckoningParameters.marshal(dataStream); - _marking.marshal(dataStream); - dataStream << _capabilities; - - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - VariableParameter x = _variableParameters[idx]; - x.marshal(dataStream); - } +void EntityStatePdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _entityID.marshal(dataStream); + dataStream << _forceId; + dataStream << (unsigned char)_variableParameters.size(); + _entityType.marshal(dataStream); + _alternativeEntityType.marshal(dataStream); + _entityLinearVelocity.marshal(dataStream); + _entityLocation.marshal(dataStream); + _entityOrientation.marshal(dataStream); + dataStream << _entityAppearance; + _deadReckoningParameters.marshal(dataStream); + _marking.marshal(dataStream); + dataStream << _capabilities; + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter x = _variableParameters[idx]; + x.marshal(dataStream); + } } -void EntityStatePdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _entityID.unmarshal(dataStream); - dataStream >> _forceId; - dataStream >> _numberOfVariableParameters; - _entityType.unmarshal(dataStream); - _alternativeEntityType.unmarshal(dataStream); - _entityLinearVelocity.unmarshal(dataStream); - _entityLocation.unmarshal(dataStream); - _entityOrientation.unmarshal(dataStream); - dataStream >> _entityAppearance; - _deadReckoningParameters.unmarshal(dataStream); - _marking.unmarshal(dataStream); - dataStream >> _capabilities; - - _variableParameters.clear(); - for(size_t idx = 0; idx < _numberOfVariableParameters; idx++) - { - VariableParameter x; - x.unmarshal(dataStream); - _variableParameters.push_back(x); - } +void EntityStatePdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _entityID.unmarshal(dataStream); + dataStream >> _forceId; + dataStream >> _numberOfVariableParameters; + _entityType.unmarshal(dataStream); + _alternativeEntityType.unmarshal(dataStream); + _entityLinearVelocity.unmarshal(dataStream); + _entityLocation.unmarshal(dataStream); + _entityOrientation.unmarshal(dataStream); + dataStream >> _entityAppearance; + _deadReckoningParameters.unmarshal(dataStream); + _marking.unmarshal(dataStream); + dataStream >> _capabilities; + + _variableParameters.clear(); + for (size_t idx = 0; idx < _numberOfVariableParameters; idx++) { + VariableParameter x; + x.unmarshal(dataStream); + _variableParameters.push_back(x); + } } +bool EntityStatePdu::operator==(const EntityStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); -bool EntityStatePdu::operator ==(const EntityStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_entityID == rhs._entityID) ) ivarsEqual = false; - if( ! (_forceId == rhs._forceId) ) ivarsEqual = false; - if( ! (_entityType == rhs._entityType) ) ivarsEqual = false; - if( ! (_alternativeEntityType == rhs._alternativeEntityType) ) ivarsEqual = false; - if( ! (_entityLinearVelocity == rhs._entityLinearVelocity) ) ivarsEqual = false; - if( ! (_entityLocation == rhs._entityLocation) ) ivarsEqual = false; - if( ! (_entityOrientation == rhs._entityOrientation) ) ivarsEqual = false; - if( ! (_entityAppearance == rhs._entityAppearance) ) ivarsEqual = false; - if( ! (_deadReckoningParameters == rhs._deadReckoningParameters) ) ivarsEqual = false; - if( ! (_marking == rhs._marking) ) ivarsEqual = false; - if( ! (_capabilities == rhs._capabilities) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - if( ! ( _variableParameters[idx] == rhs._variableParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int EntityStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID - marshalSize = marshalSize + 1; // _forceId - marshalSize = marshalSize + 1; // _numberOfVariableParameters - marshalSize = marshalSize + _entityType.getMarshalledSize(); // _entityType - marshalSize = marshalSize + _alternativeEntityType.getMarshalledSize(); // _alternativeEntityType - marshalSize = marshalSize + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity - marshalSize = marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation - marshalSize = marshalSize + _entityOrientation.getMarshalledSize(); // _entityOrientation - marshalSize = marshalSize + 4; // _entityAppearance - marshalSize = marshalSize + _deadReckoningParameters.getMarshalledSize(); // _deadReckoningParameters - marshalSize = marshalSize + _marking.getMarshalledSize(); // _marking - marshalSize = marshalSize + 4; // _capabilities - - for(unsigned long long idx=0; idx < _variableParameters.size(); idx++) - { - VariableParameter listElement = _variableParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; + if (!(_forceId == rhs._forceId)) ivarsEqual = false; + if (!(_entityType == rhs._entityType)) ivarsEqual = false; + if (!(_alternativeEntityType == rhs._alternativeEntityType)) + ivarsEqual = false; + if (!(_entityLinearVelocity == rhs._entityLinearVelocity)) ivarsEqual = false; + if (!(_entityLocation == rhs._entityLocation)) ivarsEqual = false; + if (!(_entityOrientation == rhs._entityOrientation)) ivarsEqual = false; + if (!(_entityAppearance == rhs._entityAppearance)) ivarsEqual = false; + if (!(_deadReckoningParameters == rhs._deadReckoningParameters)) + ivarsEqual = false; + if (!(_marking == rhs._marking)) ivarsEqual = false; + if (!(_capabilities == rhs._capabilities)) ivarsEqual = false; + + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + if (!(_variableParameters[idx] == rhs._variableParameters[idx])) + ivarsEqual = false; + } + + return ivarsEqual; +} + +int EntityStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID + marshalSize = marshalSize + 1; // _forceId + marshalSize = marshalSize + 1; // _numberOfVariableParameters + marshalSize = marshalSize + _entityType.getMarshalledSize(); // _entityType + marshalSize = + marshalSize + + _alternativeEntityType.getMarshalledSize(); // _alternativeEntityType + marshalSize = + marshalSize + + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity + marshalSize = + marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation + marshalSize = marshalSize + + _entityOrientation.getMarshalledSize(); // _entityOrientation + marshalSize = marshalSize + 4; // _entityAppearance + marshalSize = + marshalSize + + _deadReckoningParameters.getMarshalledSize(); // _deadReckoningParameters + marshalSize = marshalSize + _marking.getMarshalledSize(); // _marking + marshalSize = marshalSize + 4; // _capabilities + + for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter listElement = _variableParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -316,7 +256,7 @@ int EntityStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityStatePdu.h b/src/dis7/EntityStatePdu.h index bc32267d..29c8bcc5 100644 --- a/src/dis7/EntityStatePdu.h +++ b/src/dis7/EntityStatePdu.h @@ -1,136 +1,137 @@ #pragma once +#include + +#include #include +#include +#include #include -#include -#include -#include #include -#include -#include #include -#include -#include -#include +#include +#include #include +#include +namespace DIS { +// Represents the postion and state of one entity in the world. Section 7.2.2. +// COMPLETE -namespace DIS -{ -// Represents the postion and state of one entity in the world. Section 7.2.2. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu -{ -protected: +class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { + protected: /** Unique ID for an entity that is tied to this state information */ - EntityID _entityID; + EntityID _entityID; /** What force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + unsigned char _forceId; - /** How many variable parameters are in the variable length list. In earlier versions of DIS these were known as articulation parameters */ - unsigned char _numberOfVariableParameters; + /** How many variable parameters are in the variable length list. In earlier + * versions of DIS these were known as articulation parameters */ + unsigned char _numberOfVariableParameters; /** Describes the type of entity in the world */ - EntityType _entityType; + EntityType _entityType; - EntityType _alternativeEntityType; + EntityType _alternativeEntityType; /** Describes the speed of the entity in the world */ - Vector3Float _entityLinearVelocity; + Vector3Float _entityLinearVelocity; /** describes the location of the entity in the world */ - Vector3Double _entityLocation; + Vector3Double _entityLocation; /** describes the orientation of the entity, in euler angles */ - EulerAngles _entityOrientation; + EulerAngles _entityOrientation; - /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */ - unsigned int _entityAppearance; + /** a series of bit flags that are used to help draw the entity, such as + * smoking, on fire, etc. */ + unsigned int _entityAppearance; /** parameters used for dead reckoning */ - DeadReckoningParameters _deadReckoningParameters; + DeadReckoningParameters _deadReckoningParameters; - /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */ - EntityMarking _marking; + /** characters that can be used for debugging, or to draw unique strings on + * the side of entities in the world */ + EntityMarking _marking; /** a series of bit flags */ - unsigned int _capabilities; - - /** variable length list of variable parameters. In earlier DIS versions this was articulation parameters. */ - std::vector _variableParameters; + unsigned int _capabilities; + /** variable length list of variable parameters. In earlier DIS versions this + * was articulation parameters. */ + std::vector _variableParameters; public: - EntityStatePdu(); - virtual ~EntityStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + EntityStatePdu(); + virtual ~EntityStatePdu(); - EntityID& getEntityID(); - const EntityID& getEntityID() const; - void setEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); - unsigned char getNumberOfVariableParameters() const; + unsigned char getForceId() const; + void setForceId(unsigned char pX); - EntityType& getEntityType(); - const EntityType& getEntityType() const; - void setEntityType(const EntityType &pX); + unsigned char getNumberOfVariableParameters() const; - EntityType& getAlternativeEntityType(); - const EntityType& getAlternativeEntityType() const; - void setAlternativeEntityType(const EntityType &pX); + EntityType& getEntityType(); + const EntityType& getEntityType() const; + void setEntityType(const EntityType& pX); - Vector3Float& getEntityLinearVelocity(); - const Vector3Float& getEntityLinearVelocity() const; - void setEntityLinearVelocity(const Vector3Float &pX); + EntityType& getAlternativeEntityType(); + const EntityType& getAlternativeEntityType() const; + void setAlternativeEntityType(const EntityType& pX); - Vector3Double& getEntityLocation(); - const Vector3Double& getEntityLocation() const; - void setEntityLocation(const Vector3Double &pX); + Vector3Float& getEntityLinearVelocity(); + const Vector3Float& getEntityLinearVelocity() const; + void setEntityLinearVelocity(const Vector3Float& pX); - EulerAngles& getEntityOrientation(); - const EulerAngles& getEntityOrientation() const; - void setEntityOrientation(const EulerAngles &pX); + Vector3Double& getEntityLocation(); + const Vector3Double& getEntityLocation() const; + void setEntityLocation(const Vector3Double& pX); - unsigned int getEntityAppearance() const; - void setEntityAppearance(unsigned int pX); + EulerAngles& getEntityOrientation(); + const EulerAngles& getEntityOrientation() const; + void setEntityOrientation(const EulerAngles& pX); - DeadReckoningParameters& getDeadReckoningParameters(); - const DeadReckoningParameters& getDeadReckoningParameters() const; - void setDeadReckoningParameters(const DeadReckoningParameters &pX); + unsigned int getEntityAppearance() const; + void setEntityAppearance(unsigned int pX); - EntityMarking& getMarking(); - const EntityMarking& getMarking() const; - void setMarking(const EntityMarking &pX); + DeadReckoningParameters& getDeadReckoningParameters(); + const DeadReckoningParameters& getDeadReckoningParameters() const; + void setDeadReckoningParameters(const DeadReckoningParameters& pX); - unsigned int getCapabilities() const; - void setCapabilities(unsigned int pX); + EntityMarking& getMarking(); + const EntityMarking& getMarking() const; + void setMarking(const EntityMarking& pX); - std::vector& getVariableParameters(); - const std::vector& getVariableParameters() const; - void setVariableParameters(const std::vector& pX); + unsigned int getCapabilities() const; + void setCapabilities(unsigned int pX); + std::vector& getVariableParameters(); + const std::vector& getVariableParameters() const; + void setVariableParameters(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const EntityStatePdu& rhs) const; + bool operator==(const EntityStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -143,7 +144,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityStateUpdatePdu.cpp b/src/dis7/EntityStateUpdatePdu.cpp index 5be5b598..37ce25ce 100644 --- a/src/dis7/EntityStateUpdatePdu.cpp +++ b/src/dis7/EntityStateUpdatePdu.cpp @@ -2,214 +2,178 @@ using namespace DIS; - -EntityStateUpdatePdu::EntityStateUpdatePdu() : EntityInformationFamilyPdu(), - _entityID(), - _padding1(0), - _numberOfVariableParameters(0), - _entityLinearVelocity(), - _entityLocation(), - _entityOrientation(), - _entityAppearance(0) -{ - setPduType( 67 ); - setProtocolFamily( 1 ); +EntityStateUpdatePdu::EntityStateUpdatePdu() + : EntityInformationFamilyPdu(), + _entityID(), + _padding1(0), + _numberOfVariableParameters(0), + _entityLinearVelocity(), + _entityLocation(), + _entityOrientation(), + _entityAppearance(0) { + setPduType(67); + setProtocolFamily(1); } -EntityStateUpdatePdu::~EntityStateUpdatePdu() -{ - _variableParameters.clear(); -} +EntityStateUpdatePdu::~EntityStateUpdatePdu() { _variableParameters.clear(); } -EntityID& EntityStateUpdatePdu::getEntityID() -{ - return _entityID; -} +EntityID& EntityStateUpdatePdu::getEntityID() { return _entityID; } -const EntityID& EntityStateUpdatePdu::getEntityID() const -{ - return _entityID; -} +const EntityID& EntityStateUpdatePdu::getEntityID() const { return _entityID; } -void EntityStateUpdatePdu::setEntityID(const EntityID &pX) -{ - _entityID = pX; -} +void EntityStateUpdatePdu::setEntityID(const EntityID& pX) { _entityID = pX; } -char EntityStateUpdatePdu::getPadding1() const -{ - return _padding1; -} +char EntityStateUpdatePdu::getPadding1() const { return _padding1; } -void EntityStateUpdatePdu::setPadding1(char pX) -{ - _padding1 = pX; -} +void EntityStateUpdatePdu::setPadding1(char pX) { _padding1 = pX; } -unsigned char EntityStateUpdatePdu::getNumberOfVariableParameters() const -{ - return _variableParameters.size(); +unsigned char EntityStateUpdatePdu::getNumberOfVariableParameters() const { + return _variableParameters.size(); } -Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() -{ - return _entityLinearVelocity; +Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() { + return _entityLinearVelocity; } -const Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() const -{ - return _entityLinearVelocity; +const Vector3Float& EntityStateUpdatePdu::getEntityLinearVelocity() const { + return _entityLinearVelocity; } -void EntityStateUpdatePdu::setEntityLinearVelocity(const Vector3Float &pX) -{ - _entityLinearVelocity = pX; +void EntityStateUpdatePdu::setEntityLinearVelocity(const Vector3Float& pX) { + _entityLinearVelocity = pX; } -Vector3Double& EntityStateUpdatePdu::getEntityLocation() -{ - return _entityLocation; +Vector3Double& EntityStateUpdatePdu::getEntityLocation() { + return _entityLocation; } -const Vector3Double& EntityStateUpdatePdu::getEntityLocation() const -{ - return _entityLocation; +const Vector3Double& EntityStateUpdatePdu::getEntityLocation() const { + return _entityLocation; } -void EntityStateUpdatePdu::setEntityLocation(const Vector3Double &pX) -{ - _entityLocation = pX; +void EntityStateUpdatePdu::setEntityLocation(const Vector3Double& pX) { + _entityLocation = pX; } -EulerAngles& EntityStateUpdatePdu::getEntityOrientation() -{ - return _entityOrientation; +EulerAngles& EntityStateUpdatePdu::getEntityOrientation() { + return _entityOrientation; } -const EulerAngles& EntityStateUpdatePdu::getEntityOrientation() const -{ - return _entityOrientation; +const EulerAngles& EntityStateUpdatePdu::getEntityOrientation() const { + return _entityOrientation; } -void EntityStateUpdatePdu::setEntityOrientation(const EulerAngles &pX) -{ - _entityOrientation = pX; +void EntityStateUpdatePdu::setEntityOrientation(const EulerAngles& pX) { + _entityOrientation = pX; } -unsigned int EntityStateUpdatePdu::getEntityAppearance() const -{ - return _entityAppearance; +unsigned int EntityStateUpdatePdu::getEntityAppearance() const { + return _entityAppearance; } -void EntityStateUpdatePdu::setEntityAppearance(unsigned int pX) -{ - _entityAppearance = pX; +void EntityStateUpdatePdu::setEntityAppearance(unsigned int pX) { + _entityAppearance = pX; } -std::vector& EntityStateUpdatePdu::getVariableParameters() -{ - return _variableParameters; +std::vector& EntityStateUpdatePdu::getVariableParameters() { + return _variableParameters; } -const std::vector& EntityStateUpdatePdu::getVariableParameters() const -{ - return _variableParameters; +const std::vector& +EntityStateUpdatePdu::getVariableParameters() const { + return _variableParameters; } -void EntityStateUpdatePdu::setVariableParameters(const std::vector& pX) -{ - _variableParameters = pX; +void EntityStateUpdatePdu::setVariableParameters( + const std::vector& pX) { + _variableParameters = pX; } -void EntityStateUpdatePdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _entityID.marshal(dataStream); - dataStream << _padding1; - dataStream << ( unsigned char )_variableParameters.size(); - _entityLinearVelocity.marshal(dataStream); - _entityLocation.marshal(dataStream); - _entityOrientation.marshal(dataStream); - dataStream << _entityAppearance; - - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - VariableParameter x = _variableParameters[idx]; - x.marshal(dataStream); - } +void EntityStateUpdatePdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _entityID.marshal(dataStream); + dataStream << _padding1; + dataStream << (unsigned char)_variableParameters.size(); + _entityLinearVelocity.marshal(dataStream); + _entityLocation.marshal(dataStream); + _entityOrientation.marshal(dataStream); + dataStream << _entityAppearance; + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter x = _variableParameters[idx]; + x.marshal(dataStream); + } } -void EntityStateUpdatePdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _entityID.unmarshal(dataStream); - dataStream >> _padding1; - dataStream >> _numberOfVariableParameters; - _entityLinearVelocity.unmarshal(dataStream); - _entityLocation.unmarshal(dataStream); - _entityOrientation.unmarshal(dataStream); - dataStream >> _entityAppearance; +void EntityStateUpdatePdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _entityID.unmarshal(dataStream); + dataStream >> _padding1; + dataStream >> _numberOfVariableParameters; + _entityLinearVelocity.unmarshal(dataStream); + _entityLocation.unmarshal(dataStream); + _entityOrientation.unmarshal(dataStream); + dataStream >> _entityAppearance; - _variableParameters.clear(); - for(size_t idx = 0; idx < _numberOfVariableParameters; idx++) - { - VariableParameter x; - x.unmarshal(dataStream); - _variableParameters.push_back(x); - } + _variableParameters.clear(); + for (size_t idx = 0; idx < _numberOfVariableParameters; idx++) { + VariableParameter x; + x.unmarshal(dataStream); + _variableParameters.push_back(x); + } } +bool EntityStateUpdatePdu::operator==(const EntityStateUpdatePdu& rhs) const { + bool ivarsEqual = true; -bool EntityStateUpdatePdu::operator ==(const EntityStateUpdatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - if( ! (_entityID == rhs._entityID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_entityLinearVelocity == rhs._entityLinearVelocity) ) ivarsEqual = false; - if( ! (_entityLocation == rhs._entityLocation) ) ivarsEqual = false; - if( ! (_entityOrientation == rhs._entityOrientation) ) ivarsEqual = false; - if( ! (_entityAppearance == rhs._entityAppearance) ) ivarsEqual = false; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_entityLinearVelocity == rhs._entityLinearVelocity)) ivarsEqual = false; + if (!(_entityLocation == rhs._entityLocation)) ivarsEqual = false; + if (!(_entityOrientation == rhs._entityOrientation)) ivarsEqual = false; + if (!(_entityAppearance == rhs._entityAppearance)) ivarsEqual = false; - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - if( ! ( _variableParameters[idx] == rhs._variableParameters[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + if (!(_variableParameters[idx] == rhs._variableParameters[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int EntityStateUpdatePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityStateUpdatePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 1; // _numberOfVariableParameters - marshalSize = marshalSize + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity - marshalSize = marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation - marshalSize = marshalSize + _entityOrientation.getMarshalledSize(); // _entityOrientation - marshalSize = marshalSize + 4; // _entityAppearance + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID + marshalSize = marshalSize + 1; // _padding1 + marshalSize = marshalSize + 1; // _numberOfVariableParameters + marshalSize = + marshalSize + + _entityLinearVelocity.getMarshalledSize(); // _entityLinearVelocity + marshalSize = + marshalSize + _entityLocation.getMarshalledSize(); // _entityLocation + marshalSize = marshalSize + + _entityOrientation.getMarshalledSize(); // _entityOrientation + marshalSize = marshalSize + 4; // _entityAppearance - for(unsigned long long idx=0; idx < _variableParameters.size(); idx++) - { - VariableParameter listElement = _variableParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter listElement = _variableParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -222,7 +186,7 @@ int EntityStateUpdatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityStateUpdatePdu.h b/src/dis7/EntityStateUpdatePdu.h index 4e1922e7..9f3b0a27 100644 --- a/src/dis7/EntityStateUpdatePdu.h +++ b/src/dis7/EntityStateUpdatePdu.h @@ -1,99 +1,108 @@ #pragma once +#include + #include -#include -#include +#include #include #include -#include -#include -#include +#include +#include #include +#include +namespace DIS { +// Nonstatic information about a particular entity may be communicated by +// issuing an Entity State Update PDU. Section 7.2.5. COMPLETE -namespace DIS -{ -// Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. Section 7.2.5. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu -{ -protected: - /** This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */ - EntityID _entityID; +class OPENDIS7_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { + protected: + /** This field shall identify the entity issuing the PDU, and shall be + * represented by an Entity Identifier record (see 6.2.28). */ + EntityID _entityID; /** Padding */ - char _padding1; + char _padding1; - /** This field shall specify the number of variable parameters present. This field shall be represented by an 8-bit unsigned integer (see Annex I). */ - unsigned char _numberOfVariableParameters; + /** This field shall specify the number of variable parameters present. This + * field shall be represented by an 8-bit unsigned integer (see Annex I). */ + unsigned char _numberOfVariableParameters; - /** This field shall specify an entity’s linear velocity. The coordinate system for an entity’s linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]). */ - Vector3Float _entityLinearVelocity; + /** This field shall specify an entity’s linear velocity. The coordinate + * system for an entity’s linear velocity depends on the dead reckoning + * algorithm used. This field shall be represented by a Linear Velocity Vector + * record [see 6.2.95 item c)]). */ + Vector3Float _entityLinearVelocity; - /** This field shall specify an entity’s physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97). */ - Vector3Double _entityLocation; + /** This field shall specify an entity’s physical location in the simulated + * world and shall be represented by a World Coordinates record (see 6.2.97). + */ + Vector3Double _entityLocation; - /** This field shall specify an entity’s orientation and shall be represented by an Euler Angles record (see 6.2.33). */ - EulerAngles _entityOrientation; + /** This field shall specify an entity’s orientation and shall be represented + * by an Euler Angles record (see 6.2.33). */ + EulerAngles _entityOrientation; - /** This field shall specify the dynamic changes to the entity’s appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26). */ - unsigned int _entityAppearance; - - /** This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I). */ - std::vector _variableParameters; + /** This field shall specify the dynamic changes to the entity’s appearance + * attributes. This field shall be represented by an Entity Appearance record + * (see 6.2.26). */ + unsigned int _entityAppearance; + /** This field shall specify the parameter values for each Variable Parameter + * record that is included (see 6.2.93 and Annex I). */ + std::vector _variableParameters; public: - EntityStateUpdatePdu(); - virtual ~EntityStateUpdatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + EntityStateUpdatePdu(); + virtual ~EntityStateUpdatePdu(); - EntityID& getEntityID(); - const EntityID& getEntityID() const; - void setEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char getPadding1() const; - void setPadding1(char pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); - unsigned char getNumberOfVariableParameters() const; + char getPadding1() const; + void setPadding1(char pX); - Vector3Float& getEntityLinearVelocity(); - const Vector3Float& getEntityLinearVelocity() const; - void setEntityLinearVelocity(const Vector3Float &pX); + unsigned char getNumberOfVariableParameters() const; - Vector3Double& getEntityLocation(); - const Vector3Double& getEntityLocation() const; - void setEntityLocation(const Vector3Double &pX); + Vector3Float& getEntityLinearVelocity(); + const Vector3Float& getEntityLinearVelocity() const; + void setEntityLinearVelocity(const Vector3Float& pX); - EulerAngles& getEntityOrientation(); - const EulerAngles& getEntityOrientation() const; - void setEntityOrientation(const EulerAngles &pX); + Vector3Double& getEntityLocation(); + const Vector3Double& getEntityLocation() const; + void setEntityLocation(const Vector3Double& pX); - unsigned int getEntityAppearance() const; - void setEntityAppearance(unsigned int pX); + EulerAngles& getEntityOrientation(); + const EulerAngles& getEntityOrientation() const; + void setEntityOrientation(const EulerAngles& pX); - std::vector& getVariableParameters(); - const std::vector& getVariableParameters() const; - void setVariableParameters(const std::vector& pX); + unsigned int getEntityAppearance() const; + void setEntityAppearance(unsigned int pX); + std::vector& getVariableParameters(); + const std::vector& getVariableParameters() const; + void setVariableParameters(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const EntityStateUpdatePdu& rhs) const; + bool operator==(const EntityStateUpdatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -106,7 +115,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityType.cpp b/src/dis7/EntityType.cpp index 905b01fe..379d101f 100644 --- a/src/dis7/EntityType.cpp +++ b/src/dis7/EntityType.cpp @@ -2,149 +2,97 @@ using namespace DIS; +EntityType::EntityType() + : _entityKind(0), + _domain(0), + _country(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0) {} -EntityType::EntityType(): - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0) -{ -} +EntityType::~EntityType() {} -EntityType::~EntityType() -{ -} +unsigned char EntityType::getEntityKind() const { return _entityKind; } -unsigned char EntityType::getEntityKind() const -{ - return _entityKind; -} +void EntityType::setEntityKind(unsigned char pX) { _entityKind = pX; } -void EntityType::setEntityKind(unsigned char pX) -{ - _entityKind = pX; -} +unsigned char EntityType::getDomain() const { return _domain; } -unsigned char EntityType::getDomain() const -{ - return _domain; -} +void EntityType::setDomain(unsigned char pX) { _domain = pX; } -void EntityType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned short EntityType::getCountry() const { return _country; } -unsigned short EntityType::getCountry() const -{ - return _country; -} +void EntityType::setCountry(unsigned short pX) { _country = pX; } -void EntityType::setCountry(unsigned short pX) -{ - _country = pX; -} +unsigned char EntityType::getCategory() const { return _category; } -unsigned char EntityType::getCategory() const -{ - return _category; -} +void EntityType::setCategory(unsigned char pX) { _category = pX; } -void EntityType::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char EntityType::getSubcategory() const { return _subcategory; } -unsigned char EntityType::getSubcategory() const -{ - return _subcategory; -} +void EntityType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void EntityType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +unsigned char EntityType::getSpecific() const { return _specific; } -unsigned char EntityType::getSpecific() const -{ - return _specific; -} +void EntityType::setSpecific(unsigned char pX) { _specific = pX; } -void EntityType::setSpecific(unsigned char pX) -{ - _specific = pX; -} +unsigned char EntityType::getExtra() const { return _extra; } -unsigned char EntityType::getExtra() const -{ - return _extra; -} +void EntityType::setExtra(unsigned char pX) { _extra = pX; } -void EntityType::setExtra(unsigned char pX) -{ - _extra = pX; +void EntityType::marshal(DataStream& dataStream) const { + dataStream << _entityKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; } -void EntityType::marshal(DataStream& dataStream) const -{ - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; +void EntityType::unmarshal(DataStream& dataStream) { + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; } -void EntityType::unmarshal(DataStream& dataStream) -{ - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; +bool EntityType::operator==(const EntityType& rhs) const { + bool ivarsEqual = true; + + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + + return ivarsEqual; } +int EntityType::getMarshalledSize() const { + int marshalSize = 0; -bool EntityType::operator ==(const EntityType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - - return ivarsEqual; - } - -int EntityType::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - return marshalSize; + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +105,7 @@ int EntityType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityType.h b/src/dis7/EntityType.h index 629a210b..33944cdc 100644 --- a/src/dis7/EntityType.h +++ b/src/dis7/EntityType.h @@ -1,81 +1,79 @@ #pragma once -#include #include +#include +namespace DIS { +// Identifies the type of entity, including kind of entity, domain (surface, +// subsurface, air, etc) country, category, etc. Section 6.2.30 -namespace DIS -{ -// Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc. Section 6.2.30 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityType -{ -protected: +class OPENDIS7_EXPORT EntityType { + protected: /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; - - /** specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL. */ - unsigned char _specific; + unsigned char _subcategory; - unsigned char _extra; + /** specific info based on subcategory field. Renamed from specific because + * that is a reserved word in SQL. */ + unsigned char _specific; + unsigned char _extra; public: - EntityType(); - virtual ~EntityType(); + EntityType(); + virtual ~EntityType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityType& rhs) const; + bool operator==(const EntityType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -88,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityTypeVP.cpp b/src/dis7/EntityTypeVP.cpp index 38d0c610..0e375f2a 100644 --- a/src/dis7/EntityTypeVP.cpp +++ b/src/dis7/EntityTypeVP.cpp @@ -2,124 +2,85 @@ using namespace DIS; +EntityTypeVP::EntityTypeVP() + : _recordType(3), + _changeIndicator(0), + _entityType(), + _padding(0), + _padding1(0) {} -EntityTypeVP::EntityTypeVP(): - _recordType(3), - _changeIndicator(0), - _entityType(), - _padding(0), - _padding1(0) -{ -} +EntityTypeVP::~EntityTypeVP() {} -EntityTypeVP::~EntityTypeVP() -{ -} +unsigned char EntityTypeVP::getRecordType() const { return _recordType; } -unsigned char EntityTypeVP::getRecordType() const -{ - return _recordType; -} +void EntityTypeVP::setRecordType(unsigned char pX) { _recordType = pX; } -void EntityTypeVP::setRecordType(unsigned char pX) -{ - _recordType = pX; +unsigned char EntityTypeVP::getChangeIndicator() const { + return _changeIndicator; } -unsigned char EntityTypeVP::getChangeIndicator() const -{ - return _changeIndicator; +void EntityTypeVP::setChangeIndicator(unsigned char pX) { + _changeIndicator = pX; } -void EntityTypeVP::setChangeIndicator(unsigned char pX) -{ - _changeIndicator = pX; -} +EntityType& EntityTypeVP::getEntityType() { return _entityType; } -EntityType& EntityTypeVP::getEntityType() -{ - return _entityType; -} - -const EntityType& EntityTypeVP::getEntityType() const -{ - return _entityType; -} +const EntityType& EntityTypeVP::getEntityType() const { return _entityType; } -void EntityTypeVP::setEntityType(const EntityType &pX) -{ - _entityType = pX; -} +void EntityTypeVP::setEntityType(const EntityType& pX) { _entityType = pX; } -unsigned short EntityTypeVP::getPadding() const -{ - return _padding; -} +unsigned short EntityTypeVP::getPadding() const { return _padding; } -void EntityTypeVP::setPadding(unsigned short pX) -{ - _padding = pX; -} +void EntityTypeVP::setPadding(unsigned short pX) { _padding = pX; } -unsigned int EntityTypeVP::getPadding1() const -{ - return _padding1; -} +unsigned int EntityTypeVP::getPadding1() const { return _padding1; } -void EntityTypeVP::setPadding1(unsigned int pX) -{ - _padding1 = pX; -} +void EntityTypeVP::setPadding1(unsigned int pX) { _padding1 = pX; } -void EntityTypeVP::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _changeIndicator; - _entityType.marshal(dataStream); - dataStream << _padding; - dataStream << _padding1; +void EntityTypeVP::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _changeIndicator; + _entityType.marshal(dataStream); + dataStream << _padding; + dataStream << _padding1; } -void EntityTypeVP::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _changeIndicator; - _entityType.unmarshal(dataStream); - dataStream >> _padding; - dataStream >> _padding1; +void EntityTypeVP::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _changeIndicator; + _entityType.unmarshal(dataStream); + dataStream >> _padding; + dataStream >> _padding1; } +bool EntityTypeVP::operator==(const EntityTypeVP& rhs) const { + bool ivarsEqual = true; -bool EntityTypeVP::operator ==(const EntityTypeVP& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_changeIndicator == rhs._changeIndicator) ) ivarsEqual = false; - if( ! (_entityType == rhs._entityType) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_changeIndicator == rhs._changeIndicator)) ivarsEqual = false; + if (!(_entityType == rhs._entityType)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int EntityTypeVP::getMarshalledSize() const -{ - int marshalSize = 0; +int EntityTypeVP::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _recordType - marshalSize = marshalSize + 1; // _changeIndicator - marshalSize = marshalSize + _entityType.getMarshalledSize(); // _entityType - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + 4; // _padding1 - return marshalSize; + marshalSize = marshalSize + 1; // _recordType + marshalSize = marshalSize + 1; // _changeIndicator + marshalSize = marshalSize + _entityType.getMarshalledSize(); // _entityType + marshalSize = marshalSize + 2; // _padding + marshalSize = marshalSize + 4; // _padding1 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -132,7 +93,7 @@ int EntityTypeVP::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EntityTypeVP.h b/src/dis7/EntityTypeVP.h index 788d4956..ce206e5e 100644 --- a/src/dis7/EntityTypeVP.h +++ b/src/dis7/EntityTypeVP.h @@ -1,72 +1,69 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Association or disassociation of two entities. Section 6.2.93.5 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EntityTypeVP -{ -protected: - /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; +class OPENDIS7_EXPORT EntityTypeVP { + protected: + /** the identification of the Variable Parameter record. Enumeration from EBV + */ + unsigned char _recordType; /** Indicates if this VP has changed since last issuance */ - unsigned char _changeIndicator; + unsigned char _changeIndicator; /** */ - EntityType _entityType; + EntityType _entityType; /** padding */ - unsigned short _padding; + unsigned short _padding; /** padding */ - unsigned int _padding1; - + unsigned int _padding1; public: - EntityTypeVP(); - virtual ~EntityTypeVP(); + EntityTypeVP(); + virtual ~EntityTypeVP(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + unsigned char getRecordType() const; + void setRecordType(unsigned char pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + unsigned char getChangeIndicator() const; + void setChangeIndicator(unsigned char pX); - EntityType& getEntityType(); - const EntityType& getEntityType() const; - void setEntityType(const EntityType &pX); + EntityType& getEntityType(); + const EntityType& getEntityType() const; + void setEntityType(const EntityType& pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + unsigned int getPadding1() const; + void setPadding1(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EntityTypeVP& rhs) const; + bool operator==(const EntityTypeVP& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -79,7 +76,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Environment.cpp b/src/dis7/Environment.cpp index 70d22af1..da9c1e72 100644 --- a/src/dis7/Environment.cpp +++ b/src/dis7/Environment.cpp @@ -2,104 +2,69 @@ using namespace DIS; +Environment::Environment() + : _environmentType(0), _length(0), _index(0), _padding(0) {} -Environment::Environment(): - _environmentType(0), - _length(0), - _index(0), - _padding(0) -{ -} - -Environment::~Environment() -{ -} +Environment::~Environment() {} -unsigned int Environment::getEnvironmentType() const -{ - return _environmentType; +unsigned int Environment::getEnvironmentType() const { + return _environmentType; } -void Environment::setEnvironmentType(unsigned int pX) -{ - _environmentType = pX; -} +void Environment::setEnvironmentType(unsigned int pX) { _environmentType = pX; } -unsigned short Environment::getLength() const -{ - return _length; -} +unsigned short Environment::getLength() const { return _length; } -void Environment::setLength(unsigned short pX) -{ - _length = pX; -} +void Environment::setLength(unsigned short pX) { _length = pX; } -unsigned char Environment::getIndex() const -{ - return _index; -} +unsigned char Environment::getIndex() const { return _index; } -void Environment::setIndex(unsigned char pX) -{ - _index = pX; -} +void Environment::setIndex(unsigned char pX) { _index = pX; } -unsigned char Environment::getPadding() const -{ - return _padding; -} +unsigned char Environment::getPadding() const { return _padding; } -void Environment::setPadding(unsigned char pX) -{ - _padding = pX; -} +void Environment::setPadding(unsigned char pX) { _padding = pX; } -void Environment::marshal(DataStream& dataStream) const -{ - dataStream << _environmentType; - dataStream << _length; - dataStream << _index; - dataStream << _padding; +void Environment::marshal(DataStream& dataStream) const { + dataStream << _environmentType; + dataStream << _length; + dataStream << _index; + dataStream << _padding; } -void Environment::unmarshal(DataStream& dataStream) -{ - dataStream >> _environmentType; - dataStream >> _length; - dataStream >> _index; - dataStream >> _padding; +void Environment::unmarshal(DataStream& dataStream) { + dataStream >> _environmentType; + dataStream >> _length; + dataStream >> _index; + dataStream >> _padding; } +bool Environment::operator==(const Environment& rhs) const { + bool ivarsEqual = true; -bool Environment::operator ==(const Environment& rhs) const - { - bool ivarsEqual = true; - - if( ! (_environmentType == rhs._environmentType) ) ivarsEqual = false; - if( ! (_length == rhs._length) ) ivarsEqual = false; - if( ! (_index == rhs._index) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; + if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; + if (!(_length == rhs._length)) ivarsEqual = false; + if (!(_index == rhs._index)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int Environment::getMarshalledSize() const -{ - int marshalSize = 0; +int Environment::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _environmentType - marshalSize = marshalSize + 2; // _length - marshalSize = marshalSize + 1; // _index - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + 4; // _environmentType + marshalSize = marshalSize + 2; // _length + marshalSize = marshalSize + 1; // _index + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +77,7 @@ int Environment::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Environment.h b/src/dis7/Environment.h index a627daf8..7a63fa48 100644 --- a/src/dis7/Environment.h +++ b/src/dis7/Environment.h @@ -1,64 +1,60 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Incomplete environment record; requires hand coding to fix. Section 6.2.31.1 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Environment -{ -protected: +class OPENDIS7_EXPORT Environment { + protected: /** type */ - unsigned int _environmentType; + unsigned int _environmentType; /** length, in bits, of the record */ - unsigned short _length; + unsigned short _length; /** identifies the sequntially numbered record index */ - unsigned char _index; + unsigned char _index; /** padding */ - unsigned char _padding; - + unsigned char _padding; public: - Environment(); - virtual ~Environment(); + Environment(); + virtual ~Environment(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getEnvironmentType() const; - void setEnvironmentType(unsigned int pX); + unsigned int getEnvironmentType() const; + void setEnvironmentType(unsigned int pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + unsigned short getLength() const; + void setLength(unsigned short pX); - unsigned char getIndex() const; - void setIndex(unsigned char pX); + unsigned char getIndex() const; + void setIndex(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Environment& rhs) const; + bool operator==(const Environment& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +67,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EnvironmentGeneral.cpp b/src/dis7/EnvironmentGeneral.cpp index 6726ad7b..71152712 100644 --- a/src/dis7/EnvironmentGeneral.cpp +++ b/src/dis7/EnvironmentGeneral.cpp @@ -2,134 +2,92 @@ using namespace DIS; +EnvironmentGeneral::EnvironmentGeneral() + : _environmentType(0), + _length(0), + _index(0), + _padding1(0), + _geometry(0), + _padding2(0) {} -EnvironmentGeneral::EnvironmentGeneral(): - _environmentType(0), - _length(0), - _index(0), - _padding1(0), - _geometry(0), - _padding2(0) -{ -} +EnvironmentGeneral::~EnvironmentGeneral() {} -EnvironmentGeneral::~EnvironmentGeneral() -{ +unsigned int EnvironmentGeneral::getEnvironmentType() const { + return _environmentType; } -unsigned int EnvironmentGeneral::getEnvironmentType() const -{ - return _environmentType; +void EnvironmentGeneral::setEnvironmentType(unsigned int pX) { + _environmentType = pX; } -void EnvironmentGeneral::setEnvironmentType(unsigned int pX) -{ - _environmentType = pX; -} +unsigned char EnvironmentGeneral::getLength() const { return _length; } -unsigned char EnvironmentGeneral::getLength() const -{ - return _length; -} +void EnvironmentGeneral::setLength(unsigned char pX) { _length = pX; } -void EnvironmentGeneral::setLength(unsigned char pX) -{ - _length = pX; -} +unsigned char EnvironmentGeneral::getIndex() const { return _index; } -unsigned char EnvironmentGeneral::getIndex() const -{ - return _index; -} +void EnvironmentGeneral::setIndex(unsigned char pX) { _index = pX; } -void EnvironmentGeneral::setIndex(unsigned char pX) -{ - _index = pX; -} +unsigned char EnvironmentGeneral::getPadding1() const { return _padding1; } -unsigned char EnvironmentGeneral::getPadding1() const -{ - return _padding1; -} +void EnvironmentGeneral::setPadding1(unsigned char pX) { _padding1 = pX; } -void EnvironmentGeneral::setPadding1(unsigned char pX) -{ - _padding1 = pX; -} +unsigned char EnvironmentGeneral::getGeometry() const { return _geometry; } -unsigned char EnvironmentGeneral::getGeometry() const -{ - return _geometry; -} +void EnvironmentGeneral::setGeometry(unsigned char pX) { _geometry = pX; } -void EnvironmentGeneral::setGeometry(unsigned char pX) -{ - _geometry = pX; -} +unsigned char EnvironmentGeneral::getPadding2() const { return _padding2; } -unsigned char EnvironmentGeneral::getPadding2() const -{ - return _padding2; -} +void EnvironmentGeneral::setPadding2(unsigned char pX) { _padding2 = pX; } -void EnvironmentGeneral::setPadding2(unsigned char pX) -{ - _padding2 = pX; +void EnvironmentGeneral::marshal(DataStream& dataStream) const { + dataStream << _environmentType; + dataStream << _length; + dataStream << _index; + dataStream << _padding1; + dataStream << _geometry; + dataStream << _padding2; } -void EnvironmentGeneral::marshal(DataStream& dataStream) const -{ - dataStream << _environmentType; - dataStream << _length; - dataStream << _index; - dataStream << _padding1; - dataStream << _geometry; - dataStream << _padding2; +void EnvironmentGeneral::unmarshal(DataStream& dataStream) { + dataStream >> _environmentType; + dataStream >> _length; + dataStream >> _index; + dataStream >> _padding1; + dataStream >> _geometry; + dataStream >> _padding2; } -void EnvironmentGeneral::unmarshal(DataStream& dataStream) -{ - dataStream >> _environmentType; - dataStream >> _length; - dataStream >> _index; - dataStream >> _padding1; - dataStream >> _geometry; - dataStream >> _padding2; -} +bool EnvironmentGeneral::operator==(const EnvironmentGeneral& rhs) const { + bool ivarsEqual = true; + if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; + if (!(_length == rhs._length)) ivarsEqual = false; + if (!(_index == rhs._index)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_geometry == rhs._geometry)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; -bool EnvironmentGeneral::operator ==(const EnvironmentGeneral& rhs) const - { - bool ivarsEqual = true; - - if( ! (_environmentType == rhs._environmentType) ) ivarsEqual = false; - if( ! (_length == rhs._length) ) ivarsEqual = false; - if( ! (_index == rhs._index) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_geometry == rhs._geometry) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EnvironmentGeneral::getMarshalledSize() const -{ - int marshalSize = 0; +int EnvironmentGeneral::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _environmentType - marshalSize = marshalSize + 1; // _length - marshalSize = marshalSize + 1; // _index - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 1; // _geometry - marshalSize = marshalSize + 1; // _padding2 - return marshalSize; + marshalSize = marshalSize + 4; // _environmentType + marshalSize = marshalSize + 1; // _length + marshalSize = marshalSize + 1; // _index + marshalSize = marshalSize + 1; // _padding1 + marshalSize = marshalSize + 1; // _geometry + marshalSize = marshalSize + 1; // _padding2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +100,7 @@ int EnvironmentGeneral::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EnvironmentGeneral.h b/src/dis7/EnvironmentGeneral.h index e4883df5..8ea1cd5e 100644 --- a/src/dis7/EnvironmentGeneral.h +++ b/src/dis7/EnvironmentGeneral.h @@ -1,76 +1,74 @@ #pragma once -#include #include +#include +namespace DIS { +// Information about a geometry, a state associated with a geometry, a bounding +// volume, or an associated entity ID. NOTE: this class requires hand +// coding. 6.2.31 -namespace DIS -{ -// Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. NOTE: this class requires hand coding. 6.2.31 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EnvironmentGeneral -{ -protected: +class OPENDIS7_EXPORT EnvironmentGeneral { + protected: /** Record type */ - unsigned int _environmentType; + unsigned int _environmentType; /** length, in bits */ - unsigned char _length; + unsigned char _length; /** Identify the sequentially numbered record index */ - unsigned char _index; + unsigned char _index; /** padding */ - unsigned char _padding1; + unsigned char _padding1; /** Geometry or state record */ - unsigned char _geometry; + unsigned char _geometry; /** padding to bring the total size up to a 64 bit boundry */ - unsigned char _padding2; - + unsigned char _padding2; public: - EnvironmentGeneral(); - virtual ~EnvironmentGeneral(); + EnvironmentGeneral(); + virtual ~EnvironmentGeneral(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getEnvironmentType() const; - void setEnvironmentType(unsigned int pX); + unsigned int getEnvironmentType() const; + void setEnvironmentType(unsigned int pX); - unsigned char getLength() const; - void setLength(unsigned char pX); + unsigned char getLength() const; + void setLength(unsigned char pX); - unsigned char getIndex() const; - void setIndex(unsigned char pX); + unsigned char getIndex() const; + void setIndex(unsigned char pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + unsigned char getPadding1() const; + void setPadding1(unsigned char pX); - unsigned char getGeometry() const; - void setGeometry(unsigned char pX); + unsigned char getGeometry() const; + void setGeometry(unsigned char pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + unsigned char getPadding2() const; + void setPadding2(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EnvironmentGeneral& rhs) const; + bool operator==(const EnvironmentGeneral& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +81,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EnvironmentType.cpp b/src/dis7/EnvironmentType.cpp index f5a1e3ab..80730c62 100644 --- a/src/dis7/EnvironmentType.cpp +++ b/src/dis7/EnvironmentType.cpp @@ -2,149 +2,97 @@ using namespace DIS; +EnvironmentType::EnvironmentType() + : _entityKind(0), + _domain(0), + _entityClass(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0) {} -EnvironmentType::EnvironmentType(): - _entityKind(0), - _domain(0), - _entityClass(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0) -{ -} +EnvironmentType::~EnvironmentType() {} -EnvironmentType::~EnvironmentType() -{ -} +unsigned char EnvironmentType::getEntityKind() const { return _entityKind; } -unsigned char EnvironmentType::getEntityKind() const -{ - return _entityKind; -} +void EnvironmentType::setEntityKind(unsigned char pX) { _entityKind = pX; } -void EnvironmentType::setEntityKind(unsigned char pX) -{ - _entityKind = pX; -} +unsigned char EnvironmentType::getDomain() const { return _domain; } -unsigned char EnvironmentType::getDomain() const -{ - return _domain; -} +void EnvironmentType::setDomain(unsigned char pX) { _domain = pX; } -void EnvironmentType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned short EnvironmentType::getEntityClass() const { return _entityClass; } -unsigned short EnvironmentType::getEntityClass() const -{ - return _entityClass; -} +void EnvironmentType::setEntityClass(unsigned short pX) { _entityClass = pX; } -void EnvironmentType::setEntityClass(unsigned short pX) -{ - _entityClass = pX; -} +unsigned char EnvironmentType::getCategory() const { return _category; } -unsigned char EnvironmentType::getCategory() const -{ - return _category; -} +void EnvironmentType::setCategory(unsigned char pX) { _category = pX; } -void EnvironmentType::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char EnvironmentType::getSubcategory() const { return _subcategory; } -unsigned char EnvironmentType::getSubcategory() const -{ - return _subcategory; -} +void EnvironmentType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void EnvironmentType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +unsigned char EnvironmentType::getSpecific() const { return _specific; } -unsigned char EnvironmentType::getSpecific() const -{ - return _specific; -} +void EnvironmentType::setSpecific(unsigned char pX) { _specific = pX; } -void EnvironmentType::setSpecific(unsigned char pX) -{ - _specific = pX; -} +unsigned char EnvironmentType::getExtra() const { return _extra; } -unsigned char EnvironmentType::getExtra() const -{ - return _extra; -} +void EnvironmentType::setExtra(unsigned char pX) { _extra = pX; } -void EnvironmentType::setExtra(unsigned char pX) -{ - _extra = pX; +void EnvironmentType::marshal(DataStream& dataStream) const { + dataStream << _entityKind; + dataStream << _domain; + dataStream << _entityClass; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; } -void EnvironmentType::marshal(DataStream& dataStream) const -{ - dataStream << _entityKind; - dataStream << _domain; - dataStream << _entityClass; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; +void EnvironmentType::unmarshal(DataStream& dataStream) { + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _entityClass; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; } -void EnvironmentType::unmarshal(DataStream& dataStream) -{ - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _entityClass; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; +bool EnvironmentType::operator==(const EnvironmentType& rhs) const { + bool ivarsEqual = true; + + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_entityClass == rhs._entityClass)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + + return ivarsEqual; } +int EnvironmentType::getMarshalledSize() const { + int marshalSize = 0; -bool EnvironmentType::operator ==(const EnvironmentType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_entityClass == rhs._entityClass) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - - return ivarsEqual; - } - -int EnvironmentType::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _entityClass - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - return marshalSize; + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _entityClass + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +105,7 @@ int EnvironmentType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EnvironmentType.h b/src/dis7/EnvironmentType.h index 20fc452a..4c3fdabd 100644 --- a/src/dis7/EnvironmentType.h +++ b/src/dis7/EnvironmentType.h @@ -1,81 +1,78 @@ #pragma once -#include #include +#include +namespace DIS { +// Description of environmental data in environmental process and gridded data +// PDUs. Section 6.2.32 -namespace DIS -{ -// Description of environmental data in environmental process and gridded data PDUs. Section 6.2.32 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EnvironmentType -{ -protected: +class OPENDIS7_EXPORT EnvironmentType { + protected: /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** class of environmental entity */ - unsigned short _entityClass; + unsigned short _entityClass; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; + unsigned char _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; - - unsigned char _extra; + unsigned char _specific; + unsigned char _extra; public: - EnvironmentType(); - virtual ~EnvironmentType(); + EnvironmentType(); + virtual ~EnvironmentType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getEntityClass() const; - void setEntityClass(unsigned short pX); + unsigned short getEntityClass() const; + void setEntityClass(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EnvironmentType& rhs) const; + bool operator==(const EnvironmentType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -88,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EulerAngles.cpp b/src/dis7/EulerAngles.cpp index 37713757..fdaece9e 100644 --- a/src/dis7/EulerAngles.cpp +++ b/src/dis7/EulerAngles.cpp @@ -2,89 +2,58 @@ using namespace DIS; +EulerAngles::EulerAngles() : _psi(0.0), _theta(0.0), _phi(0.0) {} -EulerAngles::EulerAngles(): - _psi(0.0), - _theta(0.0), - _phi(0.0) -{ -} +EulerAngles::~EulerAngles() {} -EulerAngles::~EulerAngles() -{ -} +float EulerAngles::getPsi() const { return _psi; } -float EulerAngles::getPsi() const -{ - return _psi; -} +void EulerAngles::setPsi(float pX) { _psi = pX; } -void EulerAngles::setPsi(float pX) -{ - _psi = pX; -} +float EulerAngles::getTheta() const { return _theta; } -float EulerAngles::getTheta() const -{ - return _theta; -} +void EulerAngles::setTheta(float pX) { _theta = pX; } -void EulerAngles::setTheta(float pX) -{ - _theta = pX; -} +float EulerAngles::getPhi() const { return _phi; } -float EulerAngles::getPhi() const -{ - return _phi; -} - -void EulerAngles::setPhi(float pX) -{ - _phi = pX; -} +void EulerAngles::setPhi(float pX) { _phi = pX; } -void EulerAngles::marshal(DataStream& dataStream) const -{ - dataStream << _psi; - dataStream << _theta; - dataStream << _phi; +void EulerAngles::marshal(DataStream& dataStream) const { + dataStream << _psi; + dataStream << _theta; + dataStream << _phi; } -void EulerAngles::unmarshal(DataStream& dataStream) -{ - dataStream >> _psi; - dataStream >> _theta; - dataStream >> _phi; +void EulerAngles::unmarshal(DataStream& dataStream) { + dataStream >> _psi; + dataStream >> _theta; + dataStream >> _phi; } +bool EulerAngles::operator==(const EulerAngles& rhs) const { + bool ivarsEqual = true; -bool EulerAngles::operator ==(const EulerAngles& rhs) const - { - bool ivarsEqual = true; + if (!(_psi == rhs._psi)) ivarsEqual = false; + if (!(_theta == rhs._theta)) ivarsEqual = false; + if (!(_phi == rhs._phi)) ivarsEqual = false; - if( ! (_psi == rhs._psi) ) ivarsEqual = false; - if( ! (_theta == rhs._theta) ) ivarsEqual = false; - if( ! (_phi == rhs._phi) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EulerAngles::getMarshalledSize() const -{ - int marshalSize = 0; +int EulerAngles::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _psi - marshalSize = marshalSize + 4; // _theta - marshalSize = marshalSize + 4; // _phi - return marshalSize; + marshalSize = marshalSize + 4; // _psi + marshalSize = marshalSize + 4; // _theta + marshalSize = marshalSize + 4; // _phi + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int EulerAngles::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EulerAngles.h b/src/dis7/EulerAngles.h index c57a835e..362433d3 100644 --- a/src/dis7/EulerAngles.h +++ b/src/dis7/EulerAngles.h @@ -1,55 +1,52 @@ #pragma once -#include #include +#include +namespace DIS { +// Three floating point values representing an orientation, psi, theta, and phi, +// aka the euler angles, in radians. Section 6.2.33 -namespace DIS -{ -// Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians. Section 6.2.33 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EulerAngles -{ -protected: - float _psi; - - float _theta; +class OPENDIS7_EXPORT EulerAngles { + protected: + float _psi; - float _phi; + float _theta; + float _phi; public: - EulerAngles(); - virtual ~EulerAngles(); + EulerAngles(); + virtual ~EulerAngles(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getPsi() const; - void setPsi(float pX); + float getPsi() const; + void setPsi(float pX); - float getTheta() const; - void setTheta(float pX); + float getTheta() const; + void setTheta(float pX); - float getPhi() const; - void setPhi(float pX); + float getPhi() const; + void setPhi(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EulerAngles& rhs) const; + bool operator==(const EulerAngles& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -62,7 +59,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventIdentifier.cpp b/src/dis7/EventIdentifier.cpp index ba807175..ece06cd4 100644 --- a/src/dis7/EventIdentifier.cpp +++ b/src/dis7/EventIdentifier.cpp @@ -2,79 +2,59 @@ using namespace DIS; +EventIdentifier::EventIdentifier() : _simulationAddress(), _eventNumber(0) {} -EventIdentifier::EventIdentifier(): - _simulationAddress(), - _eventNumber(0) -{ -} +EventIdentifier::~EventIdentifier() {} -EventIdentifier::~EventIdentifier() -{ +SimulationAddress& EventIdentifier::getSimulationAddress() { + return _simulationAddress; } -SimulationAddress& EventIdentifier::getSimulationAddress() -{ - return _simulationAddress; +const SimulationAddress& EventIdentifier::getSimulationAddress() const { + return _simulationAddress; } -const SimulationAddress& EventIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +void EventIdentifier::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -void EventIdentifier::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; -} +unsigned short EventIdentifier::getEventNumber() const { return _eventNumber; } -unsigned short EventIdentifier::getEventNumber() const -{ - return _eventNumber; -} +void EventIdentifier::setEventNumber(unsigned short pX) { _eventNumber = pX; } -void EventIdentifier::setEventNumber(unsigned short pX) -{ - _eventNumber = pX; +void EventIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _eventNumber; } -void EventIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _eventNumber; +void EventIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _eventNumber; } -void EventIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _eventNumber; -} +bool EventIdentifier::operator==(const EventIdentifier& rhs) const { + bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_eventNumber == rhs._eventNumber)) ivarsEqual = false; -bool EventIdentifier::operator ==(const EventIdentifier& rhs) const - { - bool ivarsEqual = true; - - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_eventNumber == rhs._eventNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EventIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int EventIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _eventNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _eventNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +67,7 @@ int EventIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventIdentifier.h b/src/dis7/EventIdentifier.h index 852d354f..52db134a 100644 --- a/src/dis7/EventIdentifier.h +++ b/src/dis7/EventIdentifier.h @@ -1,53 +1,50 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Identifies an event in the world. Use this format for every PDU EXCEPT the +// LiveEntityPdu. Section 6.2.34. -namespace DIS -{ -// Identifies an event in the world. Use this format for every PDU EXCEPT the LiveEntityPdu. Section 6.2.34. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EventIdentifier -{ -protected: +class OPENDIS7_EXPORT EventIdentifier { + protected: /** Site and application IDs */ - SimulationAddress _simulationAddress; - - unsigned short _eventNumber; + SimulationAddress _simulationAddress; + unsigned short _eventNumber; public: - EventIdentifier(); - virtual ~EventIdentifier(); + EventIdentifier(); + virtual ~EventIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getEventNumber() const; - void setEventNumber(unsigned short pX); + unsigned short getEventNumber() const; + void setEventNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EventIdentifier& rhs) const; + bool operator==(const EventIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -60,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventIdentifierLiveEntity.cpp b/src/dis7/EventIdentifierLiveEntity.cpp index b894d3c7..aeed043d 100644 --- a/src/dis7/EventIdentifierLiveEntity.cpp +++ b/src/dis7/EventIdentifierLiveEntity.cpp @@ -2,89 +2,72 @@ using namespace DIS; +EventIdentifierLiveEntity::EventIdentifierLiveEntity() + : _siteNumber(0), _applicationNumber(0), _eventNumber(0) {} -EventIdentifierLiveEntity::EventIdentifierLiveEntity(): - _siteNumber(0), - _applicationNumber(0), - _eventNumber(0) -{ -} - -EventIdentifierLiveEntity::~EventIdentifierLiveEntity() -{ -} +EventIdentifierLiveEntity::~EventIdentifierLiveEntity() {} -unsigned char EventIdentifierLiveEntity::getSiteNumber() const -{ - return _siteNumber; +unsigned char EventIdentifierLiveEntity::getSiteNumber() const { + return _siteNumber; } -void EventIdentifierLiveEntity::setSiteNumber(unsigned char pX) -{ - _siteNumber = pX; +void EventIdentifierLiveEntity::setSiteNumber(unsigned char pX) { + _siteNumber = pX; } -unsigned char EventIdentifierLiveEntity::getApplicationNumber() const -{ - return _applicationNumber; +unsigned char EventIdentifierLiveEntity::getApplicationNumber() const { + return _applicationNumber; } -void EventIdentifierLiveEntity::setApplicationNumber(unsigned char pX) -{ - _applicationNumber = pX; +void EventIdentifierLiveEntity::setApplicationNumber(unsigned char pX) { + _applicationNumber = pX; } -unsigned short EventIdentifierLiveEntity::getEventNumber() const -{ - return _eventNumber; +unsigned short EventIdentifierLiveEntity::getEventNumber() const { + return _eventNumber; } -void EventIdentifierLiveEntity::setEventNumber(unsigned short pX) -{ - _eventNumber = pX; +void EventIdentifierLiveEntity::setEventNumber(unsigned short pX) { + _eventNumber = pX; } -void EventIdentifierLiveEntity::marshal(DataStream& dataStream) const -{ - dataStream << _siteNumber; - dataStream << _applicationNumber; - dataStream << _eventNumber; +void EventIdentifierLiveEntity::marshal(DataStream& dataStream) const { + dataStream << _siteNumber; + dataStream << _applicationNumber; + dataStream << _eventNumber; } -void EventIdentifierLiveEntity::unmarshal(DataStream& dataStream) -{ - dataStream >> _siteNumber; - dataStream >> _applicationNumber; - dataStream >> _eventNumber; +void EventIdentifierLiveEntity::unmarshal(DataStream& dataStream) { + dataStream >> _siteNumber; + dataStream >> _applicationNumber; + dataStream >> _eventNumber; } +bool EventIdentifierLiveEntity::operator==( + const EventIdentifierLiveEntity& rhs) const { + bool ivarsEqual = true; -bool EventIdentifierLiveEntity::operator ==(const EventIdentifierLiveEntity& rhs) const - { - bool ivarsEqual = true; + if (!(_siteNumber == rhs._siteNumber)) ivarsEqual = false; + if (!(_applicationNumber == rhs._applicationNumber)) ivarsEqual = false; + if (!(_eventNumber == rhs._eventNumber)) ivarsEqual = false; - if( ! (_siteNumber == rhs._siteNumber) ) ivarsEqual = false; - if( ! (_applicationNumber == rhs._applicationNumber) ) ivarsEqual = false; - if( ! (_eventNumber == rhs._eventNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int EventIdentifierLiveEntity::getMarshalledSize() const -{ - int marshalSize = 0; +int EventIdentifierLiveEntity::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _siteNumber - marshalSize = marshalSize + 1; // _applicationNumber - marshalSize = marshalSize + 2; // _eventNumber - return marshalSize; + marshalSize = marshalSize + 1; // _siteNumber + marshalSize = marshalSize + 1; // _applicationNumber + marshalSize = marshalSize + 2; // _eventNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +80,7 @@ int EventIdentifierLiveEntity::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventIdentifierLiveEntity.h b/src/dis7/EventIdentifierLiveEntity.h index e7528b29..804f456c 100644 --- a/src/dis7/EventIdentifierLiveEntity.h +++ b/src/dis7/EventIdentifierLiveEntity.h @@ -1,55 +1,52 @@ #pragma once -#include #include +#include +namespace DIS { +// Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. +// Section 6.2.34. -namespace DIS -{ -// Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. Section 6.2.34. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EventIdentifierLiveEntity -{ -protected: - unsigned char _siteNumber; - - unsigned char _applicationNumber; +class OPENDIS7_EXPORT EventIdentifierLiveEntity { + protected: + unsigned char _siteNumber; - unsigned short _eventNumber; + unsigned char _applicationNumber; + unsigned short _eventNumber; public: - EventIdentifierLiveEntity(); - virtual ~EventIdentifierLiveEntity(); + EventIdentifierLiveEntity(); + virtual ~EventIdentifierLiveEntity(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getSiteNumber() const; - void setSiteNumber(unsigned char pX); + unsigned char getSiteNumber() const; + void setSiteNumber(unsigned char pX); - unsigned char getApplicationNumber() const; - void setApplicationNumber(unsigned char pX); + unsigned char getApplicationNumber() const; + void setApplicationNumber(unsigned char pX); - unsigned short getEventNumber() const; - void setEventNumber(unsigned short pX); + unsigned short getEventNumber() const; + void setEventNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EventIdentifierLiveEntity& rhs) const; + bool operator==(const EventIdentifierLiveEntity& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -62,7 +59,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventReportPdu.cpp b/src/dis7/EventReportPdu.cpp index 82befb02..d1c08627 100644 --- a/src/dis7/EventReportPdu.cpp +++ b/src/dis7/EventReportPdu.cpp @@ -2,186 +2,148 @@ using namespace DIS; - -EventReportPdu::EventReportPdu() : SimulationManagementFamilyPdu(), - _eventType(0), - _padding1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 21 ); +EventReportPdu::EventReportPdu() + : SimulationManagementFamilyPdu(), + _eventType(0), + _padding1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(21); } -EventReportPdu::~EventReportPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +EventReportPdu::~EventReportPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int EventReportPdu::getEventType() const -{ - return _eventType; -} +unsigned int EventReportPdu::getEventType() const { return _eventType; } -void EventReportPdu::setEventType(unsigned int pX) -{ - _eventType = pX; -} +void EventReportPdu::setEventType(unsigned int pX) { _eventType = pX; } -unsigned int EventReportPdu::getPadding1() const -{ - return _padding1; -} +unsigned int EventReportPdu::getPadding1() const { return _padding1; } -void EventReportPdu::setPadding1(unsigned int pX) -{ - _padding1 = pX; -} +void EventReportPdu::setPadding1(unsigned int pX) { _padding1 = pX; } -unsigned int EventReportPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int EventReportPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int EventReportPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int EventReportPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& EventReportPdu::getFixedDatums() -{ - return _fixedDatums; +std::vector& EventReportPdu::getFixedDatums() { + return _fixedDatums; } -const std::vector& EventReportPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& EventReportPdu::getFixedDatums() const { + return _fixedDatums; } -void EventReportPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void EventReportPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& EventReportPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& EventReportPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& EventReportPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& EventReportPdu::getVariableDatums() const { + return _variableDatums; } -void EventReportPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void EventReportPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void EventReportPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _eventType; - dataStream << _padding1; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void EventReportPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _eventType; + dataStream << _padding1; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void EventReportPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _eventType; - dataStream >> _padding1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void EventReportPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _eventType; + dataStream >> _padding1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool EventReportPdu::operator ==(const EventReportPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_eventType == rhs._eventType) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool EventReportPdu::operator==(const EventReportPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_eventType == rhs._eventType)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int EventReportPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _eventType - marshalSize = marshalSize + 4; // _padding1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int EventReportPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _eventType + marshalSize = marshalSize + 4; // _padding1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +156,7 @@ int EventReportPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventReportPdu.h b/src/dis7/EventReportPdu.h index ccbca353..dc99239a 100644 --- a/src/dis7/EventReportPdu.h +++ b/src/dis7/EventReportPdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Reports occurance of a significant event to the simulation manager. +// Section 7.5.12. COMPLETE -namespace DIS -{ -// Reports occurance of a significant event to the simulation manager. Section 7.5.12. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EventReportPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT EventReportPdu : public SimulationManagementFamilyPdu { + protected: /** Type of event */ - unsigned int _eventType; + unsigned int _eventType; /** padding */ - unsigned int _padding1; + unsigned int _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - EventReportPdu(); - virtual ~EventReportPdu(); + EventReportPdu(); + virtual ~EventReportPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getEventType() const; - void setEventType(unsigned int pX); + unsigned int getEventType() const; + void setEventType(unsigned int pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + unsigned int getPadding1() const; + void setPadding1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EventReportPdu& rhs) const; + bool operator==(const EventReportPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventReportReliablePdu.cpp b/src/dis7/EventReportReliablePdu.cpp index d637db8c..7b5c09ed 100644 --- a/src/dis7/EventReportReliablePdu.cpp +++ b/src/dis7/EventReportReliablePdu.cpp @@ -2,186 +2,160 @@ using namespace DIS; - -EventReportReliablePdu::EventReportReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _eventType(0), - _pad1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 61 ); +EventReportReliablePdu::EventReportReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _eventType(0), + _pad1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(61); } -EventReportReliablePdu::~EventReportReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +EventReportReliablePdu::~EventReportReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned short EventReportReliablePdu::getEventType() const -{ - return _eventType; +unsigned short EventReportReliablePdu::getEventType() const { + return _eventType; } -void EventReportReliablePdu::setEventType(unsigned short pX) -{ - _eventType = pX; +void EventReportReliablePdu::setEventType(unsigned short pX) { + _eventType = pX; } -unsigned int EventReportReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned int EventReportReliablePdu::getPad1() const { return _pad1; } -void EventReportReliablePdu::setPad1(unsigned int pX) -{ - _pad1 = pX; -} +void EventReportReliablePdu::setPad1(unsigned int pX) { _pad1 = pX; } -unsigned int EventReportReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int EventReportReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int EventReportReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int EventReportReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& EventReportReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& EventReportReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& EventReportReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& EventReportReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void EventReportReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void EventReportReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& EventReportReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& EventReportReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& EventReportReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& +EventReportReliablePdu::getVariableDatumRecords() const { + return _variableDatumRecords; } -void EventReportReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void EventReportReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void EventReportReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _eventType; - dataStream << _pad1; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } - +void EventReportReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _eventType; + dataStream << _pad1; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void EventReportReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _eventType; - dataStream >> _pad1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void EventReportReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _eventType; + dataStream >> _pad1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool EventReportReliablePdu::operator==( + const EventReportReliablePdu& rhs) const { + bool ivarsEqual = true; -bool EventReportReliablePdu::operator ==(const EventReportReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_eventType == rhs._eventType)) ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; - if( ! (_eventType == rhs._eventType) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int EventReportReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _eventType - marshalSize = marshalSize + 4; // _pad1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int EventReportReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _eventType + marshalSize = marshalSize + 4; // _pad1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +168,7 @@ int EventReportReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/EventReportReliablePdu.h b/src/dis7/EventReportReliablePdu.h index 43c632a9..1b39dda9 100644 --- a/src/dis7/EventReportReliablePdu.h +++ b/src/dis7/EventReportReliablePdu.h @@ -1,80 +1,80 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.11: reports the occurance of a significatnt event to the +// simulation manager. Needs manual intervention to fix padding in variable +// datums. UNFINISHED. -namespace DIS -{ -// Section 5.3.12.11: reports the occurance of a significatnt event to the simulation manager. Needs manual intervention to fix padding in variable datums. UNFINISHED. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT EventReportReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT EventReportReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** Event type */ - unsigned short _eventType; + unsigned short _eventType; /** padding */ - unsigned int _pad1; + unsigned int _pad1; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - EventReportReliablePdu(); - virtual ~EventReportReliablePdu(); + EventReportReliablePdu(); + virtual ~EventReportReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + unsigned short getEventType() const; + void setEventType(unsigned short pX); - unsigned int getPad1() const; - void setPad1(unsigned int pX); + unsigned int getPad1() const; + void setPad1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const EventReportReliablePdu& rhs) const; + bool operator==(const EventReportReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +87,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Expendable.cpp b/src/dis7/Expendable.cpp index 015008c5..1c45c867 100644 --- a/src/dis7/Expendable.cpp +++ b/src/dis7/Expendable.cpp @@ -2,124 +2,85 @@ using namespace DIS; +Expendable::Expendable() + : _expendable(), + _station(0), + _quantity(0), + _expendableStatus(0), + _padding(0) {} -Expendable::Expendable(): - _expendable(), - _station(0), - _quantity(0), - _expendableStatus(0), - _padding(0) -{ -} +Expendable::~Expendable() {} -Expendable::~Expendable() -{ -} +EntityType& Expendable::getExpendable() { return _expendable; } -EntityType& Expendable::getExpendable() -{ - return _expendable; -} +const EntityType& Expendable::getExpendable() const { return _expendable; } -const EntityType& Expendable::getExpendable() const -{ - return _expendable; -} +void Expendable::setExpendable(const EntityType& pX) { _expendable = pX; } -void Expendable::setExpendable(const EntityType &pX) -{ - _expendable = pX; -} - -unsigned int Expendable::getStation() const -{ - return _station; -} +unsigned int Expendable::getStation() const { return _station; } -void Expendable::setStation(unsigned int pX) -{ - _station = pX; -} +void Expendable::setStation(unsigned int pX) { _station = pX; } -unsigned short Expendable::getQuantity() const -{ - return _quantity; -} +unsigned short Expendable::getQuantity() const { return _quantity; } -void Expendable::setQuantity(unsigned short pX) -{ - _quantity = pX; -} +void Expendable::setQuantity(unsigned short pX) { _quantity = pX; } -unsigned char Expendable::getExpendableStatus() const -{ - return _expendableStatus; +unsigned char Expendable::getExpendableStatus() const { + return _expendableStatus; } -void Expendable::setExpendableStatus(unsigned char pX) -{ - _expendableStatus = pX; +void Expendable::setExpendableStatus(unsigned char pX) { + _expendableStatus = pX; } -unsigned char Expendable::getPadding() const -{ - return _padding; -} +unsigned char Expendable::getPadding() const { return _padding; } -void Expendable::setPadding(unsigned char pX) -{ - _padding = pX; -} +void Expendable::setPadding(unsigned char pX) { _padding = pX; } -void Expendable::marshal(DataStream& dataStream) const -{ - _expendable.marshal(dataStream); - dataStream << _station; - dataStream << _quantity; - dataStream << _expendableStatus; - dataStream << _padding; +void Expendable::marshal(DataStream& dataStream) const { + _expendable.marshal(dataStream); + dataStream << _station; + dataStream << _quantity; + dataStream << _expendableStatus; + dataStream << _padding; } -void Expendable::unmarshal(DataStream& dataStream) -{ - _expendable.unmarshal(dataStream); - dataStream >> _station; - dataStream >> _quantity; - dataStream >> _expendableStatus; - dataStream >> _padding; +void Expendable::unmarshal(DataStream& dataStream) { + _expendable.unmarshal(dataStream); + dataStream >> _station; + dataStream >> _quantity; + dataStream >> _expendableStatus; + dataStream >> _padding; } +bool Expendable::operator==(const Expendable& rhs) const { + bool ivarsEqual = true; -bool Expendable::operator ==(const Expendable& rhs) const - { - bool ivarsEqual = true; - - if( ! (_expendable == rhs._expendable) ) ivarsEqual = false; - if( ! (_station == rhs._station) ) ivarsEqual = false; - if( ! (_quantity == rhs._quantity) ) ivarsEqual = false; - if( ! (_expendableStatus == rhs._expendableStatus) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; + if (!(_expendable == rhs._expendable)) ivarsEqual = false; + if (!(_station == rhs._station)) ivarsEqual = false; + if (!(_quantity == rhs._quantity)) ivarsEqual = false; + if (!(_expendableStatus == rhs._expendableStatus)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int Expendable::getMarshalledSize() const -{ - int marshalSize = 0; +int Expendable::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _expendable.getMarshalledSize(); // _expendable - marshalSize = marshalSize + 4; // _station - marshalSize = marshalSize + 2; // _quantity - marshalSize = marshalSize + 1; // _expendableStatus - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + _expendable.getMarshalledSize(); // _expendable + marshalSize = marshalSize + 4; // _station + marshalSize = marshalSize + 2; // _quantity + marshalSize = marshalSize + 1; // _expendableStatus + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -132,7 +93,7 @@ int Expendable::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Expendable.h b/src/dis7/Expendable.h index 9500aab2..0bc76748 100644 --- a/src/dis7/Expendable.h +++ b/src/dis7/Expendable.h @@ -1,68 +1,64 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // An entity's expendable (chaff, flares, etc) information. Section 6.2.36 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Expendable -{ -protected: +class OPENDIS7_EXPORT Expendable { + protected: /** Type of expendable */ - EntityType _expendable; - - unsigned int _station; + EntityType _expendable; - unsigned short _quantity; + unsigned int _station; - unsigned char _expendableStatus; + unsigned short _quantity; - unsigned char _padding; + unsigned char _expendableStatus; + unsigned char _padding; public: - Expendable(); - virtual ~Expendable(); + Expendable(); + virtual ~Expendable(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getExpendable(); - const EntityType& getExpendable() const; - void setExpendable(const EntityType &pX); + EntityType& getExpendable(); + const EntityType& getExpendable() const; + void setExpendable(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + unsigned int getStation() const; + void setStation(unsigned int pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + unsigned short getQuantity() const; + void setQuantity(unsigned short pX); - unsigned char getExpendableStatus() const; - void setExpendableStatus(unsigned char pX); + unsigned char getExpendableStatus() const; + void setExpendableStatus(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Expendable& rhs) const; + bool operator==(const Expendable& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -75,7 +71,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ExpendableDescriptor.cpp b/src/dis7/ExpendableDescriptor.cpp index 5b1016fe..ec272ad9 100644 --- a/src/dis7/ExpendableDescriptor.cpp +++ b/src/dis7/ExpendableDescriptor.cpp @@ -2,79 +2,59 @@ using namespace DIS; +ExpendableDescriptor::ExpendableDescriptor() : _expendableType(), _padding(0) {} -ExpendableDescriptor::ExpendableDescriptor(): - _expendableType(), - _padding(0) -{ -} +ExpendableDescriptor::~ExpendableDescriptor() {} -ExpendableDescriptor::~ExpendableDescriptor() -{ +EntityType& ExpendableDescriptor::getExpendableType() { + return _expendableType; } -EntityType& ExpendableDescriptor::getExpendableType() -{ - return _expendableType; +const EntityType& ExpendableDescriptor::getExpendableType() const { + return _expendableType; } -const EntityType& ExpendableDescriptor::getExpendableType() const -{ - return _expendableType; +void ExpendableDescriptor::setExpendableType(const EntityType& pX) { + _expendableType = pX; } -void ExpendableDescriptor::setExpendableType(const EntityType &pX) -{ - _expendableType = pX; -} +long long ExpendableDescriptor::getPadding() const { return _padding; } -long long ExpendableDescriptor::getPadding() const -{ - return _padding; -} +void ExpendableDescriptor::setPadding(long long pX) { _padding = pX; } -void ExpendableDescriptor::setPadding(long long pX) -{ - _padding = pX; +void ExpendableDescriptor::marshal(DataStream& dataStream) const { + _expendableType.marshal(dataStream); + dataStream << _padding; } -void ExpendableDescriptor::marshal(DataStream& dataStream) const -{ - _expendableType.marshal(dataStream); - dataStream << _padding; +void ExpendableDescriptor::unmarshal(DataStream& dataStream) { + _expendableType.unmarshal(dataStream); + dataStream >> _padding; } -void ExpendableDescriptor::unmarshal(DataStream& dataStream) -{ - _expendableType.unmarshal(dataStream); - dataStream >> _padding; -} +bool ExpendableDescriptor::operator==(const ExpendableDescriptor& rhs) const { + bool ivarsEqual = true; + if (!(_expendableType == rhs._expendableType)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; -bool ExpendableDescriptor::operator ==(const ExpendableDescriptor& rhs) const - { - bool ivarsEqual = true; - - if( ! (_expendableType == rhs._expendableType) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ExpendableDescriptor::getMarshalledSize() const -{ - int marshalSize = 0; +int ExpendableDescriptor::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _expendableType.getMarshalledSize(); // _expendableType - marshalSize = marshalSize + 8; // _padding - return marshalSize; + marshalSize = + marshalSize + _expendableType.getMarshalledSize(); // _expendableType + marshalSize = marshalSize + 8; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +67,7 @@ int ExpendableDescriptor::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ExpendableDescriptor.h b/src/dis7/ExpendableDescriptor.h index 33673309..78551362 100644 --- a/src/dis7/ExpendableDescriptor.h +++ b/src/dis7/ExpendableDescriptor.h @@ -1,54 +1,50 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Burst of chaff or expendible device. Section 6.2.20.4 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ExpendableDescriptor -{ -protected: +class OPENDIS7_EXPORT ExpendableDescriptor { + protected: /** Type of the object that exploded */ - EntityType _expendableType; + EntityType _expendableType; /** Padding */ long long _padding; - public: - ExpendableDescriptor(); - virtual ~ExpendableDescriptor(); + ExpendableDescriptor(); + virtual ~ExpendableDescriptor(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getExpendableType(); - const EntityType& getExpendableType() const; - void setExpendableType(const EntityType &pX); + EntityType& getExpendableType(); + const EntityType& getExpendableType() const; + void setExpendableType(const EntityType& pX); - long long getPadding() const; - void setPadding(long long pX); + long long getPadding() const; + void setPadding(long long pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ExpendableDescriptor& rhs) const; + bool operator==(const ExpendableDescriptor& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ExpendableReload.cpp b/src/dis7/ExpendableReload.cpp index ec4f2c8b..05f4c55d 100644 --- a/src/dis7/ExpendableReload.cpp +++ b/src/dis7/ExpendableReload.cpp @@ -2,139 +2,110 @@ using namespace DIS; +ExpendableReload::ExpendableReload() + : _expendable(), + _station(0), + _standardQuantity(0), + _maximumQuantity(0), + _standardQuantityReloadTime(0), + _maximumQuantityReloadTime(0) {} -ExpendableReload::ExpendableReload(): - _expendable(), - _station(0), - _standardQuantity(0), - _maximumQuantity(0), - _standardQuantityReloadTime(0), - _maximumQuantityReloadTime(0) -{ -} +ExpendableReload::~ExpendableReload() {} -ExpendableReload::~ExpendableReload() -{ -} +EntityType& ExpendableReload::getExpendable() { return _expendable; } -EntityType& ExpendableReload::getExpendable() -{ - return _expendable; +const EntityType& ExpendableReload::getExpendable() const { + return _expendable; } -const EntityType& ExpendableReload::getExpendable() const -{ - return _expendable; -} +void ExpendableReload::setExpendable(const EntityType& pX) { _expendable = pX; } -void ExpendableReload::setExpendable(const EntityType &pX) -{ - _expendable = pX; -} +unsigned int ExpendableReload::getStation() const { return _station; } -unsigned int ExpendableReload::getStation() const -{ - return _station; -} +void ExpendableReload::setStation(unsigned int pX) { _station = pX; } -void ExpendableReload::setStation(unsigned int pX) -{ - _station = pX; +unsigned short ExpendableReload::getStandardQuantity() const { + return _standardQuantity; } -unsigned short ExpendableReload::getStandardQuantity() const -{ - return _standardQuantity; +void ExpendableReload::setStandardQuantity(unsigned short pX) { + _standardQuantity = pX; } -void ExpendableReload::setStandardQuantity(unsigned short pX) -{ - _standardQuantity = pX; +unsigned short ExpendableReload::getMaximumQuantity() const { + return _maximumQuantity; } -unsigned short ExpendableReload::getMaximumQuantity() const -{ - return _maximumQuantity; +void ExpendableReload::setMaximumQuantity(unsigned short pX) { + _maximumQuantity = pX; } -void ExpendableReload::setMaximumQuantity(unsigned short pX) -{ - _maximumQuantity = pX; +unsigned int ExpendableReload::getStandardQuantityReloadTime() const { + return _standardQuantityReloadTime; } -unsigned int ExpendableReload::getStandardQuantityReloadTime() const -{ - return _standardQuantityReloadTime; +void ExpendableReload::setStandardQuantityReloadTime(unsigned int pX) { + _standardQuantityReloadTime = pX; } -void ExpendableReload::setStandardQuantityReloadTime(unsigned int pX) -{ - _standardQuantityReloadTime = pX; +unsigned int ExpendableReload::getMaximumQuantityReloadTime() const { + return _maximumQuantityReloadTime; } -unsigned int ExpendableReload::getMaximumQuantityReloadTime() const -{ - return _maximumQuantityReloadTime; +void ExpendableReload::setMaximumQuantityReloadTime(unsigned int pX) { + _maximumQuantityReloadTime = pX; } -void ExpendableReload::setMaximumQuantityReloadTime(unsigned int pX) -{ - _maximumQuantityReloadTime = pX; +void ExpendableReload::marshal(DataStream& dataStream) const { + _expendable.marshal(dataStream); + dataStream << _station; + dataStream << _standardQuantity; + dataStream << _maximumQuantity; + dataStream << _standardQuantityReloadTime; + dataStream << _maximumQuantityReloadTime; } -void ExpendableReload::marshal(DataStream& dataStream) const -{ - _expendable.marshal(dataStream); - dataStream << _station; - dataStream << _standardQuantity; - dataStream << _maximumQuantity; - dataStream << _standardQuantityReloadTime; - dataStream << _maximumQuantityReloadTime; -} - -void ExpendableReload::unmarshal(DataStream& dataStream) -{ - _expendable.unmarshal(dataStream); - dataStream >> _station; - dataStream >> _standardQuantity; - dataStream >> _maximumQuantity; - dataStream >> _standardQuantityReloadTime; - dataStream >> _maximumQuantityReloadTime; +void ExpendableReload::unmarshal(DataStream& dataStream) { + _expendable.unmarshal(dataStream); + dataStream >> _station; + dataStream >> _standardQuantity; + dataStream >> _maximumQuantity; + dataStream >> _standardQuantityReloadTime; + dataStream >> _maximumQuantityReloadTime; } +bool ExpendableReload::operator==(const ExpendableReload& rhs) const { + bool ivarsEqual = true; -bool ExpendableReload::operator ==(const ExpendableReload& rhs) const - { - bool ivarsEqual = true; + if (!(_expendable == rhs._expendable)) ivarsEqual = false; + if (!(_station == rhs._station)) ivarsEqual = false; + if (!(_standardQuantity == rhs._standardQuantity)) ivarsEqual = false; + if (!(_maximumQuantity == rhs._maximumQuantity)) ivarsEqual = false; + if (!(_standardQuantityReloadTime == rhs._standardQuantityReloadTime)) + ivarsEqual = false; + if (!(_maximumQuantityReloadTime == rhs._maximumQuantityReloadTime)) + ivarsEqual = false; - if( ! (_expendable == rhs._expendable) ) ivarsEqual = false; - if( ! (_station == rhs._station) ) ivarsEqual = false; - if( ! (_standardQuantity == rhs._standardQuantity) ) ivarsEqual = false; - if( ! (_maximumQuantity == rhs._maximumQuantity) ) ivarsEqual = false; - if( ! (_standardQuantityReloadTime == rhs._standardQuantityReloadTime) ) ivarsEqual = false; - if( ! (_maximumQuantityReloadTime == rhs._maximumQuantityReloadTime) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ExpendableReload::getMarshalledSize() const -{ - int marshalSize = 0; +int ExpendableReload::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _expendable.getMarshalledSize(); // _expendable - marshalSize = marshalSize + 4; // _station - marshalSize = marshalSize + 2; // _standardQuantity - marshalSize = marshalSize + 2; // _maximumQuantity - marshalSize = marshalSize + 4; // _standardQuantityReloadTime - marshalSize = marshalSize + 4; // _maximumQuantityReloadTime - return marshalSize; + marshalSize = marshalSize + _expendable.getMarshalledSize(); // _expendable + marshalSize = marshalSize + 4; // _station + marshalSize = marshalSize + 2; // _standardQuantity + marshalSize = marshalSize + 2; // _maximumQuantity + marshalSize = marshalSize + 4; // _standardQuantityReloadTime + marshalSize = marshalSize + 4; // _maximumQuantityReloadTime + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -147,7 +118,7 @@ int ExpendableReload::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ExpendableReload.h b/src/dis7/ExpendableReload.h index 42bf0cc8..161396b5 100644 --- a/src/dis7/ExpendableReload.h +++ b/src/dis7/ExpendableReload.h @@ -1,73 +1,69 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // An entity's expendable (chaff, flares, etc) information. Section 6.2.37 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ExpendableReload -{ -protected: +class OPENDIS7_EXPORT ExpendableReload { + protected: /** Type of expendable */ - EntityType _expendable; - - unsigned int _station; + EntityType _expendable; - unsigned short _standardQuantity; + unsigned int _station; - unsigned short _maximumQuantity; + unsigned short _standardQuantity; - unsigned int _standardQuantityReloadTime; + unsigned short _maximumQuantity; - unsigned int _maximumQuantityReloadTime; + unsigned int _standardQuantityReloadTime; + unsigned int _maximumQuantityReloadTime; public: - ExpendableReload(); - virtual ~ExpendableReload(); + ExpendableReload(); + virtual ~ExpendableReload(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getExpendable(); - const EntityType& getExpendable() const; - void setExpendable(const EntityType &pX); + EntityType& getExpendable(); + const EntityType& getExpendable() const; + void setExpendable(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + unsigned int getStation() const; + void setStation(unsigned int pX); - unsigned short getStandardQuantity() const; - void setStandardQuantity(unsigned short pX); + unsigned short getStandardQuantity() const; + void setStandardQuantity(unsigned short pX); - unsigned short getMaximumQuantity() const; - void setMaximumQuantity(unsigned short pX); + unsigned short getMaximumQuantity() const; + void setMaximumQuantity(unsigned short pX); - unsigned int getStandardQuantityReloadTime() const; - void setStandardQuantityReloadTime(unsigned int pX); + unsigned int getStandardQuantityReloadTime() const; + void setStandardQuantityReloadTime(unsigned int pX); - unsigned int getMaximumQuantityReloadTime() const; - void setMaximumQuantityReloadTime(unsigned int pX); + unsigned int getMaximumQuantityReloadTime() const; + void setMaximumQuantityReloadTime(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ExpendableReload& rhs) const; + bool operator==(const ExpendableReload& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -80,7 +76,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ExplosionDescriptor.cpp b/src/dis7/ExplosionDescriptor.cpp index f06d9320..54f15b37 100644 --- a/src/dis7/ExplosionDescriptor.cpp +++ b/src/dis7/ExplosionDescriptor.cpp @@ -2,109 +2,83 @@ using namespace DIS; +ExplosionDescriptor::ExplosionDescriptor() + : _explodingObject(), + _explosiveMaterial(0), + _padding(0), + _explosiveForce(0.0) {} -ExplosionDescriptor::ExplosionDescriptor(): - _explodingObject(), - _explosiveMaterial(0), - _padding(0), - _explosiveForce(0.0) -{ -} +ExplosionDescriptor::~ExplosionDescriptor() {} -ExplosionDescriptor::~ExplosionDescriptor() -{ +EntityType& ExplosionDescriptor::getExplodingObject() { + return _explodingObject; } -EntityType& ExplosionDescriptor::getExplodingObject() -{ - return _explodingObject; +const EntityType& ExplosionDescriptor::getExplodingObject() const { + return _explodingObject; } -const EntityType& ExplosionDescriptor::getExplodingObject() const -{ - return _explodingObject; +void ExplosionDescriptor::setExplodingObject(const EntityType& pX) { + _explodingObject = pX; } -void ExplosionDescriptor::setExplodingObject(const EntityType &pX) -{ - _explodingObject = pX; +unsigned short ExplosionDescriptor::getExplosiveMaterial() const { + return _explosiveMaterial; } -unsigned short ExplosionDescriptor::getExplosiveMaterial() const -{ - return _explosiveMaterial; +void ExplosionDescriptor::setExplosiveMaterial(unsigned short pX) { + _explosiveMaterial = pX; } -void ExplosionDescriptor::setExplosiveMaterial(unsigned short pX) -{ - _explosiveMaterial = pX; -} +unsigned short ExplosionDescriptor::getPadding() const { return _padding; } -unsigned short ExplosionDescriptor::getPadding() const -{ - return _padding; -} +void ExplosionDescriptor::setPadding(unsigned short pX) { _padding = pX; } -void ExplosionDescriptor::setPadding(unsigned short pX) -{ - _padding = pX; -} +float ExplosionDescriptor::getExplosiveForce() const { return _explosiveForce; } -float ExplosionDescriptor::getExplosiveForce() const -{ - return _explosiveForce; -} +void ExplosionDescriptor::setExplosiveForce(float pX) { _explosiveForce = pX; } -void ExplosionDescriptor::setExplosiveForce(float pX) -{ - _explosiveForce = pX; +void ExplosionDescriptor::marshal(DataStream& dataStream) const { + _explodingObject.marshal(dataStream); + dataStream << _explosiveMaterial; + dataStream << _padding; + dataStream << _explosiveForce; } -void ExplosionDescriptor::marshal(DataStream& dataStream) const -{ - _explodingObject.marshal(dataStream); - dataStream << _explosiveMaterial; - dataStream << _padding; - dataStream << _explosiveForce; -} - -void ExplosionDescriptor::unmarshal(DataStream& dataStream) -{ - _explodingObject.unmarshal(dataStream); - dataStream >> _explosiveMaterial; - dataStream >> _padding; - dataStream >> _explosiveForce; +void ExplosionDescriptor::unmarshal(DataStream& dataStream) { + _explodingObject.unmarshal(dataStream); + dataStream >> _explosiveMaterial; + dataStream >> _padding; + dataStream >> _explosiveForce; } +bool ExplosionDescriptor::operator==(const ExplosionDescriptor& rhs) const { + bool ivarsEqual = true; -bool ExplosionDescriptor::operator ==(const ExplosionDescriptor& rhs) const - { - bool ivarsEqual = true; + if (!(_explodingObject == rhs._explodingObject)) ivarsEqual = false; + if (!(_explosiveMaterial == rhs._explosiveMaterial)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_explosiveForce == rhs._explosiveForce)) ivarsEqual = false; - if( ! (_explodingObject == rhs._explodingObject) ) ivarsEqual = false; - if( ! (_explosiveMaterial == rhs._explosiveMaterial) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_explosiveForce == rhs._explosiveForce) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ExplosionDescriptor::getMarshalledSize() const -{ - int marshalSize = 0; +int ExplosionDescriptor::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _explodingObject.getMarshalledSize(); // _explodingObject - marshalSize = marshalSize + 2; // _explosiveMaterial - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + 4; // _explosiveForce - return marshalSize; + marshalSize = + marshalSize + _explodingObject.getMarshalledSize(); // _explodingObject + marshalSize = marshalSize + 2; // _explosiveMaterial + marshalSize = marshalSize + 2; // _padding + marshalSize = marshalSize + 4; // _explosiveForce + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -117,7 +91,7 @@ int ExplosionDescriptor::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ExplosionDescriptor.h b/src/dis7/ExplosionDescriptor.h index 11e18e90..4f992a69 100644 --- a/src/dis7/ExplosionDescriptor.h +++ b/src/dis7/ExplosionDescriptor.h @@ -1,66 +1,62 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Explosion of a non-munition. Section 6.2.20.3 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ExplosionDescriptor -{ -protected: +class OPENDIS7_EXPORT ExplosionDescriptor { + protected: /** Type of the object that exploded. See 6.2.30 */ - EntityType _explodingObject; + EntityType _explodingObject; /** Material that exploded. Can be grain dust, tnt, gasoline, etc. */ - unsigned short _explosiveMaterial; + unsigned short _explosiveMaterial; /** padding */ - unsigned short _padding; + unsigned short _padding; /** Force of explosion, in equivalent KG of TNT */ - float _explosiveForce; - + float _explosiveForce; public: - ExplosionDescriptor(); - virtual ~ExplosionDescriptor(); + ExplosionDescriptor(); + virtual ~ExplosionDescriptor(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getExplodingObject(); - const EntityType& getExplodingObject() const; - void setExplodingObject(const EntityType &pX); + EntityType& getExplodingObject(); + const EntityType& getExplodingObject() const; + void setExplodingObject(const EntityType& pX); - unsigned short getExplosiveMaterial() const; - void setExplosiveMaterial(unsigned short pX); + unsigned short getExplosiveMaterial() const; + void setExplosiveMaterial(unsigned short pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - float getExplosiveForce() const; - void setExplosiveForce(float pX); + float getExplosiveForce() const; + void setExplosiveForce(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ExplosionDescriptor& rhs) const; + bool operator==(const ExplosionDescriptor& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -73,7 +69,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FalseTargetsAttribute.cpp b/src/dis7/FalseTargetsAttribute.cpp index 84548ae8..a87b02ba 100644 --- a/src/dis7/FalseTargetsAttribute.cpp +++ b/src/dis7/FalseTargetsAttribute.cpp @@ -2,254 +2,190 @@ using namespace DIS; +FalseTargetsAttribute::FalseTargetsAttribute() + : _recordType(3502), + _recordLength(40), + _padding(0), + _emitterNumber(0), + _beamNumber(0), + _stateIndicator(0), + _padding2(0), + _falseTargetCount(0.0), + _walkSpeed(0.0), + _walkAcceleration(0.0), + _maximumWalkDistance(0.0), + _keepTime(0.0), + _echoSpacing(0.0), + _padding3(0) {} -FalseTargetsAttribute::FalseTargetsAttribute(): - _recordType(3502), - _recordLength(40), - _padding(0), - _emitterNumber(0), - _beamNumber(0), - _stateIndicator(0), - _padding2(0), - _falseTargetCount(0.0), - _walkSpeed(0.0), - _walkAcceleration(0.0), - _maximumWalkDistance(0.0), - _keepTime(0.0), - _echoSpacing(0.0), - _padding3(0) -{ -} +FalseTargetsAttribute::~FalseTargetsAttribute() {} -FalseTargetsAttribute::~FalseTargetsAttribute() -{ +unsigned int FalseTargetsAttribute::getRecordType() const { + return _recordType; } -unsigned int FalseTargetsAttribute::getRecordType() const -{ - return _recordType; -} +void FalseTargetsAttribute::setRecordType(unsigned int pX) { _recordType = pX; } -void FalseTargetsAttribute::setRecordType(unsigned int pX) -{ - _recordType = pX; +unsigned short FalseTargetsAttribute::getRecordLength() const { + return _recordLength; } -unsigned short FalseTargetsAttribute::getRecordLength() const -{ - return _recordLength; +void FalseTargetsAttribute::setRecordLength(unsigned short pX) { + _recordLength = pX; } -void FalseTargetsAttribute::setRecordLength(unsigned short pX) -{ - _recordLength = pX; -} +unsigned short FalseTargetsAttribute::getPadding() const { return _padding; } -unsigned short FalseTargetsAttribute::getPadding() const -{ - return _padding; -} +void FalseTargetsAttribute::setPadding(unsigned short pX) { _padding = pX; } -void FalseTargetsAttribute::setPadding(unsigned short pX) -{ - _padding = pX; +unsigned char FalseTargetsAttribute::getEmitterNumber() const { + return _emitterNumber; } -unsigned char FalseTargetsAttribute::getEmitterNumber() const -{ - return _emitterNumber; +void FalseTargetsAttribute::setEmitterNumber(unsigned char pX) { + _emitterNumber = pX; } -void FalseTargetsAttribute::setEmitterNumber(unsigned char pX) -{ - _emitterNumber = pX; +unsigned char FalseTargetsAttribute::getBeamNumber() const { + return _beamNumber; } -unsigned char FalseTargetsAttribute::getBeamNumber() const -{ - return _beamNumber; +void FalseTargetsAttribute::setBeamNumber(unsigned char pX) { + _beamNumber = pX; } -void FalseTargetsAttribute::setBeamNumber(unsigned char pX) -{ - _beamNumber = pX; +unsigned char FalseTargetsAttribute::getStateIndicator() const { + return _stateIndicator; } -unsigned char FalseTargetsAttribute::getStateIndicator() const -{ - return _stateIndicator; +void FalseTargetsAttribute::setStateIndicator(unsigned char pX) { + _stateIndicator = pX; } -void FalseTargetsAttribute::setStateIndicator(unsigned char pX) -{ - _stateIndicator = pX; -} +unsigned char FalseTargetsAttribute::getPadding2() const { return _padding2; } -unsigned char FalseTargetsAttribute::getPadding2() const -{ - return _padding2; -} +void FalseTargetsAttribute::setPadding2(unsigned char pX) { _padding2 = pX; } -void FalseTargetsAttribute::setPadding2(unsigned char pX) -{ - _padding2 = pX; +float FalseTargetsAttribute::getFalseTargetCount() const { + return _falseTargetCount; } -float FalseTargetsAttribute::getFalseTargetCount() const -{ - return _falseTargetCount; +void FalseTargetsAttribute::setFalseTargetCount(float pX) { + _falseTargetCount = pX; } -void FalseTargetsAttribute::setFalseTargetCount(float pX) -{ - _falseTargetCount = pX; -} +float FalseTargetsAttribute::getWalkSpeed() const { return _walkSpeed; } -float FalseTargetsAttribute::getWalkSpeed() const -{ - return _walkSpeed; -} +void FalseTargetsAttribute::setWalkSpeed(float pX) { _walkSpeed = pX; } -void FalseTargetsAttribute::setWalkSpeed(float pX) -{ - _walkSpeed = pX; +float FalseTargetsAttribute::getWalkAcceleration() const { + return _walkAcceleration; } -float FalseTargetsAttribute::getWalkAcceleration() const -{ - return _walkAcceleration; +void FalseTargetsAttribute::setWalkAcceleration(float pX) { + _walkAcceleration = pX; } -void FalseTargetsAttribute::setWalkAcceleration(float pX) -{ - _walkAcceleration = pX; +float FalseTargetsAttribute::getMaximumWalkDistance() const { + return _maximumWalkDistance; } -float FalseTargetsAttribute::getMaximumWalkDistance() const -{ - return _maximumWalkDistance; +void FalseTargetsAttribute::setMaximumWalkDistance(float pX) { + _maximumWalkDistance = pX; } -void FalseTargetsAttribute::setMaximumWalkDistance(float pX) -{ - _maximumWalkDistance = pX; -} +float FalseTargetsAttribute::getKeepTime() const { return _keepTime; } -float FalseTargetsAttribute::getKeepTime() const -{ - return _keepTime; -} +void FalseTargetsAttribute::setKeepTime(float pX) { _keepTime = pX; } -void FalseTargetsAttribute::setKeepTime(float pX) -{ - _keepTime = pX; -} +float FalseTargetsAttribute::getEchoSpacing() const { return _echoSpacing; } -float FalseTargetsAttribute::getEchoSpacing() const -{ - return _echoSpacing; -} +void FalseTargetsAttribute::setEchoSpacing(float pX) { _echoSpacing = pX; } -void FalseTargetsAttribute::setEchoSpacing(float pX) -{ - _echoSpacing = pX; -} +unsigned int FalseTargetsAttribute::getPadding3() const { return _padding3; } -unsigned int FalseTargetsAttribute::getPadding3() const -{ - return _padding3; -} +void FalseTargetsAttribute::setPadding3(unsigned int pX) { _padding3 = pX; } -void FalseTargetsAttribute::setPadding3(unsigned int pX) -{ - _padding3 = pX; +void FalseTargetsAttribute::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _padding; + dataStream << _emitterNumber; + dataStream << _beamNumber; + dataStream << _stateIndicator; + dataStream << _padding2; + dataStream << _falseTargetCount; + dataStream << _walkSpeed; + dataStream << _walkAcceleration; + dataStream << _maximumWalkDistance; + dataStream << _keepTime; + dataStream << _echoSpacing; + dataStream << _padding3; } -void FalseTargetsAttribute::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _padding; - dataStream << _emitterNumber; - dataStream << _beamNumber; - dataStream << _stateIndicator; - dataStream << _padding2; - dataStream << _falseTargetCount; - dataStream << _walkSpeed; - dataStream << _walkAcceleration; - dataStream << _maximumWalkDistance; - dataStream << _keepTime; - dataStream << _echoSpacing; - dataStream << _padding3; +void FalseTargetsAttribute::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _padding; + dataStream >> _emitterNumber; + dataStream >> _beamNumber; + dataStream >> _stateIndicator; + dataStream >> _padding2; + dataStream >> _falseTargetCount; + dataStream >> _walkSpeed; + dataStream >> _walkAcceleration; + dataStream >> _maximumWalkDistance; + dataStream >> _keepTime; + dataStream >> _echoSpacing; + dataStream >> _padding3; } -void FalseTargetsAttribute::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _padding; - dataStream >> _emitterNumber; - dataStream >> _beamNumber; - dataStream >> _stateIndicator; - dataStream >> _padding2; - dataStream >> _falseTargetCount; - dataStream >> _walkSpeed; - dataStream >> _walkAcceleration; - dataStream >> _maximumWalkDistance; - dataStream >> _keepTime; - dataStream >> _echoSpacing; - dataStream >> _padding3; +bool FalseTargetsAttribute::operator==(const FalseTargetsAttribute& rhs) const { + bool ivarsEqual = true; + + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_emitterNumber == rhs._emitterNumber)) ivarsEqual = false; + if (!(_beamNumber == rhs._beamNumber)) ivarsEqual = false; + if (!(_stateIndicator == rhs._stateIndicator)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_falseTargetCount == rhs._falseTargetCount)) ivarsEqual = false; + if (!(_walkSpeed == rhs._walkSpeed)) ivarsEqual = false; + if (!(_walkAcceleration == rhs._walkAcceleration)) ivarsEqual = false; + if (!(_maximumWalkDistance == rhs._maximumWalkDistance)) ivarsEqual = false; + if (!(_keepTime == rhs._keepTime)) ivarsEqual = false; + if (!(_echoSpacing == rhs._echoSpacing)) ivarsEqual = false; + if (!(_padding3 == rhs._padding3)) ivarsEqual = false; + + return ivarsEqual; } +int FalseTargetsAttribute::getMarshalledSize() const { + int marshalSize = 0; -bool FalseTargetsAttribute::operator ==(const FalseTargetsAttribute& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_emitterNumber == rhs._emitterNumber) ) ivarsEqual = false; - if( ! (_beamNumber == rhs._beamNumber) ) ivarsEqual = false; - if( ! (_stateIndicator == rhs._stateIndicator) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_falseTargetCount == rhs._falseTargetCount) ) ivarsEqual = false; - if( ! (_walkSpeed == rhs._walkSpeed) ) ivarsEqual = false; - if( ! (_walkAcceleration == rhs._walkAcceleration) ) ivarsEqual = false; - if( ! (_maximumWalkDistance == rhs._maximumWalkDistance) ) ivarsEqual = false; - if( ! (_keepTime == rhs._keepTime) ) ivarsEqual = false; - if( ! (_echoSpacing == rhs._echoSpacing) ) ivarsEqual = false; - if( ! (_padding3 == rhs._padding3) ) ivarsEqual = false; - - return ivarsEqual; - } - -int FalseTargetsAttribute::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + 1; // _emitterNumber - marshalSize = marshalSize + 1; // _beamNumber - marshalSize = marshalSize + 1; // _stateIndicator - marshalSize = marshalSize + 1; // _padding2 - marshalSize = marshalSize + 4; // _falseTargetCount - marshalSize = marshalSize + 4; // _walkSpeed - marshalSize = marshalSize + 4; // _walkAcceleration - marshalSize = marshalSize + 4; // _maximumWalkDistance - marshalSize = marshalSize + 4; // _keepTime - marshalSize = marshalSize + 4; // _echoSpacing - marshalSize = marshalSize + 4; // _padding3 - return marshalSize; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 2; // _padding + marshalSize = marshalSize + 1; // _emitterNumber + marshalSize = marshalSize + 1; // _beamNumber + marshalSize = marshalSize + 1; // _stateIndicator + marshalSize = marshalSize + 1; // _padding2 + marshalSize = marshalSize + 4; // _falseTargetCount + marshalSize = marshalSize + 4; // _walkSpeed + marshalSize = marshalSize + 4; // _walkAcceleration + marshalSize = marshalSize + 4; // _maximumWalkDistance + marshalSize = marshalSize + 4; // _keepTime + marshalSize = marshalSize + 4; // _echoSpacing + marshalSize = marshalSize + 4; // _padding3 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -262,7 +198,7 @@ int FalseTargetsAttribute::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FalseTargetsAttribute.h b/src/dis7/FalseTargetsAttribute.h index 349cbc47..401cdb8a 100644 --- a/src/dis7/FalseTargetsAttribute.h +++ b/src/dis7/FalseTargetsAttribute.h @@ -1,110 +1,111 @@ #pragma once -#include #include +#include +namespace DIS { +// The False Targets attribute record shall be used to communicate discrete +// values that are associated with false targets jamming that cannot be +// referenced to an emitter mode. The values provided in the False Targets +// attri- bute record shall be considered valid only for the victim radar beams +// listed in the jamming beam's Track/Jam Data records (provided in the +// associated Electromagnetic Emission PDU). Section 6.2.12.3 -namespace DIS -{ -// The False Targets attribute record shall be used to communicate discrete values that are associated with false targets jamming that cannot be referenced to an emitter mode. The values provided in the False Targets attri- bute record shall be considered valid only for the victim radar beams listed in the jamming beam's Track/Jam Data records (provided in the associated Electromagnetic Emission PDU). Section 6.2.12.3 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT FalseTargetsAttribute -{ -protected: - unsigned int _recordType; - - unsigned short _recordLength; +class OPENDIS7_EXPORT FalseTargetsAttribute { + protected: + unsigned int _recordType; - unsigned short _padding; + unsigned short _recordLength; - unsigned char _emitterNumber; + unsigned short _padding; - unsigned char _beamNumber; + unsigned char _emitterNumber; - unsigned char _stateIndicator; + unsigned char _beamNumber; - unsigned char _padding2; + unsigned char _stateIndicator; - float _falseTargetCount; + unsigned char _padding2; - float _walkSpeed; + float _falseTargetCount; - float _walkAcceleration; + float _walkSpeed; - float _maximumWalkDistance; + float _walkAcceleration; - float _keepTime; + float _maximumWalkDistance; - float _echoSpacing; + float _keepTime; - unsigned int _padding3; + float _echoSpacing; + unsigned int _padding3; public: - FalseTargetsAttribute(); - virtual ~FalseTargetsAttribute(); + FalseTargetsAttribute(); + virtual ~FalseTargetsAttribute(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + unsigned char getEmitterNumber() const; + void setEmitterNumber(unsigned char pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + unsigned char getBeamNumber() const; + void setBeamNumber(unsigned char pX); - unsigned char getStateIndicator() const; - void setStateIndicator(unsigned char pX); + unsigned char getStateIndicator() const; + void setStateIndicator(unsigned char pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + unsigned char getPadding2() const; + void setPadding2(unsigned char pX); - float getFalseTargetCount() const; - void setFalseTargetCount(float pX); + float getFalseTargetCount() const; + void setFalseTargetCount(float pX); - float getWalkSpeed() const; - void setWalkSpeed(float pX); + float getWalkSpeed() const; + void setWalkSpeed(float pX); - float getWalkAcceleration() const; - void setWalkAcceleration(float pX); + float getWalkAcceleration() const; + void setWalkAcceleration(float pX); - float getMaximumWalkDistance() const; - void setMaximumWalkDistance(float pX); + float getMaximumWalkDistance() const; + void setMaximumWalkDistance(float pX); - float getKeepTime() const; - void setKeepTime(float pX); + float getKeepTime() const; + void setKeepTime(float pX); - float getEchoSpacing() const; - void setEchoSpacing(float pX); + float getEchoSpacing() const; + void setEchoSpacing(float pX); - unsigned int getPadding3() const; - void setPadding3(unsigned int pX); + unsigned int getPadding3() const; + void setPadding3(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FalseTargetsAttribute& rhs) const; + bool operator==(const FalseTargetsAttribute& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -117,7 +118,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FastEntityStatePdu.cpp b/src/dis7/FastEntityStatePdu.cpp index 27b4b6f5..68c46b8c 100644 --- a/src/dis7/FastEntityStatePdu.cpp +++ b/src/dis7/FastEntityStatePdu.cpp @@ -1,739 +1,525 @@ -#include - #include -using namespace DIS; +#include +using namespace DIS; -FastEntityStatePdu::FastEntityStatePdu() : EntityInformationFamilyPdu(), - _site(0), - _application(0), - _entity(0), - _forceId(0), - _numberOfVariableParameters(0), - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0), - _altEntityKind(0), - _altDomain(0), - _altCountry(0), - _altCategory(0), - _altSubcategory(0), - _altSpecific(0), - _altExtra(0), - _xVelocity(0.0), - _yVelocity(0.0), - _zVelocity(0.0), - _xLocation(0.0), - _yLocation(0.0), - _zLocation(0.0), - _psi(0.0), - _theta(0.0), - _phi(0.0), - _entityAppearance(0), - _deadReckoningAlgorithm(0), - _xAcceleration(0.0), - _yAcceleration(0.0), - _zAcceleration(0.0), - _xAngularVelocity(0.0), - _yAngularVelocity(0.0), - _zAngularVelocity(0.0), - _capabilities(0) -{ - setPduType( 1 ); - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 15; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - - // Initialize fixed length array - for(int lengthmarking= 0; lengthmarking < 12; lengthmarking++) - { - _marking[lengthmarking] = 0; - } +FastEntityStatePdu::FastEntityStatePdu() + : EntityInformationFamilyPdu(), + _site(0), + _application(0), + _entity(0), + _forceId(0), + _numberOfVariableParameters(0), + _entityKind(0), + _domain(0), + _country(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0), + _altEntityKind(0), + _altDomain(0), + _altCountry(0), + _altCategory(0), + _altSubcategory(0), + _altSpecific(0), + _altExtra(0), + _xVelocity(0.0), + _yVelocity(0.0), + _zVelocity(0.0), + _xLocation(0.0), + _yLocation(0.0), + _zLocation(0.0), + _psi(0.0), + _theta(0.0), + _phi(0.0), + _entityAppearance(0), + _deadReckoningAlgorithm(0), + _xAcceleration(0.0), + _yAcceleration(0.0), + _zAcceleration(0.0), + _xAngularVelocity(0.0), + _yAngularVelocity(0.0), + _zAngularVelocity(0.0), + _capabilities(0) { + setPduType(1); + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 15; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } + // Initialize fixed length array + for (int lengthmarking = 0; lengthmarking < 12; lengthmarking++) { + _marking[lengthmarking] = 0; + } } -FastEntityStatePdu::~FastEntityStatePdu() -{ - _variableParameters.clear(); -} +FastEntityStatePdu::~FastEntityStatePdu() { _variableParameters.clear(); } -unsigned short FastEntityStatePdu::getSite() const -{ - return _site; -} +unsigned short FastEntityStatePdu::getSite() const { return _site; } -void FastEntityStatePdu::setSite(unsigned short pX) -{ - _site = pX; -} +void FastEntityStatePdu::setSite(unsigned short pX) { _site = pX; } -unsigned short FastEntityStatePdu::getApplication() const -{ - return _application; +unsigned short FastEntityStatePdu::getApplication() const { + return _application; } -void FastEntityStatePdu::setApplication(unsigned short pX) -{ - _application = pX; +void FastEntityStatePdu::setApplication(unsigned short pX) { + _application = pX; } -unsigned short FastEntityStatePdu::getEntity() const -{ - return _entity; -} +unsigned short FastEntityStatePdu::getEntity() const { return _entity; } -void FastEntityStatePdu::setEntity(unsigned short pX) -{ - _entity = pX; -} +void FastEntityStatePdu::setEntity(unsigned short pX) { _entity = pX; } -unsigned char FastEntityStatePdu::getForceId() const -{ - return _forceId; -} +unsigned char FastEntityStatePdu::getForceId() const { return _forceId; } -void FastEntityStatePdu::setForceId(unsigned char pX) -{ - _forceId = pX; -} +void FastEntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } -char FastEntityStatePdu::getNumberOfVariableParameters() const -{ - return _variableParameters.size(); +char FastEntityStatePdu::getNumberOfVariableParameters() const { + return _variableParameters.size(); } -unsigned char FastEntityStatePdu::getEntityKind() const -{ - return _entityKind; -} +unsigned char FastEntityStatePdu::getEntityKind() const { return _entityKind; } -void FastEntityStatePdu::setEntityKind(unsigned char pX) -{ - _entityKind = pX; -} +void FastEntityStatePdu::setEntityKind(unsigned char pX) { _entityKind = pX; } -unsigned char FastEntityStatePdu::getDomain() const -{ - return _domain; -} +unsigned char FastEntityStatePdu::getDomain() const { return _domain; } -void FastEntityStatePdu::setDomain(unsigned char pX) -{ - _domain = pX; -} +void FastEntityStatePdu::setDomain(unsigned char pX) { _domain = pX; } -unsigned short FastEntityStatePdu::getCountry() const -{ - return _country; -} +unsigned short FastEntityStatePdu::getCountry() const { return _country; } -void FastEntityStatePdu::setCountry(unsigned short pX) -{ - _country = pX; -} +void FastEntityStatePdu::setCountry(unsigned short pX) { _country = pX; } -unsigned char FastEntityStatePdu::getCategory() const -{ - return _category; -} +unsigned char FastEntityStatePdu::getCategory() const { return _category; } -void FastEntityStatePdu::setCategory(unsigned char pX) -{ - _category = pX; -} +void FastEntityStatePdu::setCategory(unsigned char pX) { _category = pX; } -unsigned char FastEntityStatePdu::getSubcategory() const -{ - return _subcategory; +unsigned char FastEntityStatePdu::getSubcategory() const { + return _subcategory; } -void FastEntityStatePdu::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +void FastEntityStatePdu::setSubcategory(unsigned char pX) { _subcategory = pX; } -unsigned char FastEntityStatePdu::getSpecific() const -{ - return _specific; -} +unsigned char FastEntityStatePdu::getSpecific() const { return _specific; } -void FastEntityStatePdu::setSpecific(unsigned char pX) -{ - _specific = pX; -} +void FastEntityStatePdu::setSpecific(unsigned char pX) { _specific = pX; } -unsigned char FastEntityStatePdu::getExtra() const -{ - return _extra; -} +unsigned char FastEntityStatePdu::getExtra() const { return _extra; } -void FastEntityStatePdu::setExtra(unsigned char pX) -{ - _extra = pX; -} +void FastEntityStatePdu::setExtra(unsigned char pX) { _extra = pX; } -unsigned char FastEntityStatePdu::getAltEntityKind() const -{ - return _altEntityKind; +unsigned char FastEntityStatePdu::getAltEntityKind() const { + return _altEntityKind; } -void FastEntityStatePdu::setAltEntityKind(unsigned char pX) -{ - _altEntityKind = pX; +void FastEntityStatePdu::setAltEntityKind(unsigned char pX) { + _altEntityKind = pX; } -unsigned char FastEntityStatePdu::getAltDomain() const -{ - return _altDomain; -} +unsigned char FastEntityStatePdu::getAltDomain() const { return _altDomain; } -void FastEntityStatePdu::setAltDomain(unsigned char pX) -{ - _altDomain = pX; -} +void FastEntityStatePdu::setAltDomain(unsigned char pX) { _altDomain = pX; } -unsigned short FastEntityStatePdu::getAltCountry() const -{ - return _altCountry; -} +unsigned short FastEntityStatePdu::getAltCountry() const { return _altCountry; } -void FastEntityStatePdu::setAltCountry(unsigned short pX) -{ - _altCountry = pX; -} +void FastEntityStatePdu::setAltCountry(unsigned short pX) { _altCountry = pX; } -unsigned char FastEntityStatePdu::getAltCategory() const -{ - return _altCategory; +unsigned char FastEntityStatePdu::getAltCategory() const { + return _altCategory; } -void FastEntityStatePdu::setAltCategory(unsigned char pX) -{ - _altCategory = pX; -} +void FastEntityStatePdu::setAltCategory(unsigned char pX) { _altCategory = pX; } -unsigned char FastEntityStatePdu::getAltSubcategory() const -{ - return _altSubcategory; +unsigned char FastEntityStatePdu::getAltSubcategory() const { + return _altSubcategory; } -void FastEntityStatePdu::setAltSubcategory(unsigned char pX) -{ - _altSubcategory = pX; +void FastEntityStatePdu::setAltSubcategory(unsigned char pX) { + _altSubcategory = pX; } -unsigned char FastEntityStatePdu::getAltSpecific() const -{ - return _altSpecific; +unsigned char FastEntityStatePdu::getAltSpecific() const { + return _altSpecific; } -void FastEntityStatePdu::setAltSpecific(unsigned char pX) -{ - _altSpecific = pX; -} +void FastEntityStatePdu::setAltSpecific(unsigned char pX) { _altSpecific = pX; } -unsigned char FastEntityStatePdu::getAltExtra() const -{ - return _altExtra; -} +unsigned char FastEntityStatePdu::getAltExtra() const { return _altExtra; } -void FastEntityStatePdu::setAltExtra(unsigned char pX) -{ - _altExtra = pX; -} +void FastEntityStatePdu::setAltExtra(unsigned char pX) { _altExtra = pX; } -float FastEntityStatePdu::getXVelocity() const -{ - return _xVelocity; -} +float FastEntityStatePdu::getXVelocity() const { return _xVelocity; } -void FastEntityStatePdu::setXVelocity(float pX) -{ - _xVelocity = pX; -} +void FastEntityStatePdu::setXVelocity(float pX) { _xVelocity = pX; } -float FastEntityStatePdu::getYVelocity() const -{ - return _yVelocity; -} +float FastEntityStatePdu::getYVelocity() const { return _yVelocity; } -void FastEntityStatePdu::setYVelocity(float pX) -{ - _yVelocity = pX; -} +void FastEntityStatePdu::setYVelocity(float pX) { _yVelocity = pX; } -float FastEntityStatePdu::getZVelocity() const -{ - return _zVelocity; -} +float FastEntityStatePdu::getZVelocity() const { return _zVelocity; } -void FastEntityStatePdu::setZVelocity(float pX) -{ - _zVelocity = pX; -} +void FastEntityStatePdu::setZVelocity(float pX) { _zVelocity = pX; } -double FastEntityStatePdu::getXLocation() const -{ - return _xLocation; -} +double FastEntityStatePdu::getXLocation() const { return _xLocation; } -void FastEntityStatePdu::setXLocation(double pX) -{ - _xLocation = pX; -} +void FastEntityStatePdu::setXLocation(double pX) { _xLocation = pX; } -double FastEntityStatePdu::getYLocation() const -{ - return _yLocation; -} +double FastEntityStatePdu::getYLocation() const { return _yLocation; } -void FastEntityStatePdu::setYLocation(double pX) -{ - _yLocation = pX; -} +void FastEntityStatePdu::setYLocation(double pX) { _yLocation = pX; } -double FastEntityStatePdu::getZLocation() const -{ - return _zLocation; -} +double FastEntityStatePdu::getZLocation() const { return _zLocation; } -void FastEntityStatePdu::setZLocation(double pX) -{ - _zLocation = pX; -} - -float FastEntityStatePdu::getPsi() const -{ - return _psi; -} - -void FastEntityStatePdu::setPsi(float pX) -{ - _psi = pX; -} +void FastEntityStatePdu::setZLocation(double pX) { _zLocation = pX; } -float FastEntityStatePdu::getTheta() const -{ - return _theta; -} +float FastEntityStatePdu::getPsi() const { return _psi; } -void FastEntityStatePdu::setTheta(float pX) -{ - _theta = pX; -} +void FastEntityStatePdu::setPsi(float pX) { _psi = pX; } -float FastEntityStatePdu::getPhi() const -{ - return _phi; -} +float FastEntityStatePdu::getTheta() const { return _theta; } -void FastEntityStatePdu::setPhi(float pX) -{ - _phi = pX; -} +void FastEntityStatePdu::setTheta(float pX) { _theta = pX; } -int FastEntityStatePdu::getEntityAppearance() const -{ - return _entityAppearance; -} +float FastEntityStatePdu::getPhi() const { return _phi; } -void FastEntityStatePdu::setEntityAppearance(int pX) -{ - _entityAppearance = pX; -} +void FastEntityStatePdu::setPhi(float pX) { _phi = pX; } -unsigned char FastEntityStatePdu::getDeadReckoningAlgorithm() const -{ - return _deadReckoningAlgorithm; +int FastEntityStatePdu::getEntityAppearance() const { + return _entityAppearance; } -void FastEntityStatePdu::setDeadReckoningAlgorithm(unsigned char pX) -{ - _deadReckoningAlgorithm = pX; -} +void FastEntityStatePdu::setEntityAppearance(int pX) { _entityAppearance = pX; } -char* FastEntityStatePdu::getOtherParameters() -{ - return _otherParameters; +unsigned char FastEntityStatePdu::getDeadReckoningAlgorithm() const { + return _deadReckoningAlgorithm; } -const char* FastEntityStatePdu::getOtherParameters() const -{ - return _otherParameters; +void FastEntityStatePdu::setDeadReckoningAlgorithm(unsigned char pX) { + _deadReckoningAlgorithm = pX; } -void FastEntityStatePdu::setOtherParameters(const char* x) -{ - for(int i = 0; i < 15; i++) - { - _otherParameters[i] = x[i]; - } -} +char* FastEntityStatePdu::getOtherParameters() { return _otherParameters; } -float FastEntityStatePdu::getXAcceleration() const -{ - return _xAcceleration; +const char* FastEntityStatePdu::getOtherParameters() const { + return _otherParameters; } -void FastEntityStatePdu::setXAcceleration(float pX) -{ - _xAcceleration = pX; +void FastEntityStatePdu::setOtherParameters(const char* x) { + for (int i = 0; i < 15; i++) { + _otherParameters[i] = x[i]; + } } -float FastEntityStatePdu::getYAcceleration() const -{ - return _yAcceleration; -} +float FastEntityStatePdu::getXAcceleration() const { return _xAcceleration; } -void FastEntityStatePdu::setYAcceleration(float pX) -{ - _yAcceleration = pX; -} +void FastEntityStatePdu::setXAcceleration(float pX) { _xAcceleration = pX; } -float FastEntityStatePdu::getZAcceleration() const -{ - return _zAcceleration; -} +float FastEntityStatePdu::getYAcceleration() const { return _yAcceleration; } -void FastEntityStatePdu::setZAcceleration(float pX) -{ - _zAcceleration = pX; -} +void FastEntityStatePdu::setYAcceleration(float pX) { _yAcceleration = pX; } -float FastEntityStatePdu::getXAngularVelocity() const -{ - return _xAngularVelocity; -} +float FastEntityStatePdu::getZAcceleration() const { return _zAcceleration; } -void FastEntityStatePdu::setXAngularVelocity(float pX) -{ - _xAngularVelocity = pX; -} +void FastEntityStatePdu::setZAcceleration(float pX) { _zAcceleration = pX; } -float FastEntityStatePdu::getYAngularVelocity() const -{ - return _yAngularVelocity; +float FastEntityStatePdu::getXAngularVelocity() const { + return _xAngularVelocity; } -void FastEntityStatePdu::setYAngularVelocity(float pX) -{ - _yAngularVelocity = pX; +void FastEntityStatePdu::setXAngularVelocity(float pX) { + _xAngularVelocity = pX; } -float FastEntityStatePdu::getZAngularVelocity() const -{ - return _zAngularVelocity; +float FastEntityStatePdu::getYAngularVelocity() const { + return _yAngularVelocity; } -void FastEntityStatePdu::setZAngularVelocity(float pX) -{ - _zAngularVelocity = pX; +void FastEntityStatePdu::setYAngularVelocity(float pX) { + _yAngularVelocity = pX; } -char* FastEntityStatePdu::getMarking() -{ - return _marking; +float FastEntityStatePdu::getZAngularVelocity() const { + return _zAngularVelocity; } -const char* FastEntityStatePdu::getMarking() const -{ - return _marking; +void FastEntityStatePdu::setZAngularVelocity(float pX) { + _zAngularVelocity = pX; } -void FastEntityStatePdu::setMarking(const char* x) -{ - for(int i = 0; i < 12; i++) - { - _marking[i] = x[i]; - } -} +char* FastEntityStatePdu::getMarking() { return _marking; } -// An alternate method to set the value if this could be a string. This is not strictly comnpliant with the DIS standard. -void FastEntityStatePdu::setByStringMarking(const char* x) -{ - std::strncpy(_marking, x, 12-1); - _marking[12 -1] = '\0'; -} +const char* FastEntityStatePdu::getMarking() const { return _marking; } -int FastEntityStatePdu::getCapabilities() const -{ - return _capabilities; +void FastEntityStatePdu::setMarking(const char* x) { + for (int i = 0; i < 12; i++) { + _marking[i] = x[i]; + } } -void FastEntityStatePdu::setCapabilities(int pX) -{ - _capabilities = pX; +// An alternate method to set the value if this could be a string. This is not +// strictly comnpliant with the DIS standard. +void FastEntityStatePdu::setByStringMarking(const char* x) { + std::strncpy(_marking, x, 12 - 1); + _marking[12 - 1] = '\0'; } -std::vector& FastEntityStatePdu::getVariableParameters() -{ - return _variableParameters; -} +int FastEntityStatePdu::getCapabilities() const { return _capabilities; } -const std::vector& FastEntityStatePdu::getVariableParameters() const -{ - return _variableParameters; -} +void FastEntityStatePdu::setCapabilities(int pX) { _capabilities = pX; } -void FastEntityStatePdu::setVariableParameters(const std::vector& pX) -{ - _variableParameters = pX; +std::vector& FastEntityStatePdu::getVariableParameters() { + return _variableParameters; } -void FastEntityStatePdu::marshal(DataStream& dataStream) const -{ - EntityInformationFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _site; - dataStream << _application; - dataStream << _entity; - dataStream << _forceId; - dataStream << ( char )_variableParameters.size(); - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; - dataStream << _altEntityKind; - dataStream << _altDomain; - dataStream << _altCountry; - dataStream << _altCategory; - dataStream << _altSubcategory; - dataStream << _altSpecific; - dataStream << _altExtra; - dataStream << _xVelocity; - dataStream << _yVelocity; - dataStream << _zVelocity; - dataStream << _xLocation; - dataStream << _yLocation; - dataStream << _zLocation; - dataStream << _psi; - dataStream << _theta; - dataStream << _phi; - dataStream << _entityAppearance; - dataStream << _deadReckoningAlgorithm; - - for(size_t idx = 0; idx < 15; idx++) - { - dataStream << _otherParameters[idx]; - } - - dataStream << _xAcceleration; - dataStream << _yAcceleration; - dataStream << _zAcceleration; - dataStream << _xAngularVelocity; - dataStream << _yAngularVelocity; - dataStream << _zAngularVelocity; - - for(size_t idx = 0; idx < 12; idx++) - { - dataStream << _marking[idx]; - } - - dataStream << _capabilities; - - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - VariableParameter x = _variableParameters[idx]; - x.marshal(dataStream); - } - +const std::vector& +FastEntityStatePdu::getVariableParameters() const { + return _variableParameters; } -void FastEntityStatePdu::unmarshal(DataStream& dataStream) -{ - EntityInformationFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _site; - dataStream >> _application; - dataStream >> _entity; - dataStream >> _forceId; - dataStream >> _numberOfVariableParameters; - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; - dataStream >> _altEntityKind; - dataStream >> _altDomain; - dataStream >> _altCountry; - dataStream >> _altCategory; - dataStream >> _altSubcategory; - dataStream >> _altSpecific; - dataStream >> _altExtra; - dataStream >> _xVelocity; - dataStream >> _yVelocity; - dataStream >> _zVelocity; - dataStream >> _xLocation; - dataStream >> _yLocation; - dataStream >> _zLocation; - dataStream >> _psi; - dataStream >> _theta; - dataStream >> _phi; - dataStream >> _entityAppearance; - dataStream >> _deadReckoningAlgorithm; - - for(size_t idx = 0; idx < 15; idx++) - { - dataStream >> _otherParameters[idx]; - } - - dataStream >> _xAcceleration; - dataStream >> _yAcceleration; - dataStream >> _zAcceleration; - dataStream >> _xAngularVelocity; - dataStream >> _yAngularVelocity; - dataStream >> _zAngularVelocity; - - for(size_t idx = 0; idx < 12; idx++) - { - dataStream >> _marking[idx]; - } - - dataStream >> _capabilities; - - _variableParameters.clear(); - for(size_t idx = 0; idx < _numberOfVariableParameters; idx++) - { - VariableParameter x; - x.unmarshal(dataStream); - _variableParameters.push_back(x); - } +void FastEntityStatePdu::setVariableParameters( + const std::vector& pX) { + _variableParameters = pX; } - -bool FastEntityStatePdu::operator ==(const FastEntityStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if( ! (_site == rhs._site) ) ivarsEqual = false; - if( ! (_application == rhs._application) ) ivarsEqual = false; - if( ! (_entity == rhs._entity) ) ivarsEqual = false; - if( ! (_forceId == rhs._forceId) ) ivarsEqual = false; - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - if( ! (_altEntityKind == rhs._altEntityKind) ) ivarsEqual = false; - if( ! (_altDomain == rhs._altDomain) ) ivarsEqual = false; - if( ! (_altCountry == rhs._altCountry) ) ivarsEqual = false; - if( ! (_altCategory == rhs._altCategory) ) ivarsEqual = false; - if( ! (_altSubcategory == rhs._altSubcategory) ) ivarsEqual = false; - if( ! (_altSpecific == rhs._altSpecific) ) ivarsEqual = false; - if( ! (_altExtra == rhs._altExtra) ) ivarsEqual = false; - if( ! (_xVelocity == rhs._xVelocity) ) ivarsEqual = false; - if( ! (_yVelocity == rhs._yVelocity) ) ivarsEqual = false; - if( ! (_zVelocity == rhs._zVelocity) ) ivarsEqual = false; - if( ! (_xLocation == rhs._xLocation) ) ivarsEqual = false; - if( ! (_yLocation == rhs._yLocation) ) ivarsEqual = false; - if( ! (_zLocation == rhs._zLocation) ) ivarsEqual = false; - if( ! (_psi == rhs._psi) ) ivarsEqual = false; - if( ! (_theta == rhs._theta) ) ivarsEqual = false; - if( ! (_phi == rhs._phi) ) ivarsEqual = false; - if( ! (_entityAppearance == rhs._entityAppearance) ) ivarsEqual = false; - if( ! (_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm) ) ivarsEqual = false; - - for(unsigned char idx = 0; idx < 15; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - if( ! (_xAcceleration == rhs._xAcceleration) ) ivarsEqual = false; - if( ! (_yAcceleration == rhs._yAcceleration) ) ivarsEqual = false; - if( ! (_zAcceleration == rhs._zAcceleration) ) ivarsEqual = false; - if( ! (_xAngularVelocity == rhs._xAngularVelocity) ) ivarsEqual = false; - if( ! (_yAngularVelocity == rhs._yAngularVelocity) ) ivarsEqual = false; - if( ! (_zAngularVelocity == rhs._zAngularVelocity) ) ivarsEqual = false; - - for(unsigned char idx = 0; idx < 12; idx++) - { - if(!(_marking[idx] == rhs._marking[idx]) ) ivarsEqual = false; - } - - if( ! (_capabilities == rhs._capabilities) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _variableParameters.size(); idx++) - { - if( ! ( _variableParameters[idx] == rhs._variableParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int FastEntityStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _entity - marshalSize = marshalSize + 1; // _forceId - marshalSize = marshalSize + 1; // _numberOfVariableParameters - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - marshalSize = marshalSize + 1; // _altEntityKind - marshalSize = marshalSize + 1; // _altDomain - marshalSize = marshalSize + 2; // _altCountry - marshalSize = marshalSize + 1; // _altCategory - marshalSize = marshalSize + 1; // _altSubcategory - marshalSize = marshalSize + 1; // _altSpecific - marshalSize = marshalSize + 1; // _altExtra - marshalSize = marshalSize + 4; // _xVelocity - marshalSize = marshalSize + 4; // _yVelocity - marshalSize = marshalSize + 4; // _zVelocity - marshalSize = marshalSize + 8; // _xLocation - marshalSize = marshalSize + 8; // _yLocation - marshalSize = marshalSize + 8; // _zLocation - marshalSize = marshalSize + 4; // _psi - marshalSize = marshalSize + 4; // _theta - marshalSize = marshalSize + 4; // _phi - marshalSize = marshalSize + 4; // _entityAppearance - marshalSize = marshalSize + 1; // _deadReckoningAlgorithm - marshalSize = marshalSize + 15 * 1; // _otherParameters - marshalSize = marshalSize + 4; // _xAcceleration - marshalSize = marshalSize + 4; // _yAcceleration - marshalSize = marshalSize + 4; // _zAcceleration - marshalSize = marshalSize + 4; // _xAngularVelocity - marshalSize = marshalSize + 4; // _yAngularVelocity - marshalSize = marshalSize + 4; // _zAngularVelocity - marshalSize = marshalSize + 12 * 1; // _marking - marshalSize = marshalSize + 4; // _capabilities - - for(unsigned long long idx=0; idx < _variableParameters.size(); idx++) - { - VariableParameter listElement = _variableParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; +void FastEntityStatePdu::marshal(DataStream& dataStream) const { + EntityInformationFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _site; + dataStream << _application; + dataStream << _entity; + dataStream << _forceId; + dataStream << (char)_variableParameters.size(); + dataStream << _entityKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; + dataStream << _altEntityKind; + dataStream << _altDomain; + dataStream << _altCountry; + dataStream << _altCategory; + dataStream << _altSubcategory; + dataStream << _altSpecific; + dataStream << _altExtra; + dataStream << _xVelocity; + dataStream << _yVelocity; + dataStream << _zVelocity; + dataStream << _xLocation; + dataStream << _yLocation; + dataStream << _zLocation; + dataStream << _psi; + dataStream << _theta; + dataStream << _phi; + dataStream << _entityAppearance; + dataStream << _deadReckoningAlgorithm; + + for (size_t idx = 0; idx < 15; idx++) { + dataStream << _otherParameters[idx]; + } + + dataStream << _xAcceleration; + dataStream << _yAcceleration; + dataStream << _zAcceleration; + dataStream << _xAngularVelocity; + dataStream << _yAngularVelocity; + dataStream << _zAngularVelocity; + + for (size_t idx = 0; idx < 12; idx++) { + dataStream << _marking[idx]; + } + + dataStream << _capabilities; + + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter x = _variableParameters[idx]; + x.marshal(dataStream); + } +} + +void FastEntityStatePdu::unmarshal(DataStream& dataStream) { + EntityInformationFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _site; + dataStream >> _application; + dataStream >> _entity; + dataStream >> _forceId; + dataStream >> _numberOfVariableParameters; + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; + dataStream >> _altEntityKind; + dataStream >> _altDomain; + dataStream >> _altCountry; + dataStream >> _altCategory; + dataStream >> _altSubcategory; + dataStream >> _altSpecific; + dataStream >> _altExtra; + dataStream >> _xVelocity; + dataStream >> _yVelocity; + dataStream >> _zVelocity; + dataStream >> _xLocation; + dataStream >> _yLocation; + dataStream >> _zLocation; + dataStream >> _psi; + dataStream >> _theta; + dataStream >> _phi; + dataStream >> _entityAppearance; + dataStream >> _deadReckoningAlgorithm; + + for (size_t idx = 0; idx < 15; idx++) { + dataStream >> _otherParameters[idx]; + } + + dataStream >> _xAcceleration; + dataStream >> _yAcceleration; + dataStream >> _zAcceleration; + dataStream >> _xAngularVelocity; + dataStream >> _yAngularVelocity; + dataStream >> _zAngularVelocity; + + for (size_t idx = 0; idx < 12; idx++) { + dataStream >> _marking[idx]; + } + + dataStream >> _capabilities; + + _variableParameters.clear(); + for (size_t idx = 0; idx < _numberOfVariableParameters; idx++) { + VariableParameter x; + x.unmarshal(dataStream); + _variableParameters.push_back(x); + } +} + +bool FastEntityStatePdu::operator==(const FastEntityStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); + + if (!(_site == rhs._site)) ivarsEqual = false; + if (!(_application == rhs._application)) ivarsEqual = false; + if (!(_entity == rhs._entity)) ivarsEqual = false; + if (!(_forceId == rhs._forceId)) ivarsEqual = false; + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + if (!(_altEntityKind == rhs._altEntityKind)) ivarsEqual = false; + if (!(_altDomain == rhs._altDomain)) ivarsEqual = false; + if (!(_altCountry == rhs._altCountry)) ivarsEqual = false; + if (!(_altCategory == rhs._altCategory)) ivarsEqual = false; + if (!(_altSubcategory == rhs._altSubcategory)) ivarsEqual = false; + if (!(_altSpecific == rhs._altSpecific)) ivarsEqual = false; + if (!(_altExtra == rhs._altExtra)) ivarsEqual = false; + if (!(_xVelocity == rhs._xVelocity)) ivarsEqual = false; + if (!(_yVelocity == rhs._yVelocity)) ivarsEqual = false; + if (!(_zVelocity == rhs._zVelocity)) ivarsEqual = false; + if (!(_xLocation == rhs._xLocation)) ivarsEqual = false; + if (!(_yLocation == rhs._yLocation)) ivarsEqual = false; + if (!(_zLocation == rhs._zLocation)) ivarsEqual = false; + if (!(_psi == rhs._psi)) ivarsEqual = false; + if (!(_theta == rhs._theta)) ivarsEqual = false; + if (!(_phi == rhs._phi)) ivarsEqual = false; + if (!(_entityAppearance == rhs._entityAppearance)) ivarsEqual = false; + if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) + ivarsEqual = false; + + for (unsigned char idx = 0; idx < 15; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } + + if (!(_xAcceleration == rhs._xAcceleration)) ivarsEqual = false; + if (!(_yAcceleration == rhs._yAcceleration)) ivarsEqual = false; + if (!(_zAcceleration == rhs._zAcceleration)) ivarsEqual = false; + if (!(_xAngularVelocity == rhs._xAngularVelocity)) ivarsEqual = false; + if (!(_yAngularVelocity == rhs._yAngularVelocity)) ivarsEqual = false; + if (!(_zAngularVelocity == rhs._zAngularVelocity)) ivarsEqual = false; + + for (unsigned char idx = 0; idx < 12; idx++) { + if (!(_marking[idx] == rhs._marking[idx])) ivarsEqual = false; + } + + if (!(_capabilities == rhs._capabilities)) ivarsEqual = false; + + for (size_t idx = 0; idx < _variableParameters.size(); idx++) { + if (!(_variableParameters[idx] == rhs._variableParameters[idx])) + ivarsEqual = false; + } + + return ivarsEqual; +} + +int FastEntityStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _site + marshalSize = marshalSize + 2; // _application + marshalSize = marshalSize + 2; // _entity + marshalSize = marshalSize + 1; // _forceId + marshalSize = marshalSize + 1; // _numberOfVariableParameters + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + marshalSize = marshalSize + 1; // _altEntityKind + marshalSize = marshalSize + 1; // _altDomain + marshalSize = marshalSize + 2; // _altCountry + marshalSize = marshalSize + 1; // _altCategory + marshalSize = marshalSize + 1; // _altSubcategory + marshalSize = marshalSize + 1; // _altSpecific + marshalSize = marshalSize + 1; // _altExtra + marshalSize = marshalSize + 4; // _xVelocity + marshalSize = marshalSize + 4; // _yVelocity + marshalSize = marshalSize + 4; // _zVelocity + marshalSize = marshalSize + 8; // _xLocation + marshalSize = marshalSize + 8; // _yLocation + marshalSize = marshalSize + 8; // _zLocation + marshalSize = marshalSize + 4; // _psi + marshalSize = marshalSize + 4; // _theta + marshalSize = marshalSize + 4; // _phi + marshalSize = marshalSize + 4; // _entityAppearance + marshalSize = marshalSize + 1; // _deadReckoningAlgorithm + marshalSize = marshalSize + 15 * 1; // _otherParameters + marshalSize = marshalSize + 4; // _xAcceleration + marshalSize = marshalSize + 4; // _yAcceleration + marshalSize = marshalSize + 4; // _zAcceleration + marshalSize = marshalSize + 4; // _xAngularVelocity + marshalSize = marshalSize + 4; // _yAngularVelocity + marshalSize = marshalSize + 4; // _zAngularVelocity + marshalSize = marshalSize + 12 * 1; // _marking + marshalSize = marshalSize + 4; // _capabilities + + for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + VariableParameter listElement = _variableParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -746,7 +532,7 @@ int FastEntityStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FastEntityStatePdu.h b/src/dis7/FastEntityStatePdu.h index 9905b13d..8ba9efe2 100644 --- a/src/dis7/FastEntityStatePdu.h +++ b/src/dis7/FastEntityStatePdu.h @@ -1,281 +1,284 @@ #pragma once -#include #include + #include -#include +#include #include +#include +namespace DIS { +// Represents the postion and state of one entity in the world. This is +// identical in function to entity state pdu, but generates less garbage to +// collect in the Java world. Section 7.2.2. COMPLETE -namespace DIS -{ -// Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu -{ -protected: +class OPENDIS7_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { + protected: /** The site ID */ - unsigned short _site; + unsigned short _site; /** The application ID */ - unsigned short _application; + unsigned short _application; /** the entity ID */ - unsigned short _entity; + unsigned short _entity; /** what force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + unsigned char _forceId; - /** How many variable (nee articulation) parameters are in the variable length list */ - unsigned char _numberOfVariableParameters; + /** How many variable (nee articulation) parameters are in the variable length + * list */ + unsigned char _numberOfVariableParameters; /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; + unsigned char _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + unsigned char _specific; - unsigned char _extra; + unsigned char _extra; /** Kind of entity */ - unsigned char _altEntityKind; + unsigned char _altEntityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _altDomain; + unsigned char _altDomain; /** country to which the design of the entity is attributed */ - unsigned short _altCountry; + unsigned short _altCountry; /** category of entity */ - unsigned char _altCategory; + unsigned char _altCategory; /** subcategory of entity */ - unsigned char _altSubcategory; + unsigned char _altSubcategory; /** specific info based on subcategory field */ - unsigned char _altSpecific; + unsigned char _altSpecific; - unsigned char _altExtra; + unsigned char _altExtra; /** X velo */ - float _xVelocity; + float _xVelocity; /** y Value */ - float _yVelocity; + float _yVelocity; /** Z value */ - float _zVelocity; + float _zVelocity; /** X value */ - double _xLocation; + double _xLocation; /** y Value */ - double _yLocation; + double _yLocation; /** Z value */ - double _zLocation; + double _zLocation; - float _psi; + float _psi; - float _theta; + float _theta; - float _phi; + float _phi; - /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */ - int _entityAppearance; + /** a series of bit flags that are used to help draw the entity, such as + * smoking, on fire, etc. */ + int _entityAppearance; /** enumeration of what dead reckoning algorighm to use */ - unsigned char _deadReckoningAlgorithm; + unsigned char _deadReckoningAlgorithm; /** other parameters to use in the dead reckoning algorithm */ - char _otherParameters[15]; + char _otherParameters[15]; /** X value */ - float _xAcceleration; + float _xAcceleration; /** y Value */ - float _yAcceleration; + float _yAcceleration; /** Z value */ - float _zAcceleration; + float _zAcceleration; /** X value */ - float _xAngularVelocity; + float _xAngularVelocity; /** y Value */ - float _yAngularVelocity; + float _yAngularVelocity; /** Z value */ - float _zAngularVelocity; + float _zAngularVelocity; - /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */ - char _marking[12]; + /** characters that can be used for debugging, or to draw unique strings on + * the side of entities in the world */ + char _marking[12]; /** a series of bit flags */ - int _capabilities; - - /** variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters */ - std::vector _variableParameters; + int _capabilities; + /** variable length list of variable parameters. In earlier versions of DIS + * these were known as articulation parameters */ + std::vector _variableParameters; public: - FastEntityStatePdu(); - virtual ~FastEntityStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + FastEntityStatePdu(); + virtual ~FastEntityStatePdu(); - unsigned short getSite() const; - void setSite(unsigned short pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + unsigned short getSite() const; + void setSite(unsigned short pX); - unsigned short getEntity() const; - void setEntity(unsigned short pX); + unsigned short getApplication() const; + void setApplication(unsigned short pX); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + unsigned short getEntity() const; + void setEntity(unsigned short pX); - char getNumberOfVariableParameters() const; + unsigned char getForceId() const; + void setForceId(unsigned char pX); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + char getNumberOfVariableParameters() const; - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getAltEntityKind() const; - void setAltEntityKind(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); - unsigned char getAltDomain() const; - void setAltDomain(unsigned char pX); + unsigned char getAltEntityKind() const; + void setAltEntityKind(unsigned char pX); - unsigned short getAltCountry() const; - void setAltCountry(unsigned short pX); + unsigned char getAltDomain() const; + void setAltDomain(unsigned char pX); - unsigned char getAltCategory() const; - void setAltCategory(unsigned char pX); + unsigned short getAltCountry() const; + void setAltCountry(unsigned short pX); - unsigned char getAltSubcategory() const; - void setAltSubcategory(unsigned char pX); + unsigned char getAltCategory() const; + void setAltCategory(unsigned char pX); - unsigned char getAltSpecific() const; - void setAltSpecific(unsigned char pX); + unsigned char getAltSubcategory() const; + void setAltSubcategory(unsigned char pX); - unsigned char getAltExtra() const; - void setAltExtra(unsigned char pX); + unsigned char getAltSpecific() const; + void setAltSpecific(unsigned char pX); - float getXVelocity() const; - void setXVelocity(float pX); + unsigned char getAltExtra() const; + void setAltExtra(unsigned char pX); - float getYVelocity() const; - void setYVelocity(float pX); + float getXVelocity() const; + void setXVelocity(float pX); - float getZVelocity() const; - void setZVelocity(float pX); + float getYVelocity() const; + void setYVelocity(float pX); - double getXLocation() const; - void setXLocation(double pX); + float getZVelocity() const; + void setZVelocity(float pX); - double getYLocation() const; - void setYLocation(double pX); + double getXLocation() const; + void setXLocation(double pX); - double getZLocation() const; - void setZLocation(double pX); + double getYLocation() const; + void setYLocation(double pX); - float getPsi() const; - void setPsi(float pX); + double getZLocation() const; + void setZLocation(double pX); - float getTheta() const; - void setTheta(float pX); + float getPsi() const; + void setPsi(float pX); - float getPhi() const; - void setPhi(float pX); + float getTheta() const; + void setTheta(float pX); - int getEntityAppearance() const; - void setEntityAppearance(int pX); + float getPhi() const; + void setPhi(float pX); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + int getEntityAppearance() const; + void setEntityAppearance(int pX); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + unsigned char getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(unsigned char pX); - float getXAcceleration() const; - void setXAcceleration(float pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); - float getYAcceleration() const; - void setYAcceleration(float pX); + float getXAcceleration() const; + void setXAcceleration(float pX); - float getZAcceleration() const; - void setZAcceleration(float pX); + float getYAcceleration() const; + void setYAcceleration(float pX); - float getXAngularVelocity() const; - void setXAngularVelocity(float pX); + float getZAcceleration() const; + void setZAcceleration(float pX); - float getYAngularVelocity() const; - void setYAngularVelocity(float pX); + float getXAngularVelocity() const; + void setXAngularVelocity(float pX); - float getZAngularVelocity() const; - void setZAngularVelocity(float pX); + float getYAngularVelocity() const; + void setYAngularVelocity(float pX); - char* getMarking(); - const char* getMarking() const; - void setMarking( const char* pX); - void setByStringMarking(const char* pX); + float getZAngularVelocity() const; + void setZAngularVelocity(float pX); - int getCapabilities() const; - void setCapabilities(int pX); + char* getMarking(); + const char* getMarking() const; + void setMarking(const char* pX); + void setByStringMarking(const char* pX); - std::vector& getVariableParameters(); - const std::vector& getVariableParameters() const; - void setVariableParameters(const std::vector& pX); + int getCapabilities() const; + void setCapabilities(int pX); + std::vector& getVariableParameters(); + const std::vector& getVariableParameters() const; + void setVariableParameters(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const FastEntityStatePdu& rhs) const; + bool operator==(const FastEntityStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -288,7 +291,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FirePdu.cpp b/src/dis7/FirePdu.cpp index 3a64b043..09fec48a 100644 --- a/src/dis7/FirePdu.cpp +++ b/src/dis7/FirePdu.cpp @@ -2,180 +2,132 @@ using namespace DIS; - -FirePdu::FirePdu() : WarfareFamilyPdu(), - _munitionExpendibleID(), - _eventID(), - _fireMissionIndex(0), - _locationInWorldCoordinates(), - _descriptor(), - _velocity(), - _range(0.0) -{ - setPduType( 2 ); +FirePdu::FirePdu() + : WarfareFamilyPdu(), + _munitionExpendibleID(), + _eventID(), + _fireMissionIndex(0), + _locationInWorldCoordinates(), + _descriptor(), + _velocity(), + _range(0.0) { + setPduType(2); } -FirePdu::~FirePdu() -{ -} +FirePdu::~FirePdu() {} -EntityID& FirePdu::getMunitionExpendibleID() -{ - return _munitionExpendibleID; -} +EntityID& FirePdu::getMunitionExpendibleID() { return _munitionExpendibleID; } -const EntityID& FirePdu::getMunitionExpendibleID() const -{ - return _munitionExpendibleID; +const EntityID& FirePdu::getMunitionExpendibleID() const { + return _munitionExpendibleID; } -void FirePdu::setMunitionExpendibleID(const EntityID &pX) -{ - _munitionExpendibleID = pX; +void FirePdu::setMunitionExpendibleID(const EntityID& pX) { + _munitionExpendibleID = pX; } -EventIdentifier& FirePdu::getEventID() -{ - return _eventID; -} +EventIdentifier& FirePdu::getEventID() { return _eventID; } -const EventIdentifier& FirePdu::getEventID() const -{ - return _eventID; -} +const EventIdentifier& FirePdu::getEventID() const { return _eventID; } -void FirePdu::setEventID(const EventIdentifier &pX) -{ - _eventID = pX; -} +void FirePdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -unsigned int FirePdu::getFireMissionIndex() const -{ - return _fireMissionIndex; -} +unsigned int FirePdu::getFireMissionIndex() const { return _fireMissionIndex; } -void FirePdu::setFireMissionIndex(unsigned int pX) -{ - _fireMissionIndex = pX; -} +void FirePdu::setFireMissionIndex(unsigned int pX) { _fireMissionIndex = pX; } -Vector3Double& FirePdu::getLocationInWorldCoordinates() -{ - return _locationInWorldCoordinates; +Vector3Double& FirePdu::getLocationInWorldCoordinates() { + return _locationInWorldCoordinates; } -const Vector3Double& FirePdu::getLocationInWorldCoordinates() const -{ - return _locationInWorldCoordinates; +const Vector3Double& FirePdu::getLocationInWorldCoordinates() const { + return _locationInWorldCoordinates; } -void FirePdu::setLocationInWorldCoordinates(const Vector3Double &pX) -{ - _locationInWorldCoordinates = pX; +void FirePdu::setLocationInWorldCoordinates(const Vector3Double& pX) { + _locationInWorldCoordinates = pX; } -MunitionDescriptor& FirePdu::getDescriptor() -{ - return _descriptor; -} +MunitionDescriptor& FirePdu::getDescriptor() { return _descriptor; } -const MunitionDescriptor& FirePdu::getDescriptor() const -{ - return _descriptor; -} +const MunitionDescriptor& FirePdu::getDescriptor() const { return _descriptor; } -void FirePdu::setDescriptor(const MunitionDescriptor &pX) -{ - _descriptor = pX; -} +void FirePdu::setDescriptor(const MunitionDescriptor& pX) { _descriptor = pX; } -Vector3Float& FirePdu::getVelocity() -{ - return _velocity; -} +Vector3Float& FirePdu::getVelocity() { return _velocity; } -const Vector3Float& FirePdu::getVelocity() const -{ - return _velocity; -} +const Vector3Float& FirePdu::getVelocity() const { return _velocity; } -void FirePdu::setVelocity(const Vector3Float &pX) -{ - _velocity = pX; -} +void FirePdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -float FirePdu::getRange() const -{ - return _range; -} +float FirePdu::getRange() const { return _range; } -void FirePdu::setRange(float pX) -{ - _range = pX; +void FirePdu::setRange(float pX) { _range = pX; } + +void FirePdu::marshal(DataStream& dataStream) const { + WarfareFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _munitionExpendibleID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _fireMissionIndex; + _locationInWorldCoordinates.marshal(dataStream); + _descriptor.marshal(dataStream); + _velocity.marshal(dataStream); + dataStream << _range; } -void FirePdu::marshal(DataStream& dataStream) const -{ - WarfareFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _munitionExpendibleID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _fireMissionIndex; - _locationInWorldCoordinates.marshal(dataStream); - _descriptor.marshal(dataStream); - _velocity.marshal(dataStream); - dataStream << _range; +void FirePdu::unmarshal(DataStream& dataStream) { + WarfareFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _munitionExpendibleID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _fireMissionIndex; + _locationInWorldCoordinates.unmarshal(dataStream); + _descriptor.unmarshal(dataStream); + _velocity.unmarshal(dataStream); + dataStream >> _range; } -void FirePdu::unmarshal(DataStream& dataStream) -{ - WarfareFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _munitionExpendibleID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _fireMissionIndex; - _locationInWorldCoordinates.unmarshal(dataStream); - _descriptor.unmarshal(dataStream); - _velocity.unmarshal(dataStream); - dataStream >> _range; +bool FirePdu::operator==(const FirePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = WarfareFamilyPdu::operator==(rhs); + + if (!(_munitionExpendibleID == rhs._munitionExpendibleID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_fireMissionIndex == rhs._fireMissionIndex)) ivarsEqual = false; + if (!(_locationInWorldCoordinates == rhs._locationInWorldCoordinates)) + ivarsEqual = false; + if (!(_descriptor == rhs._descriptor)) ivarsEqual = false; + if (!(_velocity == rhs._velocity)) ivarsEqual = false; + if (!(_range == rhs._range)) ivarsEqual = false; + + return ivarsEqual; } +int FirePdu::getMarshalledSize() const { + int marshalSize = 0; -bool FirePdu::operator ==(const FirePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = WarfareFamilyPdu::operator==(rhs); - - if( ! (_munitionExpendibleID == rhs._munitionExpendibleID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_fireMissionIndex == rhs._fireMissionIndex) ) ivarsEqual = false; - if( ! (_locationInWorldCoordinates == rhs._locationInWorldCoordinates) ) ivarsEqual = false; - if( ! (_descriptor == rhs._descriptor) ) ivarsEqual = false; - if( ! (_velocity == rhs._velocity) ) ivarsEqual = false; - if( ! (_range == rhs._range) ) ivarsEqual = false; - - return ivarsEqual; - } - -int FirePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = WarfareFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _munitionExpendibleID.getMarshalledSize(); // _munitionExpendibleID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 4; // _fireMissionIndex - marshalSize = marshalSize + _locationInWorldCoordinates.getMarshalledSize(); // _locationInWorldCoordinates - marshalSize = marshalSize + _descriptor.getMarshalledSize(); // _descriptor - marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity - marshalSize = marshalSize + 4; // _range - return marshalSize; + marshalSize = WarfareFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + + _munitionExpendibleID.getMarshalledSize(); // _munitionExpendibleID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 4; // _fireMissionIndex + marshalSize = + marshalSize + _locationInWorldCoordinates + .getMarshalledSize(); // _locationInWorldCoordinates + marshalSize = marshalSize + _descriptor.getMarshalledSize(); // _descriptor + marshalSize = marshalSize + _velocity.getMarshalledSize(); // _velocity + marshalSize = marshalSize + 4; // _range + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -188,7 +140,7 @@ int FirePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FirePdu.h b/src/dis7/FirePdu.h index dc941975..087530cb 100644 --- a/src/dis7/FirePdu.h +++ b/src/dis7/FirePdu.h @@ -2,92 +2,107 @@ #include #include -#include #include +#include #include #include -#include #include +#include +namespace DIS { +// The firing of a weapon or expendable shall be communicated by issuing a Fire +// PDU. Sectioin 7.3.2. COMPLETE -namespace DIS -{ -// The firing of a weapon or expendable shall be communicated by issuing a Fire PDU. Sectioin 7.3.2. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT FirePdu : public WarfareFamilyPdu -{ -protected: - /** This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28). */ - EntityID _munitionExpendibleID; - - /** This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34). */ - EventIdentifier _eventID; - - /** This field shall identify the fire mission (see 5.4.3.3). This field shall be representedby a 32-bit unsigned integer. */ - unsigned int _fireMissionIndex; - - /** This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97). */ - Vector3Double _locationInWorldCoordinates; - - /** This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4). */ - MunitionDescriptor _descriptor; - - /** This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]. */ - Vector3Float _velocity; - - /** This field shall specify the range that an entity’s fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero. */ - float _range; - +class OPENDIS7_EXPORT FirePdu : public WarfareFamilyPdu { + protected: + /** This field shall specify the entity identification of the fired munition + * or expendable. This field shall be represented by an Entity Identifier + * record (see 6.2.28). */ + EntityID _munitionExpendibleID; + + /** This field shall contain an identification generated by the firing entity + * to associate related firing and detonation events. This field shall be + * represented by an Event Identifier record (see 6.2.34). */ + EventIdentifier _eventID; + + /** This field shall identify the fire mission (see 5.4.3.3). This field shall + * be representedby a 32-bit unsigned integer. */ + unsigned int _fireMissionIndex; + + /** This field shall specify the location, in world coordinates, from which + * the munition was launched, and shall be represented by a World Coordinates + * record (see 6.2.97). */ + Vector3Double _locationInWorldCoordinates; + + /** This field shall describe the firing or launch of a munition or expendable + * represented by one of the following types of Descriptor records: Munition + * Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4). */ + MunitionDescriptor _descriptor; + + /** This field shall specify the velocity of the fired munition at the point + * when the issuing simulation application intends the externally visible + * effects of the launch (e.g. exhaust plume or muzzle blast) to first become + * apparent. The velocity shall be represented in world coordinates. This + * field shall be represented by a Linear Velocity Vector record [see 6.2.95 + * item c)]. */ + Vector3Float _velocity; + + /** This field shall specify the range that an entity’s fire control system + * has assumed in computing the fire control solution. This field shall be + * represented by a 32-bit floating point number in meters. For systems where + * range is unknown or unavailable, this field shall contain a value of zero. + */ + float _range; public: - FirePdu(); - virtual ~FirePdu(); + FirePdu(); + virtual ~FirePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getMunitionExpendibleID(); - const EntityID& getMunitionExpendibleID() const; - void setMunitionExpendibleID(const EntityID &pX); + EntityID& getMunitionExpendibleID(); + const EntityID& getMunitionExpendibleID() const; + void setMunitionExpendibleID(const EntityID& pX); - EventIdentifier& getEventID(); - const EventIdentifier& getEventID() const; - void setEventID(const EventIdentifier &pX); + EventIdentifier& getEventID(); + const EventIdentifier& getEventID() const; + void setEventID(const EventIdentifier& pX); - unsigned int getFireMissionIndex() const; - void setFireMissionIndex(unsigned int pX); + unsigned int getFireMissionIndex() const; + void setFireMissionIndex(unsigned int pX); - Vector3Double& getLocationInWorldCoordinates(); - const Vector3Double& getLocationInWorldCoordinates() const; - void setLocationInWorldCoordinates(const Vector3Double &pX); + Vector3Double& getLocationInWorldCoordinates(); + const Vector3Double& getLocationInWorldCoordinates() const; + void setLocationInWorldCoordinates(const Vector3Double& pX); - MunitionDescriptor& getDescriptor(); - const MunitionDescriptor& getDescriptor() const; - void setDescriptor(const MunitionDescriptor &pX); + MunitionDescriptor& getDescriptor(); + const MunitionDescriptor& getDescriptor() const; + void setDescriptor(const MunitionDescriptor& pX); - Vector3Float& getVelocity(); - const Vector3Float& getVelocity() const; - void setVelocity(const Vector3Float &pX); + Vector3Float& getVelocity(); + const Vector3Float& getVelocity() const; + void setVelocity(const Vector3Float& pX); - float getRange() const; - void setRange(float pX); + float getRange() const; + void setRange(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FirePdu& rhs) const; + bool operator==(const FirePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -100,7 +115,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FixedDatum.cpp b/src/dis7/FixedDatum.cpp index 0839913c..aa099240 100644 --- a/src/dis7/FixedDatum.cpp +++ b/src/dis7/FixedDatum.cpp @@ -2,74 +2,50 @@ using namespace DIS; +FixedDatum::FixedDatum() : _fixedDatumID(0), _fixedDatumValue(0) {} -FixedDatum::FixedDatum(): - _fixedDatumID(0), - _fixedDatumValue(0) -{ -} +FixedDatum::~FixedDatum() {} -FixedDatum::~FixedDatum() -{ -} +unsigned int FixedDatum::getFixedDatumID() const { return _fixedDatumID; } -unsigned int FixedDatum::getFixedDatumID() const -{ - return _fixedDatumID; -} +void FixedDatum::setFixedDatumID(unsigned int pX) { _fixedDatumID = pX; } -void FixedDatum::setFixedDatumID(unsigned int pX) -{ - _fixedDatumID = pX; -} +unsigned int FixedDatum::getFixedDatumValue() const { return _fixedDatumValue; } -unsigned int FixedDatum::getFixedDatumValue() const -{ - return _fixedDatumValue; -} +void FixedDatum::setFixedDatumValue(unsigned int pX) { _fixedDatumValue = pX; } -void FixedDatum::setFixedDatumValue(unsigned int pX) -{ - _fixedDatumValue = pX; +void FixedDatum::marshal(DataStream& dataStream) const { + dataStream << _fixedDatumID; + dataStream << _fixedDatumValue; } -void FixedDatum::marshal(DataStream& dataStream) const -{ - dataStream << _fixedDatumID; - dataStream << _fixedDatumValue; -} - -void FixedDatum::unmarshal(DataStream& dataStream) -{ - dataStream >> _fixedDatumID; - dataStream >> _fixedDatumValue; +void FixedDatum::unmarshal(DataStream& dataStream) { + dataStream >> _fixedDatumID; + dataStream >> _fixedDatumValue; } +bool FixedDatum::operator==(const FixedDatum& rhs) const { + bool ivarsEqual = true; -bool FixedDatum::operator ==(const FixedDatum& rhs) const - { - bool ivarsEqual = true; + if (!(_fixedDatumID == rhs._fixedDatumID)) ivarsEqual = false; + if (!(_fixedDatumValue == rhs._fixedDatumValue)) ivarsEqual = false; - if( ! (_fixedDatumID == rhs._fixedDatumID) ) ivarsEqual = false; - if( ! (_fixedDatumValue == rhs._fixedDatumValue) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int FixedDatum::getMarshalledSize() const -{ - int marshalSize = 0; +int FixedDatum::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _fixedDatumID - marshalSize = marshalSize + 4; // _fixedDatumValue - return marshalSize; + marshalSize = marshalSize + 4; // _fixedDatumID + marshalSize = marshalSize + 4; // _fixedDatumValue + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int FixedDatum::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FixedDatum.h b/src/dis7/FixedDatum.h index 7e67207e..4dce1945 100644 --- a/src/dis7/FixedDatum.h +++ b/src/dis7/FixedDatum.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Fixed Datum Record. Section 6.2.38 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT FixedDatum -{ -protected: +class OPENDIS7_EXPORT FixedDatum { + protected: /** ID of the fixed datum, an enumeration */ - unsigned int _fixedDatumID; + unsigned int _fixedDatumID; /** Value for the fixed datum */ - unsigned int _fixedDatumValue; - + unsigned int _fixedDatumValue; public: - FixedDatum(); - virtual ~FixedDatum(); + FixedDatum(); + virtual ~FixedDatum(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getFixedDatumID() const; - void setFixedDatumID(unsigned int pX); + unsigned int getFixedDatumID() const; + void setFixedDatumID(unsigned int pX); - unsigned int getFixedDatumValue() const; - void setFixedDatumValue(unsigned int pX); + unsigned int getFixedDatumValue() const; + void setFixedDatumValue(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FixedDatum& rhs) const; + bool operator==(const FixedDatum& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FourByteChunk.cpp b/src/dis7/FourByteChunk.cpp index 24861f09..0ccf6a0b 100644 --- a/src/dis7/FourByteChunk.cpp +++ b/src/dis7/FourByteChunk.cpp @@ -2,87 +2,63 @@ using namespace DIS; - -FourByteChunk::FourByteChunk() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 4; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +FourByteChunk::FourByteChunk() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 4; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -FourByteChunk::~FourByteChunk() -{ -} +FourByteChunk::~FourByteChunk() {} -char* FourByteChunk::getOtherParameters() -{ - return _otherParameters; -} +char* FourByteChunk::getOtherParameters() { return _otherParameters; } -const char* FourByteChunk::getOtherParameters() const -{ - return _otherParameters; +const char* FourByteChunk::getOtherParameters() const { + return _otherParameters; } -void FourByteChunk::setOtherParameters(const char* x) -{ - for(int i = 0; i < 4; i++) - { - _otherParameters[i] = x[i]; - } +void FourByteChunk::setOtherParameters(const char* x) { + for (int i = 0; i < 4; i++) { + _otherParameters[i] = x[i]; + } } -void FourByteChunk::marshal(DataStream& dataStream) const -{ - - for(size_t idx = 0; idx < 4; idx++) - { - dataStream << _otherParameters[idx]; - } - +void FourByteChunk::marshal(DataStream& dataStream) const { + for (size_t idx = 0; idx < 4; idx++) { + dataStream << _otherParameters[idx]; + } } -void FourByteChunk::unmarshal(DataStream& dataStream) -{ - - for(size_t idx = 0; idx < 4; idx++) - { - dataStream >> _otherParameters[idx]; - } - +void FourByteChunk::unmarshal(DataStream& dataStream) { + for (size_t idx = 0; idx < 4; idx++) { + dataStream >> _otherParameters[idx]; + } } +bool FourByteChunk::operator==(const FourByteChunk& rhs) const { + bool ivarsEqual = true; -bool FourByteChunk::operator ==(const FourByteChunk& rhs) const - { - bool ivarsEqual = true; - + for (unsigned char idx = 0; idx < 4; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - for(unsigned char idx = 0; idx < 4; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int FourByteChunk::getMarshalledSize() const -{ - int marshalSize = 0; +int FourByteChunk::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4 * 1; // _otherParameters - return marshalSize; + marshalSize = marshalSize + 4 * 1; // _otherParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +71,7 @@ int FourByteChunk::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FourByteChunk.h b/src/dis7/FourByteChunk.h index 32fd46d9..2b5ad8fa 100644 --- a/src/dis7/FourByteChunk.h +++ b/src/dis7/FourByteChunk.h @@ -1,47 +1,43 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 32 bit piece of data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT FourByteChunk -{ -protected: +class OPENDIS7_EXPORT FourByteChunk { + protected: /** four bytes of arbitrary data */ - char _otherParameters[4]; - + char _otherParameters[4]; public: - FourByteChunk(); - virtual ~FourByteChunk(); + FourByteChunk(); + virtual ~FourByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FourByteChunk& rhs) const; + bool operator==(const FourByteChunk& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FundamentalOperationalData.cpp b/src/dis7/FundamentalOperationalData.cpp index f90f4063..c7dd5b26 100644 --- a/src/dis7/FundamentalOperationalData.cpp +++ b/src/dis7/FundamentalOperationalData.cpp @@ -2,194 +2,165 @@ using namespace DIS; +FundamentalOperationalData::FundamentalOperationalData() + : _systemStatus(0), + _dataField1(0), + _informationLayers(0), + _dataField2(0), + _parameter1(0), + _parameter2(0), + _parameter3(0), + _parameter4(0), + _parameter5(0), + _parameter6(0) {} -FundamentalOperationalData::FundamentalOperationalData(): - _systemStatus(0), - _dataField1(0), - _informationLayers(0), - _dataField2(0), - _parameter1(0), - _parameter2(0), - _parameter3(0), - _parameter4(0), - _parameter5(0), - _parameter6(0) -{ -} - -FundamentalOperationalData::~FundamentalOperationalData() -{ -} +FundamentalOperationalData::~FundamentalOperationalData() {} -unsigned char FundamentalOperationalData::getSystemStatus() const -{ - return _systemStatus; +unsigned char FundamentalOperationalData::getSystemStatus() const { + return _systemStatus; } -void FundamentalOperationalData::setSystemStatus(unsigned char pX) -{ - _systemStatus = pX; +void FundamentalOperationalData::setSystemStatus(unsigned char pX) { + _systemStatus = pX; } -unsigned char FundamentalOperationalData::getDataField1() const -{ - return _dataField1; +unsigned char FundamentalOperationalData::getDataField1() const { + return _dataField1; } -void FundamentalOperationalData::setDataField1(unsigned char pX) -{ - _dataField1 = pX; +void FundamentalOperationalData::setDataField1(unsigned char pX) { + _dataField1 = pX; } -unsigned char FundamentalOperationalData::getInformationLayers() const -{ - return _informationLayers; +unsigned char FundamentalOperationalData::getInformationLayers() const { + return _informationLayers; } -void FundamentalOperationalData::setInformationLayers(unsigned char pX) -{ - _informationLayers = pX; +void FundamentalOperationalData::setInformationLayers(unsigned char pX) { + _informationLayers = pX; } -unsigned char FundamentalOperationalData::getDataField2() const -{ - return _dataField2; +unsigned char FundamentalOperationalData::getDataField2() const { + return _dataField2; } -void FundamentalOperationalData::setDataField2(unsigned char pX) -{ - _dataField2 = pX; +void FundamentalOperationalData::setDataField2(unsigned char pX) { + _dataField2 = pX; } -unsigned short FundamentalOperationalData::getParameter1() const -{ - return _parameter1; +unsigned short FundamentalOperationalData::getParameter1() const { + return _parameter1; } -void FundamentalOperationalData::setParameter1(unsigned short pX) -{ - _parameter1 = pX; +void FundamentalOperationalData::setParameter1(unsigned short pX) { + _parameter1 = pX; } -unsigned short FundamentalOperationalData::getParameter2() const -{ - return _parameter2; +unsigned short FundamentalOperationalData::getParameter2() const { + return _parameter2; } -void FundamentalOperationalData::setParameter2(unsigned short pX) -{ - _parameter2 = pX; +void FundamentalOperationalData::setParameter2(unsigned short pX) { + _parameter2 = pX; } -unsigned short FundamentalOperationalData::getParameter3() const -{ - return _parameter3; +unsigned short FundamentalOperationalData::getParameter3() const { + return _parameter3; } -void FundamentalOperationalData::setParameter3(unsigned short pX) -{ - _parameter3 = pX; +void FundamentalOperationalData::setParameter3(unsigned short pX) { + _parameter3 = pX; } -unsigned short FundamentalOperationalData::getParameter4() const -{ - return _parameter4; +unsigned short FundamentalOperationalData::getParameter4() const { + return _parameter4; } -void FundamentalOperationalData::setParameter4(unsigned short pX) -{ - _parameter4 = pX; +void FundamentalOperationalData::setParameter4(unsigned short pX) { + _parameter4 = pX; } -unsigned short FundamentalOperationalData::getParameter5() const -{ - return _parameter5; +unsigned short FundamentalOperationalData::getParameter5() const { + return _parameter5; } -void FundamentalOperationalData::setParameter5(unsigned short pX) -{ - _parameter5 = pX; +void FundamentalOperationalData::setParameter5(unsigned short pX) { + _parameter5 = pX; } -unsigned short FundamentalOperationalData::getParameter6() const -{ - return _parameter6; +unsigned short FundamentalOperationalData::getParameter6() const { + return _parameter6; } -void FundamentalOperationalData::setParameter6(unsigned short pX) -{ - _parameter6 = pX; +void FundamentalOperationalData::setParameter6(unsigned short pX) { + _parameter6 = pX; } -void FundamentalOperationalData::marshal(DataStream& dataStream) const -{ - dataStream << _systemStatus; - dataStream << _dataField1; - dataStream << _informationLayers; - dataStream << _dataField2; - dataStream << _parameter1; - dataStream << _parameter2; - dataStream << _parameter3; - dataStream << _parameter4; - dataStream << _parameter5; - dataStream << _parameter6; +void FundamentalOperationalData::marshal(DataStream& dataStream) const { + dataStream << _systemStatus; + dataStream << _dataField1; + dataStream << _informationLayers; + dataStream << _dataField2; + dataStream << _parameter1; + dataStream << _parameter2; + dataStream << _parameter3; + dataStream << _parameter4; + dataStream << _parameter5; + dataStream << _parameter6; } -void FundamentalOperationalData::unmarshal(DataStream& dataStream) -{ - dataStream >> _systemStatus; - dataStream >> _dataField1; - dataStream >> _informationLayers; - dataStream >> _dataField2; - dataStream >> _parameter1; - dataStream >> _parameter2; - dataStream >> _parameter3; - dataStream >> _parameter4; - dataStream >> _parameter5; - dataStream >> _parameter6; +void FundamentalOperationalData::unmarshal(DataStream& dataStream) { + dataStream >> _systemStatus; + dataStream >> _dataField1; + dataStream >> _informationLayers; + dataStream >> _dataField2; + dataStream >> _parameter1; + dataStream >> _parameter2; + dataStream >> _parameter3; + dataStream >> _parameter4; + dataStream >> _parameter5; + dataStream >> _parameter6; } +bool FundamentalOperationalData::operator==( + const FundamentalOperationalData& rhs) const { + bool ivarsEqual = true; -bool FundamentalOperationalData::operator ==(const FundamentalOperationalData& rhs) const - { - bool ivarsEqual = true; + if (!(_systemStatus == rhs._systemStatus)) ivarsEqual = false; + if (!(_dataField1 == rhs._dataField1)) ivarsEqual = false; + if (!(_informationLayers == rhs._informationLayers)) ivarsEqual = false; + if (!(_dataField2 == rhs._dataField2)) ivarsEqual = false; + if (!(_parameter1 == rhs._parameter1)) ivarsEqual = false; + if (!(_parameter2 == rhs._parameter2)) ivarsEqual = false; + if (!(_parameter3 == rhs._parameter3)) ivarsEqual = false; + if (!(_parameter4 == rhs._parameter4)) ivarsEqual = false; + if (!(_parameter5 == rhs._parameter5)) ivarsEqual = false; + if (!(_parameter6 == rhs._parameter6)) ivarsEqual = false; - if( ! (_systemStatus == rhs._systemStatus) ) ivarsEqual = false; - if( ! (_dataField1 == rhs._dataField1) ) ivarsEqual = false; - if( ! (_informationLayers == rhs._informationLayers) ) ivarsEqual = false; - if( ! (_dataField2 == rhs._dataField2) ) ivarsEqual = false; - if( ! (_parameter1 == rhs._parameter1) ) ivarsEqual = false; - if( ! (_parameter2 == rhs._parameter2) ) ivarsEqual = false; - if( ! (_parameter3 == rhs._parameter3) ) ivarsEqual = false; - if( ! (_parameter4 == rhs._parameter4) ) ivarsEqual = false; - if( ! (_parameter5 == rhs._parameter5) ) ivarsEqual = false; - if( ! (_parameter6 == rhs._parameter6) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int FundamentalOperationalData::getMarshalledSize() const -{ - int marshalSize = 0; +int FundamentalOperationalData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _systemStatus - marshalSize = marshalSize + 1; // _dataField1 - marshalSize = marshalSize + 1; // _informationLayers - marshalSize = marshalSize + 1; // _dataField2 - marshalSize = marshalSize + 2; // _parameter1 - marshalSize = marshalSize + 2; // _parameter2 - marshalSize = marshalSize + 2; // _parameter3 - marshalSize = marshalSize + 2; // _parameter4 - marshalSize = marshalSize + 2; // _parameter5 - marshalSize = marshalSize + 2; // _parameter6 - return marshalSize; + marshalSize = marshalSize + 1; // _systemStatus + marshalSize = marshalSize + 1; // _dataField1 + marshalSize = marshalSize + 1; // _informationLayers + marshalSize = marshalSize + 1; // _dataField2 + marshalSize = marshalSize + 2; // _parameter1 + marshalSize = marshalSize + 2; // _parameter2 + marshalSize = marshalSize + 2; // _parameter3 + marshalSize = marshalSize + 2; // _parameter4 + marshalSize = marshalSize + 2; // _parameter5 + marshalSize = marshalSize + 2; // _parameter6 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -202,7 +173,7 @@ int FundamentalOperationalData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/FundamentalOperationalData.h b/src/dis7/FundamentalOperationalData.h index 54036e66..2652f596 100644 --- a/src/dis7/FundamentalOperationalData.h +++ b/src/dis7/FundamentalOperationalData.h @@ -1,100 +1,96 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Basic operational data for IFF. Section 6.2.40. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT FundamentalOperationalData -{ -protected: +class OPENDIS7_EXPORT FundamentalOperationalData { + protected: /** system status */ - unsigned char _systemStatus; + unsigned char _systemStatus; /** data field 1 */ - unsigned char _dataField1; + unsigned char _dataField1; /** eight boolean fields */ - unsigned char _informationLayers; + unsigned char _informationLayers; /** enumeration */ - unsigned char _dataField2; + unsigned char _dataField2; /** parameter, enumeration */ - unsigned short _parameter1; + unsigned short _parameter1; /** parameter, enumeration */ - unsigned short _parameter2; + unsigned short _parameter2; /** parameter, enumeration */ - unsigned short _parameter3; + unsigned short _parameter3; /** parameter, enumeration */ - unsigned short _parameter4; + unsigned short _parameter4; /** parameter, enumeration */ - unsigned short _parameter5; + unsigned short _parameter5; /** parameter, enumeration */ - unsigned short _parameter6; - + unsigned short _parameter6; public: - FundamentalOperationalData(); - virtual ~FundamentalOperationalData(); + FundamentalOperationalData(); + virtual ~FundamentalOperationalData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getSystemStatus() const; - void setSystemStatus(unsigned char pX); + unsigned char getSystemStatus() const; + void setSystemStatus(unsigned char pX); - unsigned char getDataField1() const; - void setDataField1(unsigned char pX); + unsigned char getDataField1() const; + void setDataField1(unsigned char pX); - unsigned char getInformationLayers() const; - void setInformationLayers(unsigned char pX); + unsigned char getInformationLayers() const; + void setInformationLayers(unsigned char pX); - unsigned char getDataField2() const; - void setDataField2(unsigned char pX); + unsigned char getDataField2() const; + void setDataField2(unsigned char pX); - unsigned short getParameter1() const; - void setParameter1(unsigned short pX); + unsigned short getParameter1() const; + void setParameter1(unsigned short pX); - unsigned short getParameter2() const; - void setParameter2(unsigned short pX); + unsigned short getParameter2() const; + void setParameter2(unsigned short pX); - unsigned short getParameter3() const; - void setParameter3(unsigned short pX); + unsigned short getParameter3() const; + void setParameter3(unsigned short pX); - unsigned short getParameter4() const; - void setParameter4(unsigned short pX); + unsigned short getParameter4() const; + void setParameter4(unsigned short pX); - unsigned short getParameter5() const; - void setParameter5(unsigned short pX); + unsigned short getParameter5() const; + void setParameter5(unsigned short pX); - unsigned short getParameter6() const; - void setParameter6(unsigned short pX); + unsigned short getParameter6() const; + void setParameter6(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const FundamentalOperationalData& rhs) const; + bool operator==(const FundamentalOperationalData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -107,7 +103,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/GridAxis.cpp b/src/dis7/GridAxis.cpp index b2aad63a..2f90083c 100644 --- a/src/dis7/GridAxis.cpp +++ b/src/dis7/GridAxis.cpp @@ -2,149 +2,102 @@ using namespace DIS; +GridAxis::GridAxis() + : _domainInitialXi(0.0), + _domainFinalXi(0.0), + _domainPointsXi(0), + _interleafFactor(0), + _axisType(0), + _numberOfPointsOnXiAxis(0), + _initialIndex(0) {} -GridAxis::GridAxis(): - _domainInitialXi(0.0), - _domainFinalXi(0.0), - _domainPointsXi(0), - _interleafFactor(0), - _axisType(0), - _numberOfPointsOnXiAxis(0), - _initialIndex(0) -{ -} +GridAxis::~GridAxis() {} -GridAxis::~GridAxis() -{ -} +double GridAxis::getDomainInitialXi() const { return _domainInitialXi; } -double GridAxis::getDomainInitialXi() const -{ - return _domainInitialXi; -} +void GridAxis::setDomainInitialXi(double pX) { _domainInitialXi = pX; } -void GridAxis::setDomainInitialXi(double pX) -{ - _domainInitialXi = pX; -} +double GridAxis::getDomainFinalXi() const { return _domainFinalXi; } -double GridAxis::getDomainFinalXi() const -{ - return _domainFinalXi; -} +void GridAxis::setDomainFinalXi(double pX) { _domainFinalXi = pX; } -void GridAxis::setDomainFinalXi(double pX) -{ - _domainFinalXi = pX; -} +unsigned short GridAxis::getDomainPointsXi() const { return _domainPointsXi; } -unsigned short GridAxis::getDomainPointsXi() const -{ - return _domainPointsXi; -} +void GridAxis::setDomainPointsXi(unsigned short pX) { _domainPointsXi = pX; } -void GridAxis::setDomainPointsXi(unsigned short pX) -{ - _domainPointsXi = pX; -} +unsigned char GridAxis::getInterleafFactor() const { return _interleafFactor; } -unsigned char GridAxis::getInterleafFactor() const -{ - return _interleafFactor; -} +void GridAxis::setInterleafFactor(unsigned char pX) { _interleafFactor = pX; } -void GridAxis::setInterleafFactor(unsigned char pX) -{ - _interleafFactor = pX; -} +unsigned char GridAxis::getAxisType() const { return _axisType; } -unsigned char GridAxis::getAxisType() const -{ - return _axisType; -} +void GridAxis::setAxisType(unsigned char pX) { _axisType = pX; } -void GridAxis::setAxisType(unsigned char pX) -{ - _axisType = pX; +unsigned short GridAxis::getNumberOfPointsOnXiAxis() const { + return _numberOfPointsOnXiAxis; } -unsigned short GridAxis::getNumberOfPointsOnXiAxis() const -{ - return _numberOfPointsOnXiAxis; +void GridAxis::setNumberOfPointsOnXiAxis(unsigned short pX) { + _numberOfPointsOnXiAxis = pX; } -void GridAxis::setNumberOfPointsOnXiAxis(unsigned short pX) -{ - _numberOfPointsOnXiAxis = pX; -} +unsigned short GridAxis::getInitialIndex() const { return _initialIndex; } -unsigned short GridAxis::getInitialIndex() const -{ - return _initialIndex; -} +void GridAxis::setInitialIndex(unsigned short pX) { _initialIndex = pX; } -void GridAxis::setInitialIndex(unsigned short pX) -{ - _initialIndex = pX; +void GridAxis::marshal(DataStream& dataStream) const { + dataStream << _domainInitialXi; + dataStream << _domainFinalXi; + dataStream << _domainPointsXi; + dataStream << _interleafFactor; + dataStream << _axisType; + dataStream << _numberOfPointsOnXiAxis; + dataStream << _initialIndex; } -void GridAxis::marshal(DataStream& dataStream) const -{ - dataStream << _domainInitialXi; - dataStream << _domainFinalXi; - dataStream << _domainPointsXi; - dataStream << _interleafFactor; - dataStream << _axisType; - dataStream << _numberOfPointsOnXiAxis; - dataStream << _initialIndex; +void GridAxis::unmarshal(DataStream& dataStream) { + dataStream >> _domainInitialXi; + dataStream >> _domainFinalXi; + dataStream >> _domainPointsXi; + dataStream >> _interleafFactor; + dataStream >> _axisType; + dataStream >> _numberOfPointsOnXiAxis; + dataStream >> _initialIndex; } -void GridAxis::unmarshal(DataStream& dataStream) -{ - dataStream >> _domainInitialXi; - dataStream >> _domainFinalXi; - dataStream >> _domainPointsXi; - dataStream >> _interleafFactor; - dataStream >> _axisType; - dataStream >> _numberOfPointsOnXiAxis; - dataStream >> _initialIndex; +bool GridAxis::operator==(const GridAxis& rhs) const { + bool ivarsEqual = true; + + if (!(_domainInitialXi == rhs._domainInitialXi)) ivarsEqual = false; + if (!(_domainFinalXi == rhs._domainFinalXi)) ivarsEqual = false; + if (!(_domainPointsXi == rhs._domainPointsXi)) ivarsEqual = false; + if (!(_interleafFactor == rhs._interleafFactor)) ivarsEqual = false; + if (!(_axisType == rhs._axisType)) ivarsEqual = false; + if (!(_numberOfPointsOnXiAxis == rhs._numberOfPointsOnXiAxis)) + ivarsEqual = false; + if (!(_initialIndex == rhs._initialIndex)) ivarsEqual = false; + + return ivarsEqual; } +int GridAxis::getMarshalledSize() const { + int marshalSize = 0; -bool GridAxis::operator ==(const GridAxis& rhs) const - { - bool ivarsEqual = true; - - if( ! (_domainInitialXi == rhs._domainInitialXi) ) ivarsEqual = false; - if( ! (_domainFinalXi == rhs._domainFinalXi) ) ivarsEqual = false; - if( ! (_domainPointsXi == rhs._domainPointsXi) ) ivarsEqual = false; - if( ! (_interleafFactor == rhs._interleafFactor) ) ivarsEqual = false; - if( ! (_axisType == rhs._axisType) ) ivarsEqual = false; - if( ! (_numberOfPointsOnXiAxis == rhs._numberOfPointsOnXiAxis) ) ivarsEqual = false; - if( ! (_initialIndex == rhs._initialIndex) ) ivarsEqual = false; - - return ivarsEqual; - } - -int GridAxis::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 8; // _domainInitialXi - marshalSize = marshalSize + 8; // _domainFinalXi - marshalSize = marshalSize + 2; // _domainPointsXi - marshalSize = marshalSize + 1; // _interleafFactor - marshalSize = marshalSize + 1; // _axisType - marshalSize = marshalSize + 2; // _numberOfPointsOnXiAxis - marshalSize = marshalSize + 2; // _initialIndex - return marshalSize; + marshalSize = marshalSize + 8; // _domainInitialXi + marshalSize = marshalSize + 8; // _domainFinalXi + marshalSize = marshalSize + 2; // _domainPointsXi + marshalSize = marshalSize + 1; // _interleafFactor + marshalSize = marshalSize + 1; // _axisType + marshalSize = marshalSize + 2; // _numberOfPointsOnXiAxis + marshalSize = marshalSize + 2; // _initialIndex + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +110,7 @@ int GridAxis::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/GridAxis.h b/src/dis7/GridAxis.h index a04908fd..b3885845 100644 --- a/src/dis7/GridAxis.h +++ b/src/dis7/GridAxis.h @@ -1,82 +1,79 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Grid axis record for fixed data. Section 6.2.41 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT GridAxis -{ -protected: +class OPENDIS7_EXPORT GridAxis { + protected: /** coordinate of the grid origin or initial value */ - double _domainInitialXi; + double _domainInitialXi; /** coordinate of the endpoint or final value */ - double _domainFinalXi; + double _domainFinalXi; - /** The number of grid points along the Xi domain axis for the enviornmental state data */ - unsigned short _domainPointsXi; + /** The number of grid points along the Xi domain axis for the enviornmental + * state data */ + unsigned short _domainPointsXi; /** interleaf factor along the domain axis. */ - unsigned char _interleafFactor; + unsigned char _interleafFactor; /** type of grid axis */ - unsigned char _axisType; + unsigned char _axisType; /** Number of grid locations along Xi axis */ - unsigned short _numberOfPointsOnXiAxis; + unsigned short _numberOfPointsOnXiAxis; /** initial grid point for the current pdu */ - unsigned short _initialIndex; - + unsigned short _initialIndex; public: - GridAxis(); - virtual ~GridAxis(); + GridAxis(); + virtual ~GridAxis(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - double getDomainInitialXi() const; - void setDomainInitialXi(double pX); + double getDomainInitialXi() const; + void setDomainInitialXi(double pX); - double getDomainFinalXi() const; - void setDomainFinalXi(double pX); + double getDomainFinalXi() const; + void setDomainFinalXi(double pX); - unsigned short getDomainPointsXi() const; - void setDomainPointsXi(unsigned short pX); + unsigned short getDomainPointsXi() const; + void setDomainPointsXi(unsigned short pX); - unsigned char getInterleafFactor() const; - void setInterleafFactor(unsigned char pX); + unsigned char getInterleafFactor() const; + void setInterleafFactor(unsigned char pX); - unsigned char getAxisType() const; - void setAxisType(unsigned char pX); + unsigned char getAxisType() const; + void setAxisType(unsigned char pX); - unsigned short getNumberOfPointsOnXiAxis() const; - void setNumberOfPointsOnXiAxis(unsigned short pX); + unsigned short getNumberOfPointsOnXiAxis() const; + void setNumberOfPointsOnXiAxis(unsigned short pX); - unsigned short getInitialIndex() const; - void setInitialIndex(unsigned short pX); + unsigned short getInitialIndex() const; + void setInitialIndex(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const GridAxis& rhs) const; + bool operator==(const GridAxis& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/GroupIdentifier.cpp b/src/dis7/GroupIdentifier.cpp index cbbcc939..a1693e7c 100644 --- a/src/dis7/GroupIdentifier.cpp +++ b/src/dis7/GroupIdentifier.cpp @@ -2,79 +2,59 @@ using namespace DIS; +GroupIdentifier::GroupIdentifier() : _simulationAddress(), _groupNumber(0) {} -GroupIdentifier::GroupIdentifier(): - _simulationAddress(), - _groupNumber(0) -{ -} +GroupIdentifier::~GroupIdentifier() {} -GroupIdentifier::~GroupIdentifier() -{ +EntityType& GroupIdentifier::getSimulationAddress() { + return _simulationAddress; } -EntityType& GroupIdentifier::getSimulationAddress() -{ - return _simulationAddress; +const EntityType& GroupIdentifier::getSimulationAddress() const { + return _simulationAddress; } -const EntityType& GroupIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +void GroupIdentifier::setSimulationAddress(const EntityType& pX) { + _simulationAddress = pX; } -void GroupIdentifier::setSimulationAddress(const EntityType &pX) -{ - _simulationAddress = pX; -} +unsigned short GroupIdentifier::getGroupNumber() const { return _groupNumber; } -unsigned short GroupIdentifier::getGroupNumber() const -{ - return _groupNumber; -} +void GroupIdentifier::setGroupNumber(unsigned short pX) { _groupNumber = pX; } -void GroupIdentifier::setGroupNumber(unsigned short pX) -{ - _groupNumber = pX; +void GroupIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _groupNumber; } -void GroupIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _groupNumber; +void GroupIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _groupNumber; } -void GroupIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _groupNumber; -} +bool GroupIdentifier::operator==(const GroupIdentifier& rhs) const { + bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_groupNumber == rhs._groupNumber)) ivarsEqual = false; -bool GroupIdentifier::operator ==(const GroupIdentifier& rhs) const - { - bool ivarsEqual = true; - - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_groupNumber == rhs._groupNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int GroupIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int GroupIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _groupNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _groupNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +67,7 @@ int GroupIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/GroupIdentifier.h b/src/dis7/GroupIdentifier.h index f54a82d4..b08d58ad 100644 --- a/src/dis7/GroupIdentifier.h +++ b/src/dis7/GroupIdentifier.h @@ -1,54 +1,51 @@ #pragma once #include -#include #include +#include +namespace DIS { +// Unique designation of a group of entities contained in the isGroupOfPdu. +// Represents a group of entities rather than a single entity. Section 6.2.43 -namespace DIS -{ -// Unique designation of a group of entities contained in the isGroupOfPdu. Represents a group of entities rather than a single entity. Section 6.2.43 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT GroupIdentifier -{ -protected: +class OPENDIS7_EXPORT GroupIdentifier { + protected: /** Simulation address (site and application number) */ - EntityType _simulationAddress; + EntityType _simulationAddress; /** group number */ - unsigned short _groupNumber; - + unsigned short _groupNumber; public: - GroupIdentifier(); - virtual ~GroupIdentifier(); + GroupIdentifier(); + virtual ~GroupIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getSimulationAddress(); - const EntityType& getSimulationAddress() const; - void setSimulationAddress(const EntityType &pX); + EntityType& getSimulationAddress(); + const EntityType& getSimulationAddress() const; + void setSimulationAddress(const EntityType& pX); - unsigned short getGroupNumber() const; - void setGroupNumber(unsigned short pX); + unsigned short getGroupNumber() const; + void setGroupNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const GroupIdentifier& rhs) const; + bool operator==(const GroupIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IFFFundamentalParameterData.cpp b/src/dis7/IFFFundamentalParameterData.cpp index a4941129..9793d627 100644 --- a/src/dis7/IFFFundamentalParameterData.cpp +++ b/src/dis7/IFFFundamentalParameterData.cpp @@ -2,177 +2,133 @@ using namespace DIS; - -IFFFundamentalParameterData::IFFFundamentalParameterData(): - _erp(0.0), - _frequency(0.0), - _pgrf(0.0), - _pulseWidth(0.0), - _burstLength(0), - _applicableModes(0) -{ - // Initialize fixed length array - for(int lengthsystemSpecificData= 0; lengthsystemSpecificData < 3; lengthsystemSpecificData++) - { - _systemSpecificData[lengthsystemSpecificData] = 0; - } - +IFFFundamentalParameterData::IFFFundamentalParameterData() + : _erp(0.0), + _frequency(0.0), + _pgrf(0.0), + _pulseWidth(0.0), + _burstLength(0), + _applicableModes(0) { + // Initialize fixed length array + for (int lengthsystemSpecificData = 0; lengthsystemSpecificData < 3; + lengthsystemSpecificData++) { + _systemSpecificData[lengthsystemSpecificData] = 0; + } } -IFFFundamentalParameterData::~IFFFundamentalParameterData() -{ -} +IFFFundamentalParameterData::~IFFFundamentalParameterData() {} -float IFFFundamentalParameterData::getErp() const -{ - return _erp; -} +float IFFFundamentalParameterData::getErp() const { return _erp; } -void IFFFundamentalParameterData::setErp(float pX) -{ - _erp = pX; -} +void IFFFundamentalParameterData::setErp(float pX) { _erp = pX; } -float IFFFundamentalParameterData::getFrequency() const -{ - return _frequency; -} +float IFFFundamentalParameterData::getFrequency() const { return _frequency; } -void IFFFundamentalParameterData::setFrequency(float pX) -{ - _frequency = pX; -} +void IFFFundamentalParameterData::setFrequency(float pX) { _frequency = pX; } -float IFFFundamentalParameterData::getPgrf() const -{ - return _pgrf; -} +float IFFFundamentalParameterData::getPgrf() const { return _pgrf; } -void IFFFundamentalParameterData::setPgrf(float pX) -{ - _pgrf = pX; -} +void IFFFundamentalParameterData::setPgrf(float pX) { _pgrf = pX; } -float IFFFundamentalParameterData::getPulseWidth() const -{ - return _pulseWidth; -} +float IFFFundamentalParameterData::getPulseWidth() const { return _pulseWidth; } -void IFFFundamentalParameterData::setPulseWidth(float pX) -{ - _pulseWidth = pX; -} +void IFFFundamentalParameterData::setPulseWidth(float pX) { _pulseWidth = pX; } -unsigned int IFFFundamentalParameterData::getBurstLength() const -{ - return _burstLength; +unsigned int IFFFundamentalParameterData::getBurstLength() const { + return _burstLength; } -void IFFFundamentalParameterData::setBurstLength(unsigned int pX) -{ - _burstLength = pX; +void IFFFundamentalParameterData::setBurstLength(unsigned int pX) { + _burstLength = pX; } -unsigned char IFFFundamentalParameterData::getApplicableModes() const -{ - return _applicableModes; +unsigned char IFFFundamentalParameterData::getApplicableModes() const { + return _applicableModes; } -void IFFFundamentalParameterData::setApplicableModes(unsigned char pX) -{ - _applicableModes = pX; +void IFFFundamentalParameterData::setApplicableModes(unsigned char pX) { + _applicableModes = pX; } -unsigned char* IFFFundamentalParameterData::getSystemSpecificData() -{ - return _systemSpecificData; +unsigned char* IFFFundamentalParameterData::getSystemSpecificData() { + return _systemSpecificData; } -const unsigned char* IFFFundamentalParameterData::getSystemSpecificData() const -{ - return _systemSpecificData; +const unsigned char* IFFFundamentalParameterData::getSystemSpecificData() + const { + return _systemSpecificData; } -void IFFFundamentalParameterData::setSystemSpecificData(const unsigned char* x) -{ - for(int i = 0; i < 3; i++) - { - _systemSpecificData[i] = x[i]; - } +void IFFFundamentalParameterData::setSystemSpecificData( + const unsigned char* x) { + for (int i = 0; i < 3; i++) { + _systemSpecificData[i] = x[i]; + } } -void IFFFundamentalParameterData::marshal(DataStream& dataStream) const -{ - dataStream << _erp; - dataStream << _frequency; - dataStream << _pgrf; - dataStream << _pulseWidth; - dataStream << _burstLength; - dataStream << _applicableModes; - - for(size_t idx = 0; idx < 3; idx++) - { - dataStream << _systemSpecificData[idx]; - } +void IFFFundamentalParameterData::marshal(DataStream& dataStream) const { + dataStream << _erp; + dataStream << _frequency; + dataStream << _pgrf; + dataStream << _pulseWidth; + dataStream << _burstLength; + dataStream << _applicableModes; + for (size_t idx = 0; idx < 3; idx++) { + dataStream << _systemSpecificData[idx]; + } } -void IFFFundamentalParameterData::unmarshal(DataStream& dataStream) -{ - dataStream >> _erp; - dataStream >> _frequency; - dataStream >> _pgrf; - dataStream >> _pulseWidth; - dataStream >> _burstLength; - dataStream >> _applicableModes; - - for(size_t idx = 0; idx < 3; idx++) - { - dataStream >> _systemSpecificData[idx]; - } +void IFFFundamentalParameterData::unmarshal(DataStream& dataStream) { + dataStream >> _erp; + dataStream >> _frequency; + dataStream >> _pgrf; + dataStream >> _pulseWidth; + dataStream >> _burstLength; + dataStream >> _applicableModes; + for (size_t idx = 0; idx < 3; idx++) { + dataStream >> _systemSpecificData[idx]; + } } +bool IFFFundamentalParameterData::operator==( + const IFFFundamentalParameterData& rhs) const { + bool ivarsEqual = true; -bool IFFFundamentalParameterData::operator ==(const IFFFundamentalParameterData& rhs) const - { - bool ivarsEqual = true; - - if( ! (_erp == rhs._erp) ) ivarsEqual = false; - if( ! (_frequency == rhs._frequency) ) ivarsEqual = false; - if( ! (_pgrf == rhs._pgrf) ) ivarsEqual = false; - if( ! (_pulseWidth == rhs._pulseWidth) ) ivarsEqual = false; - if( ! (_burstLength == rhs._burstLength) ) ivarsEqual = false; - if( ! (_applicableModes == rhs._applicableModes) ) ivarsEqual = false; + if (!(_erp == rhs._erp)) ivarsEqual = false; + if (!(_frequency == rhs._frequency)) ivarsEqual = false; + if (!(_pgrf == rhs._pgrf)) ivarsEqual = false; + if (!(_pulseWidth == rhs._pulseWidth)) ivarsEqual = false; + if (!(_burstLength == rhs._burstLength)) ivarsEqual = false; + if (!(_applicableModes == rhs._applicableModes)) ivarsEqual = false; - for(unsigned char idx = 0; idx < 3; idx++) - { - if(!(_systemSpecificData[idx] == rhs._systemSpecificData[idx]) ) ivarsEqual = false; - } + for (unsigned char idx = 0; idx < 3; idx++) { + if (!(_systemSpecificData[idx] == rhs._systemSpecificData[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - return ivarsEqual; - } - -int IFFFundamentalParameterData::getMarshalledSize() const -{ - int marshalSize = 0; +int IFFFundamentalParameterData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _erp - marshalSize = marshalSize + 4; // _frequency - marshalSize = marshalSize + 4; // _pgrf - marshalSize = marshalSize + 4; // _pulseWidth - marshalSize = marshalSize + 4; // _burstLength - marshalSize = marshalSize + 1; // _applicableModes - marshalSize = marshalSize + 3 * 1; // _systemSpecificData - return marshalSize; + marshalSize = marshalSize + 4; // _erp + marshalSize = marshalSize + 4; // _frequency + marshalSize = marshalSize + 4; // _pgrf + marshalSize = marshalSize + 4; // _pulseWidth + marshalSize = marshalSize + 4; // _burstLength + marshalSize = marshalSize + 1; // _applicableModes + marshalSize = marshalSize + 3 * 1; // _systemSpecificData + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -185,7 +141,7 @@ int IFFFundamentalParameterData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IFFFundamentalParameterData.h b/src/dis7/IFFFundamentalParameterData.h index 24cff119..d7b3a94d 100644 --- a/src/dis7/IFFFundamentalParameterData.h +++ b/src/dis7/IFFFundamentalParameterData.h @@ -1,83 +1,79 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Fundamental IFF atc data. Section 6.2.45 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT IFFFundamentalParameterData -{ -protected: +class OPENDIS7_EXPORT IFFFundamentalParameterData { + protected: /** ERP */ - float _erp; + float _erp; /** frequency */ - float _frequency; + float _frequency; /** pgrf */ - float _pgrf; + float _pgrf; /** Pulse width */ - float _pulseWidth; + float _pulseWidth; /** Burst length */ - unsigned int _burstLength; + unsigned int _burstLength; /** Applicable modes enumeration */ - unsigned char _applicableModes; + unsigned char _applicableModes; /** System-specific data */ - unsigned char _systemSpecificData[3]; - + unsigned char _systemSpecificData[3]; public: - IFFFundamentalParameterData(); - virtual ~IFFFundamentalParameterData(); + IFFFundamentalParameterData(); + virtual ~IFFFundamentalParameterData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getErp() const; - void setErp(float pX); + float getErp() const; + void setErp(float pX); - float getFrequency() const; - void setFrequency(float pX); + float getFrequency() const; + void setFrequency(float pX); - float getPgrf() const; - void setPgrf(float pX); + float getPgrf() const; + void setPgrf(float pX); - float getPulseWidth() const; - void setPulseWidth(float pX); + float getPulseWidth() const; + void setPulseWidth(float pX); - unsigned int getBurstLength() const; - void setBurstLength(unsigned int pX); + unsigned int getBurstLength() const; + void setBurstLength(unsigned int pX); - unsigned char getApplicableModes() const; - void setApplicableModes(unsigned char pX); + unsigned char getApplicableModes() const; + void setApplicableModes(unsigned char pX); - unsigned char* getSystemSpecificData(); - const unsigned char* getSystemSpecificData() const; - void setSystemSpecificData( const unsigned char* pX); + unsigned char* getSystemSpecificData(); + const unsigned char* getSystemSpecificData() const; + void setSystemSpecificData(const unsigned char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IFFFundamentalParameterData& rhs) const; + bool operator==(const IFFFundamentalParameterData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -90,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IFFPdu.cpp b/src/dis7/IFFPdu.cpp index a3866a5a..652d03a3 100644 --- a/src/dis7/IFFPdu.cpp +++ b/src/dis7/IFFPdu.cpp @@ -2,281 +2,220 @@ using namespace DIS; - -IFFPdu::IFFPdu() : DistributedEmissionsFamilyPdu(), - _emittingEntityID(), - _eventID(), - _relativeAntennaLocation(), - _numberOfIFFParameters(0), - _systemID(), - _systemDesignator(0), - _systemSpecificData(0), - _fundamentalOperationalData(), - _layerHeader(), - _beamData(), - _secondaryOperationalData() -{ - setPduType( 28 ); +IFFPdu::IFFPdu() + : DistributedEmissionsFamilyPdu(), + _emittingEntityID(), + _eventID(), + _relativeAntennaLocation(), + _numberOfIFFParameters(0), + _systemID(), + _systemDesignator(0), + _systemSpecificData(0), + _fundamentalOperationalData(), + _layerHeader(), + _beamData(), + _secondaryOperationalData() { + setPduType(28); } -IFFPdu::~IFFPdu() -{ - _iffParameters.clear(); -} +IFFPdu::~IFFPdu() { _iffParameters.clear(); } -EntityID& IFFPdu::getEmittingEntityID() -{ - return _emittingEntityID; -} +EntityID& IFFPdu::getEmittingEntityID() { return _emittingEntityID; } -const EntityID& IFFPdu::getEmittingEntityID() const -{ - return _emittingEntityID; +const EntityID& IFFPdu::getEmittingEntityID() const { + return _emittingEntityID; } -void IFFPdu::setEmittingEntityID(const EntityID &pX) -{ - _emittingEntityID = pX; -} +void IFFPdu::setEmittingEntityID(const EntityID& pX) { _emittingEntityID = pX; } -EventIdentifier& IFFPdu::getEventID() -{ - return _eventID; -} +EventIdentifier& IFFPdu::getEventID() { return _eventID; } -const EventIdentifier& IFFPdu::getEventID() const -{ - return _eventID; -} +const EventIdentifier& IFFPdu::getEventID() const { return _eventID; } -void IFFPdu::setEventID(const EventIdentifier &pX) -{ - _eventID = pX; -} +void IFFPdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -Vector3Float& IFFPdu::getRelativeAntennaLocation() -{ - return _relativeAntennaLocation; +Vector3Float& IFFPdu::getRelativeAntennaLocation() { + return _relativeAntennaLocation; } -const Vector3Float& IFFPdu::getRelativeAntennaLocation() const -{ - return _relativeAntennaLocation; +const Vector3Float& IFFPdu::getRelativeAntennaLocation() const { + return _relativeAntennaLocation; } -void IFFPdu::setRelativeAntennaLocation(const Vector3Float &pX) -{ - _relativeAntennaLocation = pX; +void IFFPdu::setRelativeAntennaLocation(const Vector3Float& pX) { + _relativeAntennaLocation = pX; } -unsigned int IFFPdu::getNumberOfIFFParameters() const -{ - return _numberOfIFFParameters; +unsigned int IFFPdu::getNumberOfIFFParameters() const { + return _numberOfIFFParameters; } -SystemIdentifier& IFFPdu::getSystemID() -{ - return _systemID; -} +SystemIdentifier& IFFPdu::getSystemID() { return _systemID; } -const SystemIdentifier& IFFPdu::getSystemID() const -{ - return _systemID; -} +const SystemIdentifier& IFFPdu::getSystemID() const { return _systemID; } -void IFFPdu::setSystemID(const SystemIdentifier &pX) -{ - _systemID = pX; -} +void IFFPdu::setSystemID(const SystemIdentifier& pX) { _systemID = pX; } -unsigned char IFFPdu::getSystemDesignator() const -{ - return _systemDesignator; -} +unsigned char IFFPdu::getSystemDesignator() const { return _systemDesignator; } -void IFFPdu::setSystemDesignator(unsigned char pX) -{ - _systemDesignator = pX; -} +void IFFPdu::setSystemDesignator(unsigned char pX) { _systemDesignator = pX; } -unsigned char IFFPdu::getSystemSpecificData() const -{ - return _systemSpecificData; +unsigned char IFFPdu::getSystemSpecificData() const { + return _systemSpecificData; } -void IFFPdu::setSystemSpecificData(unsigned char pX) -{ - _systemSpecificData = pX; +void IFFPdu::setSystemSpecificData(unsigned char pX) { + _systemSpecificData = pX; } -FundamentalOperationalData& IFFPdu::getFundamentalOperationalData() -{ - return _fundamentalOperationalData; +FundamentalOperationalData& IFFPdu::getFundamentalOperationalData() { + return _fundamentalOperationalData; } -const FundamentalOperationalData& IFFPdu::getFundamentalOperationalData() const -{ - return _fundamentalOperationalData; +const FundamentalOperationalData& IFFPdu::getFundamentalOperationalData() + const { + return _fundamentalOperationalData; } -void IFFPdu::setFundamentalOperationalData(const FundamentalOperationalData &pX) -{ - _fundamentalOperationalData = pX; +void IFFPdu::setFundamentalOperationalData( + const FundamentalOperationalData& pX) { + _fundamentalOperationalData = pX; } -LayerHeader& IFFPdu::getLayerHeader() -{ - return _layerHeader; -} +LayerHeader& IFFPdu::getLayerHeader() { return _layerHeader; } -const LayerHeader& IFFPdu::getLayerHeader() const -{ - return _layerHeader; -} +const LayerHeader& IFFPdu::getLayerHeader() const { return _layerHeader; } -void IFFPdu::setLayerHeader(const LayerHeader& pX) -{ - _layerHeader = pX; -} +void IFFPdu::setLayerHeader(const LayerHeader& pX) { _layerHeader = pX; } -BeamData& IFFPdu::getBeamData() -{ - return _beamData; -} +BeamData& IFFPdu::getBeamData() { return _beamData; } -const BeamData& IFFPdu::getBeamData() const -{ - return _beamData; -} +const BeamData& IFFPdu::getBeamData() const { return _beamData; } -void IFFPdu::setBeamData(const BeamData& pX) -{ - _beamData = pX; -} +void IFFPdu::setBeamData(const BeamData& pX) { _beamData = pX; } -SecondaryOperationalData& IFFPdu::getSecondaryOperationalData() -{ - return _secondaryOperationalData; +SecondaryOperationalData& IFFPdu::getSecondaryOperationalData() { + return _secondaryOperationalData; } -const SecondaryOperationalData& IFFPdu::getSecondaryOperationalData() const -{ - return _secondaryOperationalData; +const SecondaryOperationalData& IFFPdu::getSecondaryOperationalData() const { + return _secondaryOperationalData; } -void IFFPdu::setSecondaryOperationalData(const SecondaryOperationalData& pX) -{ - _secondaryOperationalData = pX; +void IFFPdu::setSecondaryOperationalData(const SecondaryOperationalData& pX) { + _secondaryOperationalData = pX; } -std::vector& IFFPdu::getIFFParameters() -{ - return _iffParameters; +std::vector& IFFPdu::getIFFParameters() { + return _iffParameters; } -const std::vector& IFFPdu::getIFFParameters() const -{ - return _iffParameters; +const std::vector& IFFPdu::getIFFParameters() + const { + return _iffParameters; } -void IFFPdu::setIFFParameters(const std::vector& pX) -{ - _iffParameters = pX; +void IFFPdu::setIFFParameters( + const std::vector& pX) { + _iffParameters = pX; } -void IFFPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _emittingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - _relativeAntennaLocation.marshal(dataStream); - _systemID.marshal(dataStream); - dataStream << _systemDesignator; - dataStream << _systemSpecificData; - _fundamentalOperationalData.marshal(dataStream); - _layerHeader.marshal(dataStream); - _beamData.marshal(dataStream); - _secondaryOperationalData.marshal(dataStream); - dataStream << ( unsigned char )_iffParameters.size(); - for(size_t idx = 0; idx < _iffParameters.size(); idx++) - { - IFFFundamentalParameterData x = _iffParameters[idx]; - x.marshal(dataStream); - } - +void IFFPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _emittingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + _relativeAntennaLocation.marshal(dataStream); + _systemID.marshal(dataStream); + dataStream << _systemDesignator; + dataStream << _systemSpecificData; + _fundamentalOperationalData.marshal(dataStream); + _layerHeader.marshal(dataStream); + _beamData.marshal(dataStream); + _secondaryOperationalData.marshal(dataStream); + dataStream << (unsigned char)_iffParameters.size(); + for (size_t idx = 0; idx < _iffParameters.size(); idx++) { + IFFFundamentalParameterData x = _iffParameters[idx]; + x.marshal(dataStream); + } } -void IFFPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _emittingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - _relativeAntennaLocation.unmarshal(dataStream); - _systemID.unmarshal(dataStream); - dataStream >> _systemDesignator; - dataStream >> _systemSpecificData; - _fundamentalOperationalData.unmarshal(dataStream); - _layerHeader.unmarshal(dataStream); - _beamData.unmarshal(dataStream); - _secondaryOperationalData.unmarshal(dataStream); - _numberOfIFFParameters = _secondaryOperationalData.getNumberOfIFFFundamentalParameterRecords(); - _iffParameters.clear(); - for(size_t idx = 0; idx < _numberOfIFFParameters; idx++) - { - IFFFundamentalParameterData x; - x.unmarshal(dataStream); - _iffParameters.push_back(x); - } +void IFFPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _emittingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + _relativeAntennaLocation.unmarshal(dataStream); + _systemID.unmarshal(dataStream); + dataStream >> _systemDesignator; + dataStream >> _systemSpecificData; + _fundamentalOperationalData.unmarshal(dataStream); + _layerHeader.unmarshal(dataStream); + _beamData.unmarshal(dataStream); + _secondaryOperationalData.unmarshal(dataStream); + _numberOfIFFParameters = + _secondaryOperationalData.getNumberOfIFFFundamentalParameterRecords(); + _iffParameters.clear(); + for (size_t idx = 0; idx < _numberOfIFFParameters; idx++) { + IFFFundamentalParameterData x; + x.unmarshal(dataStream); + _iffParameters.push_back(x); + } } +bool IFFPdu::operator==(const IFFPdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); -bool IFFPdu::operator ==(const IFFPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - - if( ! (_emittingEntityID == rhs._emittingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_relativeAntennaLocation == rhs._relativeAntennaLocation) ) ivarsEqual = false; - if( ! (_systemID == rhs._systemID) ) ivarsEqual = false; - if( ! (_systemDesignator == rhs._systemDesignator) ) ivarsEqual = false; - if( ! (_systemSpecificData == rhs._systemSpecificData) ) ivarsEqual = false; - if( ! (_fundamentalOperationalData == rhs._fundamentalOperationalData) ) ivarsEqual = false; - if( ! (_layerHeader == rhs._layerHeader) ) ivarsEqual = false; - if( ! (_beamData == rhs._beamData) ) ivarsEqual = false; - if( ! (_secondaryOperationalData == rhs._secondaryOperationalData) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _iffParameters.size(); idx++) - { - if( ! ( _iffParameters[idx] == rhs._iffParameters[idx]) ) ivarsEqual = false; - } - - return ivarsEqual; - } - -int IFFPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + _relativeAntennaLocation.getMarshalledSize(); //_relativeAntennaLocation - marshalSize = marshalSize + 1; // _numberOfIFFParameters - marshalSize = marshalSize + _systemID.getMarshalledSize(); //_systemID - marshalSize = marshalSize + 1; //_systemDesignator - marshalSize = marshalSize + 1; //_systemSpecificData - marshalSize = marshalSize + _fundamentalOperationalData.getMarshalledSize(); // _fundamentalOperationalData - marshalSize = marshalSize + _layerHeader.getMarshalledSize(); // _layerHeader - marshalSize = marshalSize + _beamData.getMarshalledSize(); // _beamData - marshalSize = marshalSize + _secondaryOperationalData.getMarshalledSize(); // _secondaryOperationalData - - for(unsigned long long idx=0; idx < _iffParameters.size(); idx++) - { - IFFFundamentalParameterData listElement = _iffParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; + if (!(_emittingEntityID == rhs._emittingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_relativeAntennaLocation == rhs._relativeAntennaLocation)) + ivarsEqual = false; + if (!(_systemID == rhs._systemID)) ivarsEqual = false; + if (!(_systemDesignator == rhs._systemDesignator)) ivarsEqual = false; + if (!(_systemSpecificData == rhs._systemSpecificData)) ivarsEqual = false; + if (!(_fundamentalOperationalData == rhs._fundamentalOperationalData)) + ivarsEqual = false; + if (!(_layerHeader == rhs._layerHeader)) ivarsEqual = false; + if (!(_beamData == rhs._beamData)) ivarsEqual = false; + if (!(_secondaryOperationalData == rhs._secondaryOperationalData)) + ivarsEqual = false; + + for (size_t idx = 0; idx < _iffParameters.size(); idx++) { + if (!(_iffParameters[idx] == rhs._iffParameters[idx])) ivarsEqual = false; + } + + return ivarsEqual; +} + +int IFFPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = + marshalSize + + _relativeAntennaLocation.getMarshalledSize(); //_relativeAntennaLocation + marshalSize = marshalSize + 1; // _numberOfIFFParameters + marshalSize = marshalSize + _systemID.getMarshalledSize(); //_systemID + marshalSize = marshalSize + 1; //_systemDesignator + marshalSize = marshalSize + 1; //_systemSpecificData + marshalSize = + marshalSize + _fundamentalOperationalData + .getMarshalledSize(); // _fundamentalOperationalData + marshalSize = marshalSize + _layerHeader.getMarshalledSize(); // _layerHeader + marshalSize = marshalSize + _beamData.getMarshalledSize(); // _beamData + marshalSize = + marshalSize + _secondaryOperationalData + .getMarshalledSize(); // _secondaryOperationalData + + for (unsigned long long idx = 0; idx < _iffParameters.size(); idx++) { + IFFFundamentalParameterData listElement = _iffParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } diff --git a/src/dis7/IFFPdu.h b/src/dis7/IFFPdu.h index 7bc8295e..eb1afea5 100644 --- a/src/dis7/IFFPdu.h +++ b/src/dis7/IFFPdu.h @@ -1,34 +1,32 @@ #pragma once +#include + +#include +#include #include #include -#include #include +#include #include -#include #include -#include +#include #include -#include -#include -#include #include +#include - -namespace DIS -{ -//This PDU is written according SISO Standard, the link is on below: -//https://www.sisostds.org/DesktopModules/Bring2mind/DMX/API/Entries/Download?Command=Core_Download&EntryId=36292&PortalId=0&TabId=105 -//Another good document for DIS v6 and v7 is: -//https://www.sisostds.org/DesktopModules/Bring2mind/DMX/API/Entries/Download?Command=Core_Download&EntryId=29289&PortalId=0&TabId=105 +namespace DIS { +// This PDU is written according SISO Standard, the link is on below: +// https://www.sisostds.org/DesktopModules/Bring2mind/DMX/API/Entries/Download?Command=Core_Download&EntryId=36292&PortalId=0&TabId=105 +// Another good document for DIS v6 and v7 is: +// https://www.sisostds.org/DesktopModules/Bring2mind/DMX/API/Entries/Download?Command=Core_Download&EntryId=29289&PortalId=0&TabId=105 // @author semihkurt , 09/04/2021 -class OPENDIS7_EXPORT IFFPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT IFFPdu : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity emitting */ - EntityID _emittingEntityID; + EntityID _emittingEntityID; /** ID of event */ EventIdentifier _eventID; @@ -55,59 +53,58 @@ class OPENDIS7_EXPORT IFFPdu : public DistributedEmissionsFamilyPdu std::vector _iffParameters; public: - IFFPdu(); - virtual ~IFFPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - EntityID& getEmittingEntityID(); - const EntityID& getEmittingEntityID() const; - void setEmittingEntityID(const EntityID &pX); - - EventIdentifier& getEventID(); - const EventIdentifier& getEventID() const; - void setEventID(const EventIdentifier &pX); - - Vector3Float& getRelativeAntennaLocation(); - const Vector3Float& getRelativeAntennaLocation() const; - void setRelativeAntennaLocation(const Vector3Float &pX); - - unsigned int getNumberOfIFFParameters() const; - - SystemIdentifier& getSystemID(); - const SystemIdentifier& getSystemID() const; - void setSystemID(const SystemIdentifier &pX); - - unsigned char getSystemDesignator() const; - void setSystemDesignator(unsigned char pX); - - unsigned char getSystemSpecificData() const; - void setSystemSpecificData(unsigned char pX); - - FundamentalOperationalData& getFundamentalOperationalData(); - const FundamentalOperationalData& getFundamentalOperationalData() const; - void setFundamentalOperationalData(const FundamentalOperationalData &pX); - - LayerHeader& getLayerHeader(); - const LayerHeader& getLayerHeader() const; - void setLayerHeader(const LayerHeader &pX); - - BeamData& getBeamData(); - const BeamData& getBeamData() const; - void setBeamData(const BeamData &pX); - - SecondaryOperationalData& getSecondaryOperationalData(); - const SecondaryOperationalData& getSecondaryOperationalData() const; - void setSecondaryOperationalData(const SecondaryOperationalData &pX); - - std::vector& getIFFParameters(); - const std::vector& getIFFParameters() const; - void setIFFParameters(const std::vector& pX); - -virtual int getMarshalledSize() const; - - bool operator ==(const IFFPdu& rhs) const; -}; -} + IFFPdu(); + virtual ~IFFPdu(); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + + EntityID& getEmittingEntityID(); + const EntityID& getEmittingEntityID() const; + void setEmittingEntityID(const EntityID& pX); + + EventIdentifier& getEventID(); + const EventIdentifier& getEventID() const; + void setEventID(const EventIdentifier& pX); + + Vector3Float& getRelativeAntennaLocation(); + const Vector3Float& getRelativeAntennaLocation() const; + void setRelativeAntennaLocation(const Vector3Float& pX); + + unsigned int getNumberOfIFFParameters() const; + + SystemIdentifier& getSystemID(); + const SystemIdentifier& getSystemID() const; + void setSystemID(const SystemIdentifier& pX); + + unsigned char getSystemDesignator() const; + void setSystemDesignator(unsigned char pX); + + unsigned char getSystemSpecificData() const; + void setSystemSpecificData(unsigned char pX); + + FundamentalOperationalData& getFundamentalOperationalData(); + const FundamentalOperationalData& getFundamentalOperationalData() const; + void setFundamentalOperationalData(const FundamentalOperationalData& pX); + + LayerHeader& getLayerHeader(); + const LayerHeader& getLayerHeader() const; + void setLayerHeader(const LayerHeader& pX); + + BeamData& getBeamData(); + const BeamData& getBeamData() const; + void setBeamData(const BeamData& pX); + + SecondaryOperationalData& getSecondaryOperationalData(); + const SecondaryOperationalData& getSecondaryOperationalData() const; + void setSecondaryOperationalData(const SecondaryOperationalData& pX); + + std::vector& getIFFParameters(); + const std::vector& getIFFParameters() const; + void setIFFParameters(const std::vector& pX); + + virtual int getMarshalledSize() const; + + bool operator==(const IFFPdu& rhs) const; +}; +} // namespace DIS diff --git a/src/dis7/IOCommunicationsNode.cpp b/src/dis7/IOCommunicationsNode.cpp index a6535550..3fa605b4 100644 --- a/src/dis7/IOCommunicationsNode.cpp +++ b/src/dis7/IOCommunicationsNode.cpp @@ -2,139 +2,106 @@ using namespace DIS; +IOCommunicationsNode::IOCommunicationsNode() + : _recordType(5501), + _recordLength(16), + _communcationsNodeType(0), + _padding(0), + _communicationsNode(), + _elementID(0) {} -IOCommunicationsNode::IOCommunicationsNode(): - _recordType(5501), - _recordLength(16), - _communcationsNodeType(0), - _padding(0), - _communicationsNode(), - _elementID(0) -{ -} +IOCommunicationsNode::~IOCommunicationsNode() {} -IOCommunicationsNode::~IOCommunicationsNode() -{ -} +unsigned int IOCommunicationsNode::getRecordType() const { return _recordType; } -unsigned int IOCommunicationsNode::getRecordType() const -{ - return _recordType; -} +void IOCommunicationsNode::setRecordType(unsigned int pX) { _recordType = pX; } -void IOCommunicationsNode::setRecordType(unsigned int pX) -{ - _recordType = pX; +unsigned short IOCommunicationsNode::getRecordLength() const { + return _recordLength; } -unsigned short IOCommunicationsNode::getRecordLength() const -{ - return _recordLength; +void IOCommunicationsNode::setRecordLength(unsigned short pX) { + _recordLength = pX; } -void IOCommunicationsNode::setRecordLength(unsigned short pX) -{ - _recordLength = pX; +unsigned char IOCommunicationsNode::getCommuncationsNodeType() const { + return _communcationsNodeType; } -unsigned char IOCommunicationsNode::getCommuncationsNodeType() const -{ - return _communcationsNodeType; +void IOCommunicationsNode::setCommuncationsNodeType(unsigned char pX) { + _communcationsNodeType = pX; } -void IOCommunicationsNode::setCommuncationsNodeType(unsigned char pX) -{ - _communcationsNodeType = pX; -} +unsigned char IOCommunicationsNode::getPadding() const { return _padding; } -unsigned char IOCommunicationsNode::getPadding() const -{ - return _padding; -} +void IOCommunicationsNode::setPadding(unsigned char pX) { _padding = pX; } -void IOCommunicationsNode::setPadding(unsigned char pX) -{ - _padding = pX; +EntityID& IOCommunicationsNode::getCommunicationsNode() { + return _communicationsNode; } -EntityID& IOCommunicationsNode::getCommunicationsNode() -{ - return _communicationsNode; +const EntityID& IOCommunicationsNode::getCommunicationsNode() const { + return _communicationsNode; } -const EntityID& IOCommunicationsNode::getCommunicationsNode() const -{ - return _communicationsNode; +void IOCommunicationsNode::setCommunicationsNode(const EntityID& pX) { + _communicationsNode = pX; } -void IOCommunicationsNode::setCommunicationsNode(const EntityID &pX) -{ - _communicationsNode = pX; -} +unsigned short IOCommunicationsNode::getElementID() const { return _elementID; } -unsigned short IOCommunicationsNode::getElementID() const -{ - return _elementID; -} - -void IOCommunicationsNode::setElementID(unsigned short pX) -{ - _elementID = pX; -} +void IOCommunicationsNode::setElementID(unsigned short pX) { _elementID = pX; } -void IOCommunicationsNode::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _communcationsNodeType; - dataStream << _padding; - _communicationsNode.marshal(dataStream); - dataStream << _elementID; +void IOCommunicationsNode::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _communcationsNodeType; + dataStream << _padding; + _communicationsNode.marshal(dataStream); + dataStream << _elementID; } -void IOCommunicationsNode::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _communcationsNodeType; - dataStream >> _padding; - _communicationsNode.unmarshal(dataStream); - dataStream >> _elementID; +void IOCommunicationsNode::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _communcationsNodeType; + dataStream >> _padding; + _communicationsNode.unmarshal(dataStream); + dataStream >> _elementID; } +bool IOCommunicationsNode::operator==(const IOCommunicationsNode& rhs) const { + bool ivarsEqual = true; -bool IOCommunicationsNode::operator ==(const IOCommunicationsNode& rhs) const - { - bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_communcationsNodeType == rhs._communcationsNodeType)) + ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_communicationsNode == rhs._communicationsNode)) ivarsEqual = false; + if (!(_elementID == rhs._elementID)) ivarsEqual = false; - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_communcationsNodeType == rhs._communcationsNodeType) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_communicationsNode == rhs._communicationsNode) ) ivarsEqual = false; - if( ! (_elementID == rhs._elementID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int IOCommunicationsNode::getMarshalledSize() const -{ - int marshalSize = 0; +int IOCommunicationsNode::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 1; // _communcationsNodeType - marshalSize = marshalSize + 1; // _padding - marshalSize = marshalSize + _communicationsNode.getMarshalledSize(); // _communicationsNode - marshalSize = marshalSize + 2; // _elementID - return marshalSize; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 1; // _communcationsNodeType + marshalSize = marshalSize + 1; // _padding + marshalSize = marshalSize + + _communicationsNode.getMarshalledSize(); // _communicationsNode + marshalSize = marshalSize + 2; // _elementID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -147,7 +114,7 @@ int IOCommunicationsNode::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IOCommunicationsNode.h b/src/dis7/IOCommunicationsNode.h index 2bb2e2b2..c29ccb6d 100644 --- a/src/dis7/IOCommunicationsNode.h +++ b/src/dis7/IOCommunicationsNode.h @@ -1,72 +1,69 @@ #pragma once #include -#include #include +#include +namespace DIS { +// A communications node that is part of a simulted communcations network. +// Section 6.2.49.2 -namespace DIS -{ -// A communications node that is part of a simulted communcations network. Section 6.2.49.2 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT IOCommunicationsNode -{ -protected: - unsigned int _recordType; - - unsigned short _recordLength; +class OPENDIS7_EXPORT IOCommunicationsNode { + protected: + unsigned int _recordType; - unsigned char _communcationsNodeType; + unsigned short _recordLength; - unsigned char _padding; + unsigned char _communcationsNodeType; - EntityID _communicationsNode; + unsigned char _padding; - unsigned short _elementID; + EntityID _communicationsNode; + unsigned short _elementID; public: - IOCommunicationsNode(); - virtual ~IOCommunicationsNode(); + IOCommunicationsNode(); + virtual ~IOCommunicationsNode(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned char getCommuncationsNodeType() const; - void setCommuncationsNodeType(unsigned char pX); + unsigned char getCommuncationsNodeType() const; + void setCommuncationsNodeType(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); - EntityID& getCommunicationsNode(); - const EntityID& getCommunicationsNode() const; - void setCommunicationsNode(const EntityID &pX); + EntityID& getCommunicationsNode(); + const EntityID& getCommunicationsNode() const; + void setCommunicationsNode(const EntityID& pX); - unsigned short getElementID() const; - void setElementID(unsigned short pX); + unsigned short getElementID() const; + void setElementID(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IOCommunicationsNode& rhs) const; + bool operator==(const IOCommunicationsNode& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -79,7 +76,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IOEffect.cpp b/src/dis7/IOEffect.cpp index 546a3529..5ddc941c 100644 --- a/src/dis7/IOEffect.cpp +++ b/src/dis7/IOEffect.cpp @@ -2,184 +2,125 @@ using namespace DIS; +IOEffect::IOEffect() + : _recordType(5500), + _recordLength(16), + _ioStatus(0), + _ioLinkType(0), + _ioEffect(), + _ioEffectDutyCycle(0), + _ioEffectDuration(0), + _ioProcess(0), + _padding(0) {} -IOEffect::IOEffect(): - _recordType(5500), - _recordLength(16), - _ioStatus(0), - _ioLinkType(0), - _ioEffect(), - _ioEffectDutyCycle(0), - _ioEffectDuration(0), - _ioProcess(0), - _padding(0) -{ -} +IOEffect::~IOEffect() {} -IOEffect::~IOEffect() -{ -} +unsigned int IOEffect::getRecordType() const { return _recordType; } -unsigned int IOEffect::getRecordType() const -{ - return _recordType; -} +void IOEffect::setRecordType(unsigned int pX) { _recordType = pX; } -void IOEffect::setRecordType(unsigned int pX) -{ - _recordType = pX; -} +unsigned short IOEffect::getRecordLength() const { return _recordLength; } -unsigned short IOEffect::getRecordLength() const -{ - return _recordLength; -} +void IOEffect::setRecordLength(unsigned short pX) { _recordLength = pX; } -void IOEffect::setRecordLength(unsigned short pX) -{ - _recordLength = pX; -} +unsigned char IOEffect::getIoStatus() const { return _ioStatus; } -unsigned char IOEffect::getIoStatus() const -{ - return _ioStatus; -} +void IOEffect::setIoStatus(unsigned char pX) { _ioStatus = pX; } -void IOEffect::setIoStatus(unsigned char pX) -{ - _ioStatus = pX; -} +unsigned char IOEffect::getIoLinkType() const { return _ioLinkType; } -unsigned char IOEffect::getIoLinkType() const -{ - return _ioLinkType; -} +void IOEffect::setIoLinkType(unsigned char pX) { _ioLinkType = pX; } -void IOEffect::setIoLinkType(unsigned char pX) -{ - _ioLinkType = pX; -} +EntityID& IOEffect::getIoEffect() { return _ioEffect; } -EntityID& IOEffect::getIoEffect() -{ - return _ioEffect; -} +const EntityID& IOEffect::getIoEffect() const { return _ioEffect; } -const EntityID& IOEffect::getIoEffect() const -{ - return _ioEffect; -} +void IOEffect::setIoEffect(const EntityID& pX) { _ioEffect = pX; } -void IOEffect::setIoEffect(const EntityID &pX) -{ - _ioEffect = pX; +unsigned char IOEffect::getIoEffectDutyCycle() const { + return _ioEffectDutyCycle; } -unsigned char IOEffect::getIoEffectDutyCycle() const -{ - return _ioEffectDutyCycle; +void IOEffect::setIoEffectDutyCycle(unsigned char pX) { + _ioEffectDutyCycle = pX; } -void IOEffect::setIoEffectDutyCycle(unsigned char pX) -{ - _ioEffectDutyCycle = pX; +unsigned short IOEffect::getIoEffectDuration() const { + return _ioEffectDuration; } -unsigned short IOEffect::getIoEffectDuration() const -{ - return _ioEffectDuration; +void IOEffect::setIoEffectDuration(unsigned short pX) { + _ioEffectDuration = pX; } -void IOEffect::setIoEffectDuration(unsigned short pX) -{ - _ioEffectDuration = pX; -} +unsigned short IOEffect::getIoProcess() const { return _ioProcess; } -unsigned short IOEffect::getIoProcess() const -{ - return _ioProcess; -} +void IOEffect::setIoProcess(unsigned short pX) { _ioProcess = pX; } -void IOEffect::setIoProcess(unsigned short pX) -{ - _ioProcess = pX; -} +unsigned short IOEffect::getPadding() const { return _padding; } -unsigned short IOEffect::getPadding() const -{ - return _padding; -} +void IOEffect::setPadding(unsigned short pX) { _padding = pX; } -void IOEffect::setPadding(unsigned short pX) -{ - _padding = pX; +void IOEffect::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _ioStatus; + dataStream << _ioLinkType; + _ioEffect.marshal(dataStream); + dataStream << _ioEffectDutyCycle; + dataStream << _ioEffectDuration; + dataStream << _ioProcess; + dataStream << _padding; } -void IOEffect::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _ioStatus; - dataStream << _ioLinkType; - _ioEffect.marshal(dataStream); - dataStream << _ioEffectDutyCycle; - dataStream << _ioEffectDuration; - dataStream << _ioProcess; - dataStream << _padding; +void IOEffect::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _ioStatus; + dataStream >> _ioLinkType; + _ioEffect.unmarshal(dataStream); + dataStream >> _ioEffectDutyCycle; + dataStream >> _ioEffectDuration; + dataStream >> _ioProcess; + dataStream >> _padding; } -void IOEffect::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _ioStatus; - dataStream >> _ioLinkType; - _ioEffect.unmarshal(dataStream); - dataStream >> _ioEffectDutyCycle; - dataStream >> _ioEffectDuration; - dataStream >> _ioProcess; - dataStream >> _padding; +bool IOEffect::operator==(const IOEffect& rhs) const { + bool ivarsEqual = true; + + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_ioStatus == rhs._ioStatus)) ivarsEqual = false; + if (!(_ioLinkType == rhs._ioLinkType)) ivarsEqual = false; + if (!(_ioEffect == rhs._ioEffect)) ivarsEqual = false; + if (!(_ioEffectDutyCycle == rhs._ioEffectDutyCycle)) ivarsEqual = false; + if (!(_ioEffectDuration == rhs._ioEffectDuration)) ivarsEqual = false; + if (!(_ioProcess == rhs._ioProcess)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + + return ivarsEqual; } +int IOEffect::getMarshalledSize() const { + int marshalSize = 0; -bool IOEffect::operator ==(const IOEffect& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_ioStatus == rhs._ioStatus) ) ivarsEqual = false; - if( ! (_ioLinkType == rhs._ioLinkType) ) ivarsEqual = false; - if( ! (_ioEffect == rhs._ioEffect) ) ivarsEqual = false; - if( ! (_ioEffectDutyCycle == rhs._ioEffectDutyCycle) ) ivarsEqual = false; - if( ! (_ioEffectDuration == rhs._ioEffectDuration) ) ivarsEqual = false; - if( ! (_ioProcess == rhs._ioProcess) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } - -int IOEffect::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 1; // _ioStatus - marshalSize = marshalSize + 1; // _ioLinkType - marshalSize = marshalSize + _ioEffect.getMarshalledSize(); // _ioEffect - marshalSize = marshalSize + 1; // _ioEffectDutyCycle - marshalSize = marshalSize + 2; // _ioEffectDuration - marshalSize = marshalSize + 2; // _ioProcess - marshalSize = marshalSize + 2; // _padding - return marshalSize; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 1; // _ioStatus + marshalSize = marshalSize + 1; // _ioLinkType + marshalSize = marshalSize + _ioEffect.getMarshalledSize(); // _ioEffect + marshalSize = marshalSize + 1; // _ioEffectDutyCycle + marshalSize = marshalSize + 2; // _ioEffectDuration + marshalSize = marshalSize + 2; // _ioProcess + marshalSize = marshalSize + 2; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -192,7 +133,7 @@ int IOEffect::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IOEffect.h b/src/dis7/IOEffect.h index 3ab44a7e..295ee826 100644 --- a/src/dis7/IOEffect.h +++ b/src/dis7/IOEffect.h @@ -1,87 +1,83 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Effect of IO on an entity. Section 6.2.49.3 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT IOEffect -{ -protected: - unsigned int _recordType; - - unsigned short _recordLength; +class OPENDIS7_EXPORT IOEffect { + protected: + unsigned int _recordType; - unsigned char _ioStatus; + unsigned short _recordLength; - unsigned char _ioLinkType; + unsigned char _ioStatus; - EntityID _ioEffect; + unsigned char _ioLinkType; - unsigned char _ioEffectDutyCycle; + EntityID _ioEffect; - unsigned short _ioEffectDuration; + unsigned char _ioEffectDutyCycle; - unsigned short _ioProcess; + unsigned short _ioEffectDuration; - unsigned short _padding; + unsigned short _ioProcess; + unsigned short _padding; public: - IOEffect(); - virtual ~IOEffect(); + IOEffect(); + virtual ~IOEffect(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned char getIoStatus() const; - void setIoStatus(unsigned char pX); + unsigned char getIoStatus() const; + void setIoStatus(unsigned char pX); - unsigned char getIoLinkType() const; - void setIoLinkType(unsigned char pX); + unsigned char getIoLinkType() const; + void setIoLinkType(unsigned char pX); - EntityID& getIoEffect(); - const EntityID& getIoEffect() const; - void setIoEffect(const EntityID &pX); + EntityID& getIoEffect(); + const EntityID& getIoEffect() const; + void setIoEffect(const EntityID& pX); - unsigned char getIoEffectDutyCycle() const; - void setIoEffectDutyCycle(unsigned char pX); + unsigned char getIoEffectDutyCycle() const; + void setIoEffectDutyCycle(unsigned char pX); - unsigned short getIoEffectDuration() const; - void setIoEffectDuration(unsigned short pX); + unsigned short getIoEffectDuration() const; + void setIoEffectDuration(unsigned short pX); - unsigned short getIoProcess() const; - void setIoProcess(unsigned short pX); + unsigned short getIoProcess() const; + void setIoProcess(unsigned short pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IOEffect& rhs) const; + bool operator==(const IOEffect& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -94,7 +90,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IffDataSpecification.cpp b/src/dis7/IffDataSpecification.cpp index 62ff8403..cf514068 100644 --- a/src/dis7/IffDataSpecification.cpp +++ b/src/dis7/IffDataSpecification.cpp @@ -2,64 +2,53 @@ using namespace DIS; +IffDataSpecification::IffDataSpecification() : _numberOfIffDataRecords() {} -IffDataSpecification::IffDataSpecification(): - _numberOfIffDataRecords() -{ -} - -IffDataSpecification::~IffDataSpecification() -{ -} +IffDataSpecification::~IffDataSpecification() {} -EntityType& IffDataSpecification::getNumberOfIffDataRecords() -{ - return _numberOfIffDataRecords; +EntityType& IffDataSpecification::getNumberOfIffDataRecords() { + return _numberOfIffDataRecords; } -const EntityType& IffDataSpecification::getNumberOfIffDataRecords() const -{ - return _numberOfIffDataRecords; +const EntityType& IffDataSpecification::getNumberOfIffDataRecords() const { + return _numberOfIffDataRecords; } -void IffDataSpecification::setNumberOfIffDataRecords(const EntityType &pX) -{ - _numberOfIffDataRecords = pX; +void IffDataSpecification::setNumberOfIffDataRecords(const EntityType& pX) { + _numberOfIffDataRecords = pX; } -void IffDataSpecification::marshal(DataStream& dataStream) const -{ - _numberOfIffDataRecords.marshal(dataStream); +void IffDataSpecification::marshal(DataStream& dataStream) const { + _numberOfIffDataRecords.marshal(dataStream); } -void IffDataSpecification::unmarshal(DataStream& dataStream) -{ - _numberOfIffDataRecords.unmarshal(dataStream); +void IffDataSpecification::unmarshal(DataStream& dataStream) { + _numberOfIffDataRecords.unmarshal(dataStream); } +bool IffDataSpecification::operator==(const IffDataSpecification& rhs) const { + bool ivarsEqual = true; -bool IffDataSpecification::operator ==(const IffDataSpecification& rhs) const - { - bool ivarsEqual = true; + if (!(_numberOfIffDataRecords == rhs._numberOfIffDataRecords)) + ivarsEqual = false; - if( ! (_numberOfIffDataRecords == rhs._numberOfIffDataRecords) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int IffDataSpecification::getMarshalledSize() const -{ - int marshalSize = 0; +int IffDataSpecification::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _numberOfIffDataRecords.getMarshalledSize(); // _numberOfIffDataRecords - return marshalSize; + marshalSize = + marshalSize + + _numberOfIffDataRecords.getMarshalledSize(); // _numberOfIffDataRecords + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -72,7 +61,7 @@ int IffDataSpecification::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IffDataSpecification.h b/src/dis7/IffDataSpecification.h index f04b5ec7..373391ed 100644 --- a/src/dis7/IffDataSpecification.h +++ b/src/dis7/IffDataSpecification.h @@ -1,48 +1,44 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Requires hand coding to be useful. Section 6.2.44 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT IffDataSpecification -{ -protected: +class OPENDIS7_EXPORT IffDataSpecification { + protected: /** Number of iff records */ - EntityType _numberOfIffDataRecords; - + EntityType _numberOfIffDataRecords; public: - IffDataSpecification(); - virtual ~IffDataSpecification(); + IffDataSpecification(); + virtual ~IffDataSpecification(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getNumberOfIffDataRecords(); - const EntityType& getNumberOfIffDataRecords() const; - void setNumberOfIffDataRecords(const EntityType &pX); + EntityType& getNumberOfIffDataRecords(); + const EntityType& getNumberOfIffDataRecords() const; + void setNumberOfIffDataRecords(const EntityType& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IffDataSpecification& rhs) const; + bool operator==(const IffDataSpecification& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -55,7 +51,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IntercomCommunicationsParameters.cpp b/src/dis7/IntercomCommunicationsParameters.cpp index 67d8c47e..d8f16a19 100644 --- a/src/dis7/IntercomCommunicationsParameters.cpp +++ b/src/dis7/IntercomCommunicationsParameters.cpp @@ -2,89 +2,72 @@ using namespace DIS; +IntercomCommunicationsParameters::IntercomCommunicationsParameters() + : _recordType(0), _recordLength(0), _recordSpecificField(0) {} -IntercomCommunicationsParameters::IntercomCommunicationsParameters(): - _recordType(0), - _recordLength(0), - _recordSpecificField(0) -{ -} - -IntercomCommunicationsParameters::~IntercomCommunicationsParameters() -{ -} +IntercomCommunicationsParameters::~IntercomCommunicationsParameters() {} -unsigned short IntercomCommunicationsParameters::getRecordType() const -{ - return _recordType; +unsigned short IntercomCommunicationsParameters::getRecordType() const { + return _recordType; } -void IntercomCommunicationsParameters::setRecordType(unsigned short pX) -{ - _recordType = pX; +void IntercomCommunicationsParameters::setRecordType(unsigned short pX) { + _recordType = pX; } -unsigned short IntercomCommunicationsParameters::getRecordLength() const -{ - return _recordLength; +unsigned short IntercomCommunicationsParameters::getRecordLength() const { + return _recordLength; } -void IntercomCommunicationsParameters::setRecordLength(unsigned short pX) -{ - _recordLength = pX; +void IntercomCommunicationsParameters::setRecordLength(unsigned short pX) { + _recordLength = pX; } -unsigned int IntercomCommunicationsParameters::getRecordSpecificField() const -{ - return _recordSpecificField; +unsigned int IntercomCommunicationsParameters::getRecordSpecificField() const { + return _recordSpecificField; } -void IntercomCommunicationsParameters::setRecordSpecificField(unsigned int pX) -{ - _recordSpecificField = pX; +void IntercomCommunicationsParameters::setRecordSpecificField(unsigned int pX) { + _recordSpecificField = pX; } -void IntercomCommunicationsParameters::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; - dataStream << _recordSpecificField; +void IntercomCommunicationsParameters::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; + dataStream << _recordSpecificField; } -void IntercomCommunicationsParameters::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; - dataStream >> _recordSpecificField; +void IntercomCommunicationsParameters::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; + dataStream >> _recordSpecificField; } +bool IntercomCommunicationsParameters::operator==( + const IntercomCommunicationsParameters& rhs) const { + bool ivarsEqual = true; -bool IntercomCommunicationsParameters::operator ==(const IntercomCommunicationsParameters& rhs) const - { - bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_recordSpecificField == rhs._recordSpecificField)) ivarsEqual = false; - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_recordSpecificField == rhs._recordSpecificField) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int IntercomCommunicationsParameters::getMarshalledSize() const -{ - int marshalSize = 0; +int IntercomCommunicationsParameters::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _recordType - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 4; // _recordSpecificField - return marshalSize; + marshalSize = marshalSize + 2; // _recordType + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 4; // _recordSpecificField + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +80,7 @@ int IntercomCommunicationsParameters::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IntercomCommunicationsParameters.h b/src/dis7/IntercomCommunicationsParameters.h index 07454831..294f7f2a 100644 --- a/src/dis7/IntercomCommunicationsParameters.h +++ b/src/dis7/IntercomCommunicationsParameters.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Intercom communcations parameters. Section 6.2.47. This requires hand coding -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT IntercomCommunicationsParameters -{ -protected: +class OPENDIS7_EXPORT IntercomCommunicationsParameters { + protected: /** Type of intercom parameters record */ - unsigned short _recordType; + unsigned short _recordType; /** length of record */ - unsigned short _recordLength; + unsigned short _recordLength; /** This is a placeholder. */ - unsigned int _recordSpecificField; - + unsigned int _recordSpecificField; public: - IntercomCommunicationsParameters(); - virtual ~IntercomCommunicationsParameters(); + IntercomCommunicationsParameters(); + virtual ~IntercomCommunicationsParameters(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getRecordType() const; - void setRecordType(unsigned short pX); + unsigned short getRecordType() const; + void setRecordType(unsigned short pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned int getRecordSpecificField() const; - void setRecordSpecificField(unsigned int pX); + unsigned int getRecordSpecificField() const; + void setRecordSpecificField(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IntercomCommunicationsParameters& rhs) const; + bool operator==(const IntercomCommunicationsParameters& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IntercomIdentifier.cpp b/src/dis7/IntercomIdentifier.cpp index 33f7b4eb..e2bba694 100644 --- a/src/dis7/IntercomIdentifier.cpp +++ b/src/dis7/IntercomIdentifier.cpp @@ -2,104 +2,82 @@ using namespace DIS; +IntercomIdentifier::IntercomIdentifier() + : _siteNumber(0), + _applicationNumber(0), + _referenceNumber(0), + _intercomNumber(0) {} -IntercomIdentifier::IntercomIdentifier(): - _siteNumber(0), - _applicationNumber(0), - _referenceNumber(0), - _intercomNumber(0) -{ -} +IntercomIdentifier::~IntercomIdentifier() {} -IntercomIdentifier::~IntercomIdentifier() -{ -} +unsigned short IntercomIdentifier::getSiteNumber() const { return _siteNumber; } -unsigned short IntercomIdentifier::getSiteNumber() const -{ - return _siteNumber; -} +void IntercomIdentifier::setSiteNumber(unsigned short pX) { _siteNumber = pX; } -void IntercomIdentifier::setSiteNumber(unsigned short pX) -{ - _siteNumber = pX; +unsigned short IntercomIdentifier::getApplicationNumber() const { + return _applicationNumber; } -unsigned short IntercomIdentifier::getApplicationNumber() const -{ - return _applicationNumber; +void IntercomIdentifier::setApplicationNumber(unsigned short pX) { + _applicationNumber = pX; } -void IntercomIdentifier::setApplicationNumber(unsigned short pX) -{ - _applicationNumber = pX; +unsigned short IntercomIdentifier::getReferenceNumber() const { + return _referenceNumber; } -unsigned short IntercomIdentifier::getReferenceNumber() const -{ - return _referenceNumber; +void IntercomIdentifier::setReferenceNumber(unsigned short pX) { + _referenceNumber = pX; } -void IntercomIdentifier::setReferenceNumber(unsigned short pX) -{ - _referenceNumber = pX; +unsigned short IntercomIdentifier::getIntercomNumber() const { + return _intercomNumber; } -unsigned short IntercomIdentifier::getIntercomNumber() const -{ - return _intercomNumber; +void IntercomIdentifier::setIntercomNumber(unsigned short pX) { + _intercomNumber = pX; } -void IntercomIdentifier::setIntercomNumber(unsigned short pX) -{ - _intercomNumber = pX; +void IntercomIdentifier::marshal(DataStream& dataStream) const { + dataStream << _siteNumber; + dataStream << _applicationNumber; + dataStream << _referenceNumber; + dataStream << _intercomNumber; } -void IntercomIdentifier::marshal(DataStream& dataStream) const -{ - dataStream << _siteNumber; - dataStream << _applicationNumber; - dataStream << _referenceNumber; - dataStream << _intercomNumber; +void IntercomIdentifier::unmarshal(DataStream& dataStream) { + dataStream >> _siteNumber; + dataStream >> _applicationNumber; + dataStream >> _referenceNumber; + dataStream >> _intercomNumber; } -void IntercomIdentifier::unmarshal(DataStream& dataStream) -{ - dataStream >> _siteNumber; - dataStream >> _applicationNumber; - dataStream >> _referenceNumber; - dataStream >> _intercomNumber; -} +bool IntercomIdentifier::operator==(const IntercomIdentifier& rhs) const { + bool ivarsEqual = true; + if (!(_siteNumber == rhs._siteNumber)) ivarsEqual = false; + if (!(_applicationNumber == rhs._applicationNumber)) ivarsEqual = false; + if (!(_referenceNumber == rhs._referenceNumber)) ivarsEqual = false; + if (!(_intercomNumber == rhs._intercomNumber)) ivarsEqual = false; -bool IntercomIdentifier::operator ==(const IntercomIdentifier& rhs) const - { - bool ivarsEqual = true; - - if( ! (_siteNumber == rhs._siteNumber) ) ivarsEqual = false; - if( ! (_applicationNumber == rhs._applicationNumber) ) ivarsEqual = false; - if( ! (_referenceNumber == rhs._referenceNumber) ) ivarsEqual = false; - if( ! (_intercomNumber == rhs._intercomNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int IntercomIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int IntercomIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _siteNumber - marshalSize = marshalSize + 2; // _applicationNumber - marshalSize = marshalSize + 2; // _referenceNumber - marshalSize = marshalSize + 2; // _intercomNumber - return marshalSize; + marshalSize = marshalSize + 2; // _siteNumber + marshalSize = marshalSize + 2; // _applicationNumber + marshalSize = marshalSize + 2; // _referenceNumber + marshalSize = marshalSize + 2; // _intercomNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +90,7 @@ int IntercomIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IntercomIdentifier.h b/src/dis7/IntercomIdentifier.h index b85fd774..f2dbd7f2 100644 --- a/src/dis7/IntercomIdentifier.h +++ b/src/dis7/IntercomIdentifier.h @@ -1,60 +1,57 @@ #pragma once -#include #include +#include +namespace DIS { +// Unique designation of an attached or unattached intercom in an event or +// exercirse. Section 6.2.48 -namespace DIS -{ -// Unique designation of an attached or unattached intercom in an event or exercirse. Section 6.2.48 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT IntercomIdentifier -{ -protected: - unsigned short _siteNumber; - - unsigned short _applicationNumber; +class OPENDIS7_EXPORT IntercomIdentifier { + protected: + unsigned short _siteNumber; - unsigned short _referenceNumber; + unsigned short _applicationNumber; - unsigned short _intercomNumber; + unsigned short _referenceNumber; + unsigned short _intercomNumber; public: - IntercomIdentifier(); - virtual ~IntercomIdentifier(); + IntercomIdentifier(); + virtual ~IntercomIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSiteNumber() const; - void setSiteNumber(unsigned short pX); + unsigned short getSiteNumber() const; + void setSiteNumber(unsigned short pX); - unsigned short getApplicationNumber() const; - void setApplicationNumber(unsigned short pX); + unsigned short getApplicationNumber() const; + void setApplicationNumber(unsigned short pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + unsigned short getReferenceNumber() const; + void setReferenceNumber(unsigned short pX); - unsigned short getIntercomNumber() const; - void setIntercomNumber(unsigned short pX); + unsigned short getIntercomNumber() const; + void setIntercomNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IntercomIdentifier& rhs) const; + bool operator==(const IntercomIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +64,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IntercomSignalPdu.cpp b/src/dis7/IntercomSignalPdu.cpp index b5266b0f..f070c019 100644 --- a/src/dis7/IntercomSignalPdu.cpp +++ b/src/dis7/IntercomSignalPdu.cpp @@ -3,19 +3,24 @@ using namespace DIS; IntercomSignalPdu::IntercomSignalPdu() - : RadioCommunicationsFamilyPdu(), _entityID(), _communicationsDeviceID(0), - _encodingScheme(0), _tdlType(0), _sampleRate(0), _dataLength(0), + : RadioCommunicationsFamilyPdu(), + _entityID(), + _communicationsDeviceID(0), + _encodingScheme(0), + _tdlType(0), + _sampleRate(0), + _dataLength(0), _samples(0) { setPduType(31); } IntercomSignalPdu::~IntercomSignalPdu() { _data.clear(); } -EntityID &IntercomSignalPdu::getEntityID() { return _entityID; } +EntityID& IntercomSignalPdu::getEntityID() { return _entityID; } -const EntityID &IntercomSignalPdu::getEntityID() const { return _entityID; } +const EntityID& IntercomSignalPdu::getEntityID() const { return _entityID; } -void IntercomSignalPdu::setEntityID(const EntityID &pX) { _entityID = pX; } +void IntercomSignalPdu::setEntityID(const EntityID& pX) { _entityID = pX; } unsigned short IntercomSignalPdu::getCommunicationsDeviceID() const { return _communicationsDeviceID; @@ -47,19 +52,15 @@ unsigned short IntercomSignalPdu::getSamples() const { return _samples; } void IntercomSignalPdu::setSamples(unsigned short pX) { _samples = pX; } -std::vector &IntercomSignalPdu::getData() { return _data; } +std::vector& IntercomSignalPdu::getData() { return _data; } -const std::vector &IntercomSignalPdu::getData() const { - return _data; -} +const std::vector& IntercomSignalPdu::getData() const { return _data; } -void IntercomSignalPdu::setData(const std::vector &pX) { - _data = pX; -} +void IntercomSignalPdu::setData(const std::vector& pX) { _data = pX; } -void IntercomSignalPdu::marshal(DataStream &dataStream) const { +void IntercomSignalPdu::marshal(DataStream& dataStream) const { RadioCommunicationsFamilyPdu::marshal( - dataStream); // Marshal information in superclass first + dataStream); // Marshal information in superclass first _entityID.marshal(dataStream); dataStream << _communicationsDeviceID; dataStream << _encodingScheme; @@ -68,14 +69,14 @@ void IntercomSignalPdu::marshal(DataStream &dataStream) const { dataStream << (unsigned short)_data.size(); dataStream << _samples; - for (auto &byte : _data) { + for (auto& byte : _data) { dataStream << byte; } } -void IntercomSignalPdu::unmarshal(DataStream &dataStream) { +void IntercomSignalPdu::unmarshal(DataStream& dataStream) { RadioCommunicationsFamilyPdu::unmarshal( - dataStream); // unmarshal information in superclass first + dataStream); // unmarshal information in superclass first _entityID.unmarshal(dataStream); dataStream >> _communicationsDeviceID; dataStream >> _encodingScheme; @@ -92,27 +93,21 @@ void IntercomSignalPdu::unmarshal(DataStream &dataStream) { } } -bool IntercomSignalPdu::operator==(const IntercomSignalPdu &rhs) const { +bool IntercomSignalPdu::operator==(const IntercomSignalPdu& rhs) const { bool ivarsEqual = true; ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); - if (!(_entityID == rhs._entityID)) - ivarsEqual = false; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; if (!(_communicationsDeviceID == rhs._communicationsDeviceID)) ivarsEqual = false; - if (!(_encodingScheme == rhs._encodingScheme)) - ivarsEqual = false; - if (!(_tdlType == rhs._tdlType)) - ivarsEqual = false; - if (!(_sampleRate == rhs._sampleRate)) - ivarsEqual = false; - if (!(_samples == rhs._samples)) - ivarsEqual = false; + if (!(_encodingScheme == rhs._encodingScheme)) ivarsEqual = false; + if (!(_tdlType == rhs._tdlType)) ivarsEqual = false; + if (!(_sampleRate == rhs._sampleRate)) ivarsEqual = false; + if (!(_samples == rhs._samples)) ivarsEqual = false; for (size_t idx = 0; idx < _data.size(); idx++) { - if (!(_data[idx] == rhs._data[idx])) - ivarsEqual = false; + if (!(_data[idx] == rhs._data[idx])) ivarsEqual = false; } return ivarsEqual; @@ -122,13 +117,13 @@ int IntercomSignalPdu::getMarshalledSize() const { int marshalSize = 0; marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); - marshalSize += _entityID.getMarshalledSize(); // _entityID - marshalSize += 2; // _communicationsDeviceID - marshalSize += 2; // _encodingScheme - marshalSize += 2; // _tdlType - marshalSize += 4; // _sampleRate - marshalSize += 2; // _dataLength - marshalSize += 2; // _samples + marshalSize += _entityID.getMarshalledSize(); // _entityID + marshalSize += 2; // _communicationsDeviceID + marshalSize += 2; // _encodingScheme + marshalSize += 2; // _tdlType + marshalSize += 4; // _sampleRate + marshalSize += 2; // _dataLength + marshalSize += 2; // _samples marshalSize += _data.size(); return marshalSize; diff --git a/src/dis7/IntercomSignalPdu.h b/src/dis7/IntercomSignalPdu.h index 5468f071..4adf9152 100644 --- a/src/dis7/IntercomSignalPdu.h +++ b/src/dis7/IntercomSignalPdu.h @@ -1,10 +1,11 @@ #pragma once +#include + #include #include #include #include -#include namespace DIS { // Actual transmission of intercome voice data. Section 7.7.5. COMPLETE @@ -15,7 +16,7 @@ namespace DIS { // @author DMcG, jkg class OPENDIS7_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { -protected: + protected: /** entity ID */ EntityID _entityID; @@ -40,16 +41,16 @@ class OPENDIS7_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { /** data bytes */ std::vector _data; -public: + public: IntercomSignalPdu(); virtual ~IntercomSignalPdu(); - virtual void marshal(DataStream &dataStream) const; - virtual void unmarshal(DataStream &dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID &getEntityID(); - const EntityID &getEntityID() const; - void setEntityID(const EntityID &pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); unsigned short getCommunicationsDeviceID() const; void setCommunicationsDeviceID(unsigned short pX); @@ -68,15 +69,15 @@ class OPENDIS7_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { unsigned short getSamples() const; void setSamples(unsigned short pX); - std::vector &getData(); - const std::vector &getData() const; - void setData(const std::vector &pX); + std::vector& getData(); + const std::vector& getData() const; + void setData(const std::vector& pX); virtual int getMarshalledSize() const; - bool operator==(const IntercomSignalPdu &rhs) const; + bool operator==(const IntercomSignalPdu& rhs) const; }; -} // namespace DIS +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis7/IsPartOfPdu.cpp b/src/dis7/IsPartOfPdu.cpp index f4066748..206a70e4 100644 --- a/src/dis7/IsPartOfPdu.cpp +++ b/src/dis7/IsPartOfPdu.cpp @@ -2,170 +2,142 @@ using namespace DIS; - -IsPartOfPdu::IsPartOfPdu() : EntityManagementFamilyPdu(), - _orginatingEntityID(), - _receivingEntityID(), - _relationship(), - _partLocation(), - _namedLocationID(), - _partEntityType() -{ - setPduType( 36 ); +IsPartOfPdu::IsPartOfPdu() + : EntityManagementFamilyPdu(), + _orginatingEntityID(), + _receivingEntityID(), + _relationship(), + _partLocation(), + _namedLocationID(), + _partEntityType() { + setPduType(36); } -IsPartOfPdu::~IsPartOfPdu() -{ -} +IsPartOfPdu::~IsPartOfPdu() {} -EntityID& IsPartOfPdu::getOrginatingEntityID() -{ - return _orginatingEntityID; -} +EntityID& IsPartOfPdu::getOrginatingEntityID() { return _orginatingEntityID; } -const EntityID& IsPartOfPdu::getOrginatingEntityID() const -{ - return _orginatingEntityID; +const EntityID& IsPartOfPdu::getOrginatingEntityID() const { + return _orginatingEntityID; } -void IsPartOfPdu::setOrginatingEntityID(const EntityID &pX) -{ - _orginatingEntityID = pX; +void IsPartOfPdu::setOrginatingEntityID(const EntityID& pX) { + _orginatingEntityID = pX; } -EntityID& IsPartOfPdu::getReceivingEntityID() -{ - return _receivingEntityID; -} +EntityID& IsPartOfPdu::getReceivingEntityID() { return _receivingEntityID; } -const EntityID& IsPartOfPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& IsPartOfPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void IsPartOfPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void IsPartOfPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -Relationship& IsPartOfPdu::getRelationship() -{ - return _relationship; -} +Relationship& IsPartOfPdu::getRelationship() { return _relationship; } -const Relationship& IsPartOfPdu::getRelationship() const -{ - return _relationship; +const Relationship& IsPartOfPdu::getRelationship() const { + return _relationship; } -void IsPartOfPdu::setRelationship(const Relationship &pX) -{ - _relationship = pX; +void IsPartOfPdu::setRelationship(const Relationship& pX) { + _relationship = pX; } -Vector3Float& IsPartOfPdu::getPartLocation() -{ - return _partLocation; -} +Vector3Float& IsPartOfPdu::getPartLocation() { return _partLocation; } -const Vector3Float& IsPartOfPdu::getPartLocation() const -{ - return _partLocation; +const Vector3Float& IsPartOfPdu::getPartLocation() const { + return _partLocation; } -void IsPartOfPdu::setPartLocation(const Vector3Float &pX) -{ - _partLocation = pX; +void IsPartOfPdu::setPartLocation(const Vector3Float& pX) { + _partLocation = pX; } -NamedLocationIdentification& IsPartOfPdu::getNamedLocationID() -{ - return _namedLocationID; +NamedLocationIdentification& IsPartOfPdu::getNamedLocationID() { + return _namedLocationID; } -const NamedLocationIdentification& IsPartOfPdu::getNamedLocationID() const -{ - return _namedLocationID; +const NamedLocationIdentification& IsPartOfPdu::getNamedLocationID() const { + return _namedLocationID; } -void IsPartOfPdu::setNamedLocationID(const NamedLocationIdentification &pX) -{ - _namedLocationID = pX; +void IsPartOfPdu::setNamedLocationID(const NamedLocationIdentification& pX) { + _namedLocationID = pX; } -EntityType& IsPartOfPdu::getPartEntityType() -{ - return _partEntityType; -} +EntityType& IsPartOfPdu::getPartEntityType() { return _partEntityType; } -const EntityType& IsPartOfPdu::getPartEntityType() const -{ - return _partEntityType; +const EntityType& IsPartOfPdu::getPartEntityType() const { + return _partEntityType; } -void IsPartOfPdu::setPartEntityType(const EntityType &pX) -{ - _partEntityType = pX; +void IsPartOfPdu::setPartEntityType(const EntityType& pX) { + _partEntityType = pX; } -void IsPartOfPdu::marshal(DataStream& dataStream) const -{ - EntityManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _orginatingEntityID.marshal(dataStream); - _receivingEntityID.marshal(dataStream); - _relationship.marshal(dataStream); - _partLocation.marshal(dataStream); - _namedLocationID.marshal(dataStream); - _partEntityType.marshal(dataStream); +void IsPartOfPdu::marshal(DataStream& dataStream) const { + EntityManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _orginatingEntityID.marshal(dataStream); + _receivingEntityID.marshal(dataStream); + _relationship.marshal(dataStream); + _partLocation.marshal(dataStream); + _namedLocationID.marshal(dataStream); + _partEntityType.marshal(dataStream); } -void IsPartOfPdu::unmarshal(DataStream& dataStream) -{ - EntityManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _orginatingEntityID.unmarshal(dataStream); - _receivingEntityID.unmarshal(dataStream); - _relationship.unmarshal(dataStream); - _partLocation.unmarshal(dataStream); - _namedLocationID.unmarshal(dataStream); - _partEntityType.unmarshal(dataStream); +void IsPartOfPdu::unmarshal(DataStream& dataStream) { + EntityManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _orginatingEntityID.unmarshal(dataStream); + _receivingEntityID.unmarshal(dataStream); + _relationship.unmarshal(dataStream); + _partLocation.unmarshal(dataStream); + _namedLocationID.unmarshal(dataStream); + _partEntityType.unmarshal(dataStream); } +bool IsPartOfPdu::operator==(const IsPartOfPdu& rhs) const { + bool ivarsEqual = true; -bool IsPartOfPdu::operator ==(const IsPartOfPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); - ivarsEqual = EntityManagementFamilyPdu::operator==(rhs); + if (!(_orginatingEntityID == rhs._orginatingEntityID)) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_relationship == rhs._relationship)) ivarsEqual = false; + if (!(_partLocation == rhs._partLocation)) ivarsEqual = false; + if (!(_namedLocationID == rhs._namedLocationID)) ivarsEqual = false; + if (!(_partEntityType == rhs._partEntityType)) ivarsEqual = false; - if( ! (_orginatingEntityID == rhs._orginatingEntityID) ) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_relationship == rhs._relationship) ) ivarsEqual = false; - if( ! (_partLocation == rhs._partLocation) ) ivarsEqual = false; - if( ! (_namedLocationID == rhs._namedLocationID) ) ivarsEqual = false; - if( ! (_partEntityType == rhs._partEntityType) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int IsPartOfPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int IsPartOfPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _relationship.getMarshalledSize(); // _relationship - marshalSize = marshalSize + _partLocation.getMarshalledSize(); // _partLocation - marshalSize = marshalSize + _namedLocationID.getMarshalledSize(); // _namedLocationID - marshalSize = marshalSize + _partEntityType.getMarshalledSize(); // _partEntityType - return marshalSize; + marshalSize = EntityManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = + marshalSize + _relationship.getMarshalledSize(); // _relationship + marshalSize = + marshalSize + _partLocation.getMarshalledSize(); // _partLocation + marshalSize = + marshalSize + _namedLocationID.getMarshalledSize(); // _namedLocationID + marshalSize = + marshalSize + _partEntityType.getMarshalledSize(); // _partEntityType + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -178,7 +150,7 @@ int IsPartOfPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/IsPartOfPdu.h b/src/dis7/IsPartOfPdu.h index 25b2f80d..f97852d4 100644 --- a/src/dis7/IsPartOfPdu.h +++ b/src/dis7/IsPartOfPdu.h @@ -1,89 +1,86 @@ #pragma once #include -#include +#include +#include +#include #include #include -#include -#include -#include -#include #include +#include +namespace DIS { +// The joining of two or more simulation entities is communicated by this PDU. +// Section 7.8.5 COMPLETE -namespace DIS -{ -// The joining of two or more simulation entities is communicated by this PDU. Section 7.8.5 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT IsPartOfPdu : public EntityManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT IsPartOfPdu : public EntityManagementFamilyPdu { + protected: /** ID of entity originating PDU */ - EntityID _orginatingEntityID; + EntityID _orginatingEntityID; /** ID of entity receiving PDU */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** relationship of joined parts */ - Relationship _relationship; + Relationship _relationship; - /** location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0 */ - Vector3Float _partLocation; + /** location of part; centroid of part in host's coordinate system. x=range, + * y=bearing, z=0 */ + Vector3Float _partLocation; /** named location */ - NamedLocationIdentification _namedLocationID; + NamedLocationIdentification _namedLocationID; /** entity type */ - EntityType _partEntityType; - + EntityType _partEntityType; public: - IsPartOfPdu(); - virtual ~IsPartOfPdu(); + IsPartOfPdu(); + virtual ~IsPartOfPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOrginatingEntityID(); - const EntityID& getOrginatingEntityID() const; - void setOrginatingEntityID(const EntityID &pX); + EntityID& getOrginatingEntityID(); + const EntityID& getOrginatingEntityID() const; + void setOrginatingEntityID(const EntityID& pX); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - Relationship& getRelationship(); - const Relationship& getRelationship() const; - void setRelationship(const Relationship &pX); + Relationship& getRelationship(); + const Relationship& getRelationship() const; + void setRelationship(const Relationship& pX); - Vector3Float& getPartLocation(); - const Vector3Float& getPartLocation() const; - void setPartLocation(const Vector3Float &pX); + Vector3Float& getPartLocation(); + const Vector3Float& getPartLocation() const; + void setPartLocation(const Vector3Float& pX); - NamedLocationIdentification& getNamedLocationID(); - const NamedLocationIdentification& getNamedLocationID() const; - void setNamedLocationID(const NamedLocationIdentification &pX); + NamedLocationIdentification& getNamedLocationID(); + const NamedLocationIdentification& getNamedLocationID() const; + void setNamedLocationID(const NamedLocationIdentification& pX); - EntityType& getPartEntityType(); - const EntityType& getPartEntityType() const; - void setPartEntityType(const EntityType &pX); + EntityType& getPartEntityType(); + const EntityType& getPartEntityType() const; + void setPartEntityType(const EntityType& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const IsPartOfPdu& rhs) const; + bool operator==(const IsPartOfPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -96,7 +93,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/JammingTechnique.cpp b/src/dis7/JammingTechnique.cpp index cf7a459c..b68b944a 100644 --- a/src/dis7/JammingTechnique.cpp +++ b/src/dis7/JammingTechnique.cpp @@ -2,104 +2,67 @@ using namespace DIS; +JammingTechnique::JammingTechnique() + : _kind(0), _category(0), _subcategory(0), _specific(0) {} -JammingTechnique::JammingTechnique(): - _kind(0), - _category(0), - _subcategory(0), - _specific(0) -{ -} +JammingTechnique::~JammingTechnique() {} -JammingTechnique::~JammingTechnique() -{ -} +unsigned char JammingTechnique::getKind() const { return _kind; } -unsigned char JammingTechnique::getKind() const -{ - return _kind; -} +void JammingTechnique::setKind(unsigned char pX) { _kind = pX; } -void JammingTechnique::setKind(unsigned char pX) -{ - _kind = pX; -} +unsigned char JammingTechnique::getCategory() const { return _category; } -unsigned char JammingTechnique::getCategory() const -{ - return _category; -} +void JammingTechnique::setCategory(unsigned char pX) { _category = pX; } -void JammingTechnique::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char JammingTechnique::getSubcategory() const { return _subcategory; } -unsigned char JammingTechnique::getSubcategory() const -{ - return _subcategory; -} +void JammingTechnique::setSubcategory(unsigned char pX) { _subcategory = pX; } -void JammingTechnique::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} - -unsigned char JammingTechnique::getSpecific() const -{ - return _specific; -} +unsigned char JammingTechnique::getSpecific() const { return _specific; } -void JammingTechnique::setSpecific(unsigned char pX) -{ - _specific = pX; -} +void JammingTechnique::setSpecific(unsigned char pX) { _specific = pX; } -void JammingTechnique::marshal(DataStream& dataStream) const -{ - dataStream << _kind; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; +void JammingTechnique::marshal(DataStream& dataStream) const { + dataStream << _kind; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; } -void JammingTechnique::unmarshal(DataStream& dataStream) -{ - dataStream >> _kind; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; +void JammingTechnique::unmarshal(DataStream& dataStream) { + dataStream >> _kind; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; } +bool JammingTechnique::operator==(const JammingTechnique& rhs) const { + bool ivarsEqual = true; -bool JammingTechnique::operator ==(const JammingTechnique& rhs) const - { - bool ivarsEqual = true; - - if( ! (_kind == rhs._kind) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; + if (!(_kind == rhs._kind)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int JammingTechnique::getMarshalledSize() const -{ - int marshalSize = 0; +int JammingTechnique::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _kind - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - return marshalSize; + marshalSize = marshalSize + 1; // _kind + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +75,7 @@ int JammingTechnique::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/JammingTechnique.h b/src/dis7/JammingTechnique.h index d8c5cbf9..6bebb53f 100644 --- a/src/dis7/JammingTechnique.h +++ b/src/dis7/JammingTechnique.h @@ -1,60 +1,56 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Jamming technique. Section 6.2.50 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT JammingTechnique -{ -protected: - unsigned char _kind; - - unsigned char _category; +class OPENDIS7_EXPORT JammingTechnique { + protected: + unsigned char _kind; - unsigned char _subcategory; + unsigned char _category; - unsigned char _specific; + unsigned char _subcategory; + unsigned char _specific; public: - JammingTechnique(); - virtual ~JammingTechnique(); + JammingTechnique(); + virtual ~JammingTechnique(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getKind() const; - void setKind(unsigned char pX); + unsigned char getKind() const; + void setKind(unsigned char pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const JammingTechnique& rhs) const; + bool operator==(const JammingTechnique& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LaunchedMunitionRecord.cpp b/src/dis7/LaunchedMunitionRecord.cpp index 0d5551c4..13122f44 100644 --- a/src/dis7/LaunchedMunitionRecord.cpp +++ b/src/dis7/LaunchedMunitionRecord.cpp @@ -2,169 +2,133 @@ using namespace DIS; +LaunchedMunitionRecord::LaunchedMunitionRecord() + : _fireEventID(), + _padding(0), + _firingEntityID(), + _padding2(0), + _targetEntityID(), + _padding3(0), + _targetLocation() {} -LaunchedMunitionRecord::LaunchedMunitionRecord(): - _fireEventID(), - _padding(0), - _firingEntityID(), - _padding2(0), - _targetEntityID(), - _padding3(0), - _targetLocation() -{ -} +LaunchedMunitionRecord::~LaunchedMunitionRecord() {} -LaunchedMunitionRecord::~LaunchedMunitionRecord() -{ +EventIdentifier& LaunchedMunitionRecord::getFireEventID() { + return _fireEventID; } -EventIdentifier& LaunchedMunitionRecord::getFireEventID() -{ - return _fireEventID; +const EventIdentifier& LaunchedMunitionRecord::getFireEventID() const { + return _fireEventID; } -const EventIdentifier& LaunchedMunitionRecord::getFireEventID() const -{ - return _fireEventID; +void LaunchedMunitionRecord::setFireEventID(const EventIdentifier& pX) { + _fireEventID = pX; } -void LaunchedMunitionRecord::setFireEventID(const EventIdentifier &pX) -{ - _fireEventID = pX; -} +unsigned short LaunchedMunitionRecord::getPadding() const { return _padding; } -unsigned short LaunchedMunitionRecord::getPadding() const -{ - return _padding; -} +void LaunchedMunitionRecord::setPadding(unsigned short pX) { _padding = pX; } -void LaunchedMunitionRecord::setPadding(unsigned short pX) -{ - _padding = pX; +EventIdentifier& LaunchedMunitionRecord::getFiringEntityID() { + return _firingEntityID; } -EventIdentifier& LaunchedMunitionRecord::getFiringEntityID() -{ - return _firingEntityID; +const EventIdentifier& LaunchedMunitionRecord::getFiringEntityID() const { + return _firingEntityID; } -const EventIdentifier& LaunchedMunitionRecord::getFiringEntityID() const -{ - return _firingEntityID; +void LaunchedMunitionRecord::setFiringEntityID(const EventIdentifier& pX) { + _firingEntityID = pX; } -void LaunchedMunitionRecord::setFiringEntityID(const EventIdentifier &pX) -{ - _firingEntityID = pX; -} +unsigned short LaunchedMunitionRecord::getPadding2() const { return _padding2; } -unsigned short LaunchedMunitionRecord::getPadding2() const -{ - return _padding2; -} +void LaunchedMunitionRecord::setPadding2(unsigned short pX) { _padding2 = pX; } -void LaunchedMunitionRecord::setPadding2(unsigned short pX) -{ - _padding2 = pX; +EventIdentifier& LaunchedMunitionRecord::getTargetEntityID() { + return _targetEntityID; } -EventIdentifier& LaunchedMunitionRecord::getTargetEntityID() -{ - return _targetEntityID; +const EventIdentifier& LaunchedMunitionRecord::getTargetEntityID() const { + return _targetEntityID; } -const EventIdentifier& LaunchedMunitionRecord::getTargetEntityID() const -{ - return _targetEntityID; +void LaunchedMunitionRecord::setTargetEntityID(const EventIdentifier& pX) { + _targetEntityID = pX; } -void LaunchedMunitionRecord::setTargetEntityID(const EventIdentifier &pX) -{ - _targetEntityID = pX; -} +unsigned short LaunchedMunitionRecord::getPadding3() const { return _padding3; } -unsigned short LaunchedMunitionRecord::getPadding3() const -{ - return _padding3; -} - -void LaunchedMunitionRecord::setPadding3(unsigned short pX) -{ - _padding3 = pX; -} +void LaunchedMunitionRecord::setPadding3(unsigned short pX) { _padding3 = pX; } -Vector3Double& LaunchedMunitionRecord::getTargetLocation() -{ - return _targetLocation; +Vector3Double& LaunchedMunitionRecord::getTargetLocation() { + return _targetLocation; } -const Vector3Double& LaunchedMunitionRecord::getTargetLocation() const -{ - return _targetLocation; +const Vector3Double& LaunchedMunitionRecord::getTargetLocation() const { + return _targetLocation; } -void LaunchedMunitionRecord::setTargetLocation(const Vector3Double &pX) -{ - _targetLocation = pX; +void LaunchedMunitionRecord::setTargetLocation(const Vector3Double& pX) { + _targetLocation = pX; } -void LaunchedMunitionRecord::marshal(DataStream& dataStream) const -{ - _fireEventID.marshal(dataStream); - dataStream << _padding; - _firingEntityID.marshal(dataStream); - dataStream << _padding2; - _targetEntityID.marshal(dataStream); - dataStream << _padding3; - _targetLocation.marshal(dataStream); +void LaunchedMunitionRecord::marshal(DataStream& dataStream) const { + _fireEventID.marshal(dataStream); + dataStream << _padding; + _firingEntityID.marshal(dataStream); + dataStream << _padding2; + _targetEntityID.marshal(dataStream); + dataStream << _padding3; + _targetLocation.marshal(dataStream); } -void LaunchedMunitionRecord::unmarshal(DataStream& dataStream) -{ - _fireEventID.unmarshal(dataStream); - dataStream >> _padding; - _firingEntityID.unmarshal(dataStream); - dataStream >> _padding2; - _targetEntityID.unmarshal(dataStream); - dataStream >> _padding3; - _targetLocation.unmarshal(dataStream); +void LaunchedMunitionRecord::unmarshal(DataStream& dataStream) { + _fireEventID.unmarshal(dataStream); + dataStream >> _padding; + _firingEntityID.unmarshal(dataStream); + dataStream >> _padding2; + _targetEntityID.unmarshal(dataStream); + dataStream >> _padding3; + _targetLocation.unmarshal(dataStream); } +bool LaunchedMunitionRecord::operator==( + const LaunchedMunitionRecord& rhs) const { + bool ivarsEqual = true; -bool LaunchedMunitionRecord::operator ==(const LaunchedMunitionRecord& rhs) const - { - bool ivarsEqual = true; + if (!(_fireEventID == rhs._fireEventID)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + if (!(_firingEntityID == rhs._firingEntityID)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_targetEntityID == rhs._targetEntityID)) ivarsEqual = false; + if (!(_padding3 == rhs._padding3)) ivarsEqual = false; + if (!(_targetLocation == rhs._targetLocation)) ivarsEqual = false; - if( ! (_fireEventID == rhs._fireEventID) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - if( ! (_firingEntityID == rhs._firingEntityID) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_targetEntityID == rhs._targetEntityID) ) ivarsEqual = false; - if( ! (_padding3 == rhs._padding3) ) ivarsEqual = false; - if( ! (_targetLocation == rhs._targetLocation) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LaunchedMunitionRecord::getMarshalledSize() const -{ - int marshalSize = 0; +int LaunchedMunitionRecord::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _fireEventID.getMarshalledSize(); // _fireEventID - marshalSize = marshalSize + 2; // _padding - marshalSize = marshalSize + _firingEntityID.getMarshalledSize(); // _firingEntityID - marshalSize = marshalSize + 2; // _padding2 - marshalSize = marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID - marshalSize = marshalSize + 2; // _padding3 - marshalSize = marshalSize + _targetLocation.getMarshalledSize(); // _targetLocation - return marshalSize; + marshalSize = marshalSize + _fireEventID.getMarshalledSize(); // _fireEventID + marshalSize = marshalSize + 2; // _padding + marshalSize = + marshalSize + _firingEntityID.getMarshalledSize(); // _firingEntityID + marshalSize = marshalSize + 2; // _padding2 + marshalSize = + marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID + marshalSize = marshalSize + 2; // _padding3 + marshalSize = + marshalSize + _targetLocation.getMarshalledSize(); // _targetLocation + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -177,7 +141,7 @@ int LaunchedMunitionRecord::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LaunchedMunitionRecord.h b/src/dis7/LaunchedMunitionRecord.h index abe45a7a..57101454 100644 --- a/src/dis7/LaunchedMunitionRecord.h +++ b/src/dis7/LaunchedMunitionRecord.h @@ -1,83 +1,77 @@ #pragma once -#include -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Identity of a communications node. Section 6.2.51 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LaunchedMunitionRecord -{ -protected: - EventIdentifier _fireEventID; +class OPENDIS7_EXPORT LaunchedMunitionRecord { + protected: + EventIdentifier _fireEventID; - unsigned short _padding; + unsigned short _padding; - EventIdentifier _firingEntityID; + EventIdentifier _firingEntityID; - unsigned short _padding2; + unsigned short _padding2; - EventIdentifier _targetEntityID; + EventIdentifier _targetEntityID; - unsigned short _padding3; - - Vector3Double _targetLocation; + unsigned short _padding3; + Vector3Double _targetLocation; public: - LaunchedMunitionRecord(); - virtual ~LaunchedMunitionRecord(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + LaunchedMunitionRecord(); + virtual ~LaunchedMunitionRecord(); - EventIdentifier& getFireEventID(); - const EventIdentifier& getFireEventID() const; - void setFireEventID(const EventIdentifier &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + EventIdentifier& getFireEventID(); + const EventIdentifier& getFireEventID() const; + void setFireEventID(const EventIdentifier& pX); - EventIdentifier& getFiringEntityID(); - const EventIdentifier& getFiringEntityID() const; - void setFiringEntityID(const EventIdentifier &pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + EventIdentifier& getFiringEntityID(); + const EventIdentifier& getFiringEntityID() const; + void setFiringEntityID(const EventIdentifier& pX); - EventIdentifier& getTargetEntityID(); - const EventIdentifier& getTargetEntityID() const; - void setTargetEntityID(const EventIdentifier &pX); + unsigned short getPadding2() const; + void setPadding2(unsigned short pX); - unsigned short getPadding3() const; - void setPadding3(unsigned short pX); + EventIdentifier& getTargetEntityID(); + const EventIdentifier& getTargetEntityID() const; + void setTargetEntityID(const EventIdentifier& pX); - Vector3Double& getTargetLocation(); - const Vector3Double& getTargetLocation() const; - void setTargetLocation(const Vector3Double &pX); + unsigned short getPadding3() const; + void setPadding3(unsigned short pX); + Vector3Double& getTargetLocation(); + const Vector3Double& getTargetLocation() const; + void setTargetLocation(const Vector3Double& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const LaunchedMunitionRecord& rhs) const; + bool operator==(const LaunchedMunitionRecord& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -90,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LayerHeader.cpp b/src/dis7/LayerHeader.cpp index 17891240..b4db87b9 100644 --- a/src/dis7/LayerHeader.cpp +++ b/src/dis7/LayerHeader.cpp @@ -2,89 +2,64 @@ using namespace DIS; +LayerHeader::LayerHeader() + : _layerNumber(0), _layerSpecificInformation(0), _length(0) {} -LayerHeader::LayerHeader(): - _layerNumber(0), - _layerSpecificInformation(0), - _length(0) -{ -} +LayerHeader::~LayerHeader() {} -LayerHeader::~LayerHeader() -{ -} +unsigned char LayerHeader::getLayerNumber() const { return _layerNumber; } -unsigned char LayerHeader::getLayerNumber() const -{ - return _layerNumber; -} +void LayerHeader::setLayerNumber(unsigned char pX) { _layerNumber = pX; } -void LayerHeader::setLayerNumber(unsigned char pX) -{ - _layerNumber = pX; +unsigned char LayerHeader::getLayerSpecificInformation() const { + return _layerSpecificInformation; } -unsigned char LayerHeader::getLayerSpecificInformation() const -{ - return _layerSpecificInformation; +void LayerHeader::setLayerSpecificInformation(unsigned char pX) { + _layerSpecificInformation = pX; } -void LayerHeader::setLayerSpecificInformation(unsigned char pX) -{ - _layerSpecificInformation = pX; -} +unsigned short LayerHeader::getLength() const { return _length; } -unsigned short LayerHeader::getLength() const -{ - return _length; -} +void LayerHeader::setLength(unsigned short pX) { _length = pX; } -void LayerHeader::setLength(unsigned short pX) -{ - _length = pX; +void LayerHeader::marshal(DataStream& dataStream) const { + dataStream << _layerNumber; + dataStream << _layerSpecificInformation; + dataStream << _length; } -void LayerHeader::marshal(DataStream& dataStream) const -{ - dataStream << _layerNumber; - dataStream << _layerSpecificInformation; - dataStream << _length; -} - -void LayerHeader::unmarshal(DataStream& dataStream) -{ - dataStream >> _layerNumber; - dataStream >> _layerSpecificInformation; - dataStream >> _length; +void LayerHeader::unmarshal(DataStream& dataStream) { + dataStream >> _layerNumber; + dataStream >> _layerSpecificInformation; + dataStream >> _length; } +bool LayerHeader::operator==(const LayerHeader& rhs) const { + bool ivarsEqual = true; -bool LayerHeader::operator ==(const LayerHeader& rhs) const - { - bool ivarsEqual = true; + if (!(_layerNumber == rhs._layerNumber)) ivarsEqual = false; + if (!(_layerSpecificInformation == rhs._layerSpecificInformation)) + ivarsEqual = false; + if (!(_length == rhs._length)) ivarsEqual = false; - if( ! (_layerNumber == rhs._layerNumber) ) ivarsEqual = false; - if( ! (_layerSpecificInformation == rhs._layerSpecificInformation) ) ivarsEqual = false; - if( ! (_length == rhs._length) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LayerHeader::getMarshalledSize() const -{ - int marshalSize = 0; +int LayerHeader::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _layerNumber - marshalSize = marshalSize + 1; // _layerSpecificInformation - marshalSize = marshalSize + 2; // _length - return marshalSize; + marshalSize = marshalSize + 1; // _layerNumber + marshalSize = marshalSize + 1; // _layerSpecificInformation + marshalSize = marshalSize + 2; // _length + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +72,7 @@ int LayerHeader::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LayerHeader.h b/src/dis7/LayerHeader.h index 554fc598..24413564 100644 --- a/src/dis7/LayerHeader.h +++ b/src/dis7/LayerHeader.h @@ -1,57 +1,56 @@ #pragma once -#include #include +#include +namespace DIS { +// The identification of the additional information layer number, layer-specific +// information, and the length of the layer. Section 6.2.52 -namespace DIS -{ -// The identification of the additional information layer number, layer-specific information, and the length of the layer. Section 6.2.52 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LayerHeader -{ -protected: - unsigned char _layerNumber; - - /** field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number. */ - unsigned char _layerSpecificInformation; +class OPENDIS7_EXPORT LayerHeader { + protected: + unsigned char _layerNumber; - /** This field shall specify the length in octets of the layer, including the Layer Header record */ - unsigned short _length; + /** field shall specify layer-specific information that varies by System Type + * (see 6.2.86) and Layer Number. */ + unsigned char _layerSpecificInformation; + /** This field shall specify the length in octets of the layer, including the + * Layer Header record */ + unsigned short _length; public: - LayerHeader(); - virtual ~LayerHeader(); + LayerHeader(); + virtual ~LayerHeader(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getLayerNumber() const; - void setLayerNumber(unsigned char pX); + unsigned char getLayerNumber() const; + void setLayerNumber(unsigned char pX); - unsigned char getLayerSpecificInformation() const; - void setLayerSpecificInformation(unsigned char pX); + unsigned char getLayerSpecificInformation() const; + void setLayerSpecificInformation(unsigned char pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + unsigned short getLength() const; + void setLength(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const LayerHeader& rhs) const; + bool operator==(const LayerHeader& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LinearObjectStatePdu.cpp b/src/dis7/LinearObjectStatePdu.cpp index 51fab8da..90fcd10e 100644 --- a/src/dis7/LinearObjectStatePdu.cpp +++ b/src/dis7/LinearObjectStatePdu.cpp @@ -2,233 +2,193 @@ using namespace DIS; - -LinearObjectStatePdu::LinearObjectStatePdu() : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), - _forceID(0), - _numberOfSegments(0), - _requesterID(), - _receivingID(), - _objectType() -{ - setPduType( 44 ); +LinearObjectStatePdu::LinearObjectStatePdu() + : SyntheticEnvironmentFamilyPdu(), + _objectID(), + _referencedObjectID(), + _updateNumber(0), + _forceID(0), + _numberOfSegments(0), + _requesterID(), + _receivingID(), + _objectType() { + setPduType(44); } -LinearObjectStatePdu::~LinearObjectStatePdu() -{ - _linearSegmentParameters.clear(); +LinearObjectStatePdu::~LinearObjectStatePdu() { + _linearSegmentParameters.clear(); } -EntityID& LinearObjectStatePdu::getObjectID() -{ - return _objectID; -} +EntityID& LinearObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& LinearObjectStatePdu::getObjectID() const -{ - return _objectID; -} +const EntityID& LinearObjectStatePdu::getObjectID() const { return _objectID; } -void LinearObjectStatePdu::setObjectID(const EntityID &pX) -{ - _objectID = pX; -} +void LinearObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } -EntityID& LinearObjectStatePdu::getReferencedObjectID() -{ - return _referencedObjectID; +EntityID& LinearObjectStatePdu::getReferencedObjectID() { + return _referencedObjectID; } -const EntityID& LinearObjectStatePdu::getReferencedObjectID() const -{ - return _referencedObjectID; +const EntityID& LinearObjectStatePdu::getReferencedObjectID() const { + return _referencedObjectID; } -void LinearObjectStatePdu::setReferencedObjectID(const EntityID &pX) -{ - _referencedObjectID = pX; +void LinearObjectStatePdu::setReferencedObjectID(const EntityID& pX) { + _referencedObjectID = pX; } -unsigned short LinearObjectStatePdu::getUpdateNumber() const -{ - return _updateNumber; +unsigned short LinearObjectStatePdu::getUpdateNumber() const { + return _updateNumber; } -void LinearObjectStatePdu::setUpdateNumber(unsigned short pX) -{ - _updateNumber = pX; +void LinearObjectStatePdu::setUpdateNumber(unsigned short pX) { + _updateNumber = pX; } -unsigned char LinearObjectStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char LinearObjectStatePdu::getForceID() const { return _forceID; } -void LinearObjectStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void LinearObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char LinearObjectStatePdu::getNumberOfSegments() const -{ - return _linearSegmentParameters.size(); +unsigned char LinearObjectStatePdu::getNumberOfSegments() const { + return _linearSegmentParameters.size(); } -SimulationAddress& LinearObjectStatePdu::getRequesterID() -{ - return _requesterID; +SimulationAddress& LinearObjectStatePdu::getRequesterID() { + return _requesterID; } -const SimulationAddress& LinearObjectStatePdu::getRequesterID() const -{ - return _requesterID; +const SimulationAddress& LinearObjectStatePdu::getRequesterID() const { + return _requesterID; } -void LinearObjectStatePdu::setRequesterID(const SimulationAddress &pX) -{ - _requesterID = pX; +void LinearObjectStatePdu::setRequesterID(const SimulationAddress& pX) { + _requesterID = pX; } -SimulationAddress& LinearObjectStatePdu::getReceivingID() -{ - return _receivingID; +SimulationAddress& LinearObjectStatePdu::getReceivingID() { + return _receivingID; } -const SimulationAddress& LinearObjectStatePdu::getReceivingID() const -{ - return _receivingID; +const SimulationAddress& LinearObjectStatePdu::getReceivingID() const { + return _receivingID; } -void LinearObjectStatePdu::setReceivingID(const SimulationAddress &pX) -{ - _receivingID = pX; +void LinearObjectStatePdu::setReceivingID(const SimulationAddress& pX) { + _receivingID = pX; } -ObjectType& LinearObjectStatePdu::getObjectType() -{ - return _objectType; -} +ObjectType& LinearObjectStatePdu::getObjectType() { return _objectType; } -const ObjectType& LinearObjectStatePdu::getObjectType() const -{ - return _objectType; +const ObjectType& LinearObjectStatePdu::getObjectType() const { + return _objectType; } -void LinearObjectStatePdu::setObjectType(const ObjectType &pX) -{ - _objectType = pX; +void LinearObjectStatePdu::setObjectType(const ObjectType& pX) { + _objectType = pX; } -std::vector& LinearObjectStatePdu::getLinearSegmentParameters() -{ - return _linearSegmentParameters; +std::vector& +LinearObjectStatePdu::getLinearSegmentParameters() { + return _linearSegmentParameters; } -const std::vector& LinearObjectStatePdu::getLinearSegmentParameters() const -{ - return _linearSegmentParameters; +const std::vector& +LinearObjectStatePdu::getLinearSegmentParameters() const { + return _linearSegmentParameters; } -void LinearObjectStatePdu::setLinearSegmentParameters(const std::vector& pX) -{ - _linearSegmentParameters = pX; +void LinearObjectStatePdu::setLinearSegmentParameters( + const std::vector& pX) { + _linearSegmentParameters = pX; } -void LinearObjectStatePdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _objectID.marshal(dataStream); - _referencedObjectID.marshal(dataStream); - dataStream << _updateNumber; - dataStream << _forceID; - dataStream << ( unsigned char )_linearSegmentParameters.size(); - _requesterID.marshal(dataStream); - _receivingID.marshal(dataStream); - _objectType.marshal(dataStream); - - for(size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) - { - LinearSegmentParameter x = _linearSegmentParameters[idx]; - x.marshal(dataStream); - } - -} +void LinearObjectStatePdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _objectID.marshal(dataStream); + _referencedObjectID.marshal(dataStream); + dataStream << _updateNumber; + dataStream << _forceID; + dataStream << (unsigned char)_linearSegmentParameters.size(); + _requesterID.marshal(dataStream); + _receivingID.marshal(dataStream); + _objectType.marshal(dataStream); -void LinearObjectStatePdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _objectID.unmarshal(dataStream); - _referencedObjectID.unmarshal(dataStream); - dataStream >> _updateNumber; - dataStream >> _forceID; - dataStream >> _numberOfSegments; - _requesterID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - _objectType.unmarshal(dataStream); - - _linearSegmentParameters.clear(); - for(size_t idx = 0; idx < _numberOfSegments; idx++) - { - LinearSegmentParameter x; - x.unmarshal(dataStream); - _linearSegmentParameters.push_back(x); - } + for (size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { + LinearSegmentParameter x = _linearSegmentParameters[idx]; + x.marshal(dataStream); + } } +void LinearObjectStatePdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _objectID.unmarshal(dataStream); + _referencedObjectID.unmarshal(dataStream); + dataStream >> _updateNumber; + dataStream >> _forceID; + dataStream >> _numberOfSegments; + _requesterID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + _objectType.unmarshal(dataStream); -bool LinearObjectStatePdu::operator ==(const LinearObjectStatePdu& rhs) const - { - bool ivarsEqual = true; + _linearSegmentParameters.clear(); + for (size_t idx = 0; idx < _numberOfSegments; idx++) { + LinearSegmentParameter x; + x.unmarshal(dataStream); + _linearSegmentParameters.push_back(x); + } +} - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); +bool LinearObjectStatePdu::operator==(const LinearObjectStatePdu& rhs) const { + bool ivarsEqual = true; - if( ! (_objectID == rhs._objectID) ) ivarsEqual = false; - if( ! (_referencedObjectID == rhs._referencedObjectID) ) ivarsEqual = false; - if( ! (_updateNumber == rhs._updateNumber) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_requesterID == rhs._requesterID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_objectType == rhs._objectType) ) ivarsEqual = false; + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) - { - if( ! ( _linearSegmentParameters[idx] == rhs._linearSegmentParameters[idx]) ) ivarsEqual = false; - } + if (!(_objectID == rhs._objectID)) ivarsEqual = false; + if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; + if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_objectType == rhs._objectType)) ivarsEqual = false; + for (size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { + if (!(_linearSegmentParameters[idx] == rhs._linearSegmentParameters[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int LinearObjectStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int LinearObjectStatePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _numberOfSegments - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID + marshalSize = marshalSize + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshalSize = marshalSize + 2; // _updateNumber + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _numberOfSegments + marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - for(unsigned long long idx=0; idx < _linearSegmentParameters.size(); idx++) - { - LinearSegmentParameter listElement = _linearSegmentParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _linearSegmentParameters.size(); + idx++) { + LinearSegmentParameter listElement = _linearSegmentParameters[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -241,7 +201,7 @@ int LinearObjectStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LinearObjectStatePdu.h b/src/dis7/LinearObjectStatePdu.h index 46167f6c..1ab66cd3 100644 --- a/src/dis7/LinearObjectStatePdu.h +++ b/src/dis7/LinearObjectStatePdu.h @@ -1,107 +1,106 @@ #pragma once +#include + #include -#include -#include -#include -#include #include -#include +#include +#include #include -#include #include +#include +namespace DIS { +// : Information abut the addition or modification of a synthecic enviroment +// object that is anchored to the terrain with a single point and has size +// or orientation. Section 7.10.5 COMPLETE -namespace DIS -{ -// : Information abut the addition or modification of a synthecic enviroment object that is anchored to the terrain with a single point and has size or orientation. Section 7.10.5 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LinearObjectStatePdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS7_EXPORT LinearObjectStatePdu + : public SyntheticEnvironmentFamilyPdu { + protected: /** Object in synthetic environment */ - EntityID _objectID; + EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + unsigned short _updateNumber; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** number of linear segment parameters */ - unsigned char _numberOfSegments; + unsigned char _numberOfSegments; /** requesterID */ - SimulationAddress _requesterID; + SimulationAddress _requesterID; /** receiver ID */ - SimulationAddress _receivingID; + SimulationAddress _receivingID; /** Object type */ - ObjectType _objectType; + ObjectType _objectType; /** Linear segment parameters */ - std::vector _linearSegmentParameters; - + std::vector _linearSegmentParameters; public: - LinearObjectStatePdu(); - virtual ~LinearObjectStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + LinearObjectStatePdu(); + virtual ~LinearObjectStatePdu(); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID &pX); + EntityID& getObjectID(); + const EntityID& getObjectID() const; + void setObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + EntityID& getReferencedObjectID(); + const EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const EntityID& pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned short getUpdateNumber() const; + void setUpdateNumber(unsigned short pX); - unsigned char getNumberOfSegments() const; + unsigned char getForceID() const; + void setForceID(unsigned char pX); - SimulationAddress& getRequesterID(); - const SimulationAddress& getRequesterID() const; - void setRequesterID(const SimulationAddress &pX); + unsigned char getNumberOfSegments() const; - SimulationAddress& getReceivingID(); - const SimulationAddress& getReceivingID() const; - void setReceivingID(const SimulationAddress &pX); + SimulationAddress& getRequesterID(); + const SimulationAddress& getRequesterID() const; + void setRequesterID(const SimulationAddress& pX); - ObjectType& getObjectType(); - const ObjectType& getObjectType() const; - void setObjectType(const ObjectType &pX); + SimulationAddress& getReceivingID(); + const SimulationAddress& getReceivingID() const; + void setReceivingID(const SimulationAddress& pX); - std::vector& getLinearSegmentParameters(); - const std::vector& getLinearSegmentParameters() const; - void setLinearSegmentParameters(const std::vector& pX); + ObjectType& getObjectType(); + const ObjectType& getObjectType() const; + void setObjectType(const ObjectType& pX); + std::vector& getLinearSegmentParameters(); + const std::vector& getLinearSegmentParameters() const; + void setLinearSegmentParameters( + const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const LinearObjectStatePdu& rhs) const; + bool operator==(const LinearObjectStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -114,7 +113,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LinearSegmentParameter.cpp b/src/dis7/LinearSegmentParameter.cpp index 742f75e6..0d68c2b0 100644 --- a/src/dis7/LinearSegmentParameter.cpp +++ b/src/dis7/LinearSegmentParameter.cpp @@ -2,204 +2,177 @@ using namespace DIS; +LinearSegmentParameter::LinearSegmentParameter() + : _segmentNumber(0), + _segmentModification(0), + _generalSegmentAppearance(0), + _specificSegmentAppearance(0), + _segmentLocation(), + _segmentOrientation(), + _segmentLength(0), + _segmentWidth(0), + _segmentHeight(0), + _segmentDepth(0) {} -LinearSegmentParameter::LinearSegmentParameter(): - _segmentNumber(0), - _segmentModification(0), - _generalSegmentAppearance(0), - _specificSegmentAppearance(0), - _segmentLocation(), - _segmentOrientation(), - _segmentLength(0), - _segmentWidth(0), - _segmentHeight(0), - _segmentDepth(0) -{ -} - -LinearSegmentParameter::~LinearSegmentParameter() -{ -} +LinearSegmentParameter::~LinearSegmentParameter() {} -unsigned char LinearSegmentParameter::getSegmentNumber() const -{ - return _segmentNumber; +unsigned char LinearSegmentParameter::getSegmentNumber() const { + return _segmentNumber; } -void LinearSegmentParameter::setSegmentNumber(unsigned char pX) -{ - _segmentNumber = pX; +void LinearSegmentParameter::setSegmentNumber(unsigned char pX) { + _segmentNumber = pX; } -unsigned char LinearSegmentParameter::getSegmentModification() const -{ - return _segmentModification; +unsigned char LinearSegmentParameter::getSegmentModification() const { + return _segmentModification; } -void LinearSegmentParameter::setSegmentModification(unsigned char pX) -{ - _segmentModification = pX; +void LinearSegmentParameter::setSegmentModification(unsigned char pX) { + _segmentModification = pX; } -unsigned short LinearSegmentParameter::getGeneralSegmentAppearance() const -{ - return _generalSegmentAppearance; +unsigned short LinearSegmentParameter::getGeneralSegmentAppearance() const { + return _generalSegmentAppearance; } -void LinearSegmentParameter::setGeneralSegmentAppearance(unsigned short pX) -{ - _generalSegmentAppearance = pX; +void LinearSegmentParameter::setGeneralSegmentAppearance(unsigned short pX) { + _generalSegmentAppearance = pX; } -unsigned short LinearSegmentParameter::getSpecificSegmentAppearance() const -{ - return _specificSegmentAppearance; +unsigned short LinearSegmentParameter::getSpecificSegmentAppearance() const { + return _specificSegmentAppearance; } -void LinearSegmentParameter::setSpecificSegmentAppearance(unsigned short pX) -{ - _specificSegmentAppearance = pX; +void LinearSegmentParameter::setSpecificSegmentAppearance(unsigned short pX) { + _specificSegmentAppearance = pX; } -Vector3Double& LinearSegmentParameter::getSegmentLocation() -{ - return _segmentLocation; +Vector3Double& LinearSegmentParameter::getSegmentLocation() { + return _segmentLocation; } -const Vector3Double& LinearSegmentParameter::getSegmentLocation() const -{ - return _segmentLocation; +const Vector3Double& LinearSegmentParameter::getSegmentLocation() const { + return _segmentLocation; } -void LinearSegmentParameter::setSegmentLocation(const Vector3Double &pX) -{ - _segmentLocation = pX; +void LinearSegmentParameter::setSegmentLocation(const Vector3Double& pX) { + _segmentLocation = pX; } -EulerAngles& LinearSegmentParameter::getSegmentOrientation() -{ - return _segmentOrientation; +EulerAngles& LinearSegmentParameter::getSegmentOrientation() { + return _segmentOrientation; } -const EulerAngles& LinearSegmentParameter::getSegmentOrientation() const -{ - return _segmentOrientation; +const EulerAngles& LinearSegmentParameter::getSegmentOrientation() const { + return _segmentOrientation; } -void LinearSegmentParameter::setSegmentOrientation(const EulerAngles &pX) -{ - _segmentOrientation = pX; +void LinearSegmentParameter::setSegmentOrientation(const EulerAngles& pX) { + _segmentOrientation = pX; } -unsigned short LinearSegmentParameter::getSegmentLength() const -{ - return _segmentLength; +unsigned short LinearSegmentParameter::getSegmentLength() const { + return _segmentLength; } -void LinearSegmentParameter::setSegmentLength(unsigned short pX) -{ - _segmentLength = pX; +void LinearSegmentParameter::setSegmentLength(unsigned short pX) { + _segmentLength = pX; } -unsigned short LinearSegmentParameter::getSegmentWidth() const -{ - return _segmentWidth; +unsigned short LinearSegmentParameter::getSegmentWidth() const { + return _segmentWidth; } -void LinearSegmentParameter::setSegmentWidth(unsigned short pX) -{ - _segmentWidth = pX; +void LinearSegmentParameter::setSegmentWidth(unsigned short pX) { + _segmentWidth = pX; } -unsigned short LinearSegmentParameter::getSegmentHeight() const -{ - return _segmentHeight; +unsigned short LinearSegmentParameter::getSegmentHeight() const { + return _segmentHeight; } -void LinearSegmentParameter::setSegmentHeight(unsigned short pX) -{ - _segmentHeight = pX; +void LinearSegmentParameter::setSegmentHeight(unsigned short pX) { + _segmentHeight = pX; } -unsigned short LinearSegmentParameter::getSegmentDepth() const -{ - return _segmentDepth; +unsigned short LinearSegmentParameter::getSegmentDepth() const { + return _segmentDepth; } -void LinearSegmentParameter::setSegmentDepth(unsigned short pX) -{ - _segmentDepth = pX; +void LinearSegmentParameter::setSegmentDepth(unsigned short pX) { + _segmentDepth = pX; } -void LinearSegmentParameter::marshal(DataStream& dataStream) const -{ - dataStream << _segmentNumber; - dataStream << _segmentModification; - dataStream << _generalSegmentAppearance; - dataStream << _specificSegmentAppearance; - _segmentLocation.marshal(dataStream); - _segmentOrientation.marshal(dataStream); - dataStream << _segmentLength; - dataStream << _segmentWidth; - dataStream << _segmentHeight; - dataStream << _segmentDepth; +void LinearSegmentParameter::marshal(DataStream& dataStream) const { + dataStream << _segmentNumber; + dataStream << _segmentModification; + dataStream << _generalSegmentAppearance; + dataStream << _specificSegmentAppearance; + _segmentLocation.marshal(dataStream); + _segmentOrientation.marshal(dataStream); + dataStream << _segmentLength; + dataStream << _segmentWidth; + dataStream << _segmentHeight; + dataStream << _segmentDepth; } -void LinearSegmentParameter::unmarshal(DataStream& dataStream) -{ - dataStream >> _segmentNumber; - dataStream >> _segmentModification; - dataStream >> _generalSegmentAppearance; - dataStream >> _specificSegmentAppearance; - _segmentLocation.unmarshal(dataStream); - _segmentOrientation.unmarshal(dataStream); - dataStream >> _segmentLength; - dataStream >> _segmentWidth; - dataStream >> _segmentHeight; - dataStream >> _segmentDepth; +void LinearSegmentParameter::unmarshal(DataStream& dataStream) { + dataStream >> _segmentNumber; + dataStream >> _segmentModification; + dataStream >> _generalSegmentAppearance; + dataStream >> _specificSegmentAppearance; + _segmentLocation.unmarshal(dataStream); + _segmentOrientation.unmarshal(dataStream); + dataStream >> _segmentLength; + dataStream >> _segmentWidth; + dataStream >> _segmentHeight; + dataStream >> _segmentDepth; } +bool LinearSegmentParameter::operator==( + const LinearSegmentParameter& rhs) const { + bool ivarsEqual = true; -bool LinearSegmentParameter::operator ==(const LinearSegmentParameter& rhs) const - { - bool ivarsEqual = true; + if (!(_segmentNumber == rhs._segmentNumber)) ivarsEqual = false; + if (!(_segmentModification == rhs._segmentModification)) ivarsEqual = false; + if (!(_generalSegmentAppearance == rhs._generalSegmentAppearance)) + ivarsEqual = false; + if (!(_specificSegmentAppearance == rhs._specificSegmentAppearance)) + ivarsEqual = false; + if (!(_segmentLocation == rhs._segmentLocation)) ivarsEqual = false; + if (!(_segmentOrientation == rhs._segmentOrientation)) ivarsEqual = false; + if (!(_segmentLength == rhs._segmentLength)) ivarsEqual = false; + if (!(_segmentWidth == rhs._segmentWidth)) ivarsEqual = false; + if (!(_segmentHeight == rhs._segmentHeight)) ivarsEqual = false; + if (!(_segmentDepth == rhs._segmentDepth)) ivarsEqual = false; - if( ! (_segmentNumber == rhs._segmentNumber) ) ivarsEqual = false; - if( ! (_segmentModification == rhs._segmentModification) ) ivarsEqual = false; - if( ! (_generalSegmentAppearance == rhs._generalSegmentAppearance) ) ivarsEqual = false; - if( ! (_specificSegmentAppearance == rhs._specificSegmentAppearance) ) ivarsEqual = false; - if( ! (_segmentLocation == rhs._segmentLocation) ) ivarsEqual = false; - if( ! (_segmentOrientation == rhs._segmentOrientation) ) ivarsEqual = false; - if( ! (_segmentLength == rhs._segmentLength) ) ivarsEqual = false; - if( ! (_segmentWidth == rhs._segmentWidth) ) ivarsEqual = false; - if( ! (_segmentHeight == rhs._segmentHeight) ) ivarsEqual = false; - if( ! (_segmentDepth == rhs._segmentDepth) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LinearSegmentParameter::getMarshalledSize() const -{ - int marshalSize = 0; +int LinearSegmentParameter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _segmentNumber - marshalSize = marshalSize + 1; // _segmentModification - marshalSize = marshalSize + 2; // _generalSegmentAppearance - marshalSize = marshalSize + 2; // _specificSegmentAppearance - marshalSize = marshalSize + _segmentLocation.getMarshalledSize(); // _segmentLocation - marshalSize = marshalSize + _segmentOrientation.getMarshalledSize(); // _segmentOrientation - marshalSize = marshalSize + 2; // _segmentLength - marshalSize = marshalSize + 2; // _segmentWidth - marshalSize = marshalSize + 2; // _segmentHeight - marshalSize = marshalSize + 2; // _segmentDepth - return marshalSize; + marshalSize = marshalSize + 1; // _segmentNumber + marshalSize = marshalSize + 1; // _segmentModification + marshalSize = marshalSize + 2; // _generalSegmentAppearance + marshalSize = marshalSize + 2; // _specificSegmentAppearance + marshalSize = + marshalSize + _segmentLocation.getMarshalledSize(); // _segmentLocation + marshalSize = marshalSize + + _segmentOrientation.getMarshalledSize(); // _segmentOrientation + marshalSize = marshalSize + 2; // _segmentLength + marshalSize = marshalSize + 2; // _segmentWidth + marshalSize = marshalSize + 2; // _segmentHeight + marshalSize = marshalSize + 2; // _segmentDepth + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -212,7 +185,7 @@ int LinearSegmentParameter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LinearSegmentParameter.h b/src/dis7/LinearSegmentParameter.h index 04b0d41f..872c6d6e 100644 --- a/src/dis7/LinearSegmentParameter.h +++ b/src/dis7/LinearSegmentParameter.h @@ -1,104 +1,113 @@ #pragma once -#include #include -#include +#include #include +#include +namespace DIS { +// The specification of an individual segment of a linear segment synthetic +// environment object in a Linear Object State PDU Section 6.2.53 -namespace DIS -{ -// The specification of an individual segment of a linear segment synthetic environment object in a Linear Object State PDU Section 6.2.53 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LinearSegmentParameter -{ -protected: +class OPENDIS7_EXPORT LinearSegmentParameter { + protected: /** the individual segment of the linear segment */ - unsigned char _segmentNumber; + unsigned char _segmentNumber; - /** whether a modification has been made to the point object’s location or orientation */ - unsigned char _segmentModification; + /** whether a modification has been made to the point object’s location or + * orientation */ + unsigned char _segmentModification; - /** general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010. */ - unsigned short _generalSegmentAppearance; + /** general dynamic appearance attributes of the segment. This record shall be + * defined as a 16-bit record of enumerations. The values defined for this + * record are included in Section 12 of SISO-REF-010. */ + unsigned short _generalSegmentAppearance; - /** This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations. */ - unsigned short _specificSegmentAppearance; + /** This field shall specify specific dynamic appearance attributes of the + * segment. This record shall be defined as a 32-bit record of enumerations. + */ + unsigned short _specificSegmentAppearance; - /** This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record */ - Vector3Double _segmentLocation; + /** This field shall specify the location of the linear segment in the + * simulated world and shall be represented by a World Coordinates record */ + Vector3Double _segmentLocation; - /** orientation of the linear segment about the segment location and shall be represented by a Euler Angles record */ - EulerAngles _segmentOrientation; + /** orientation of the linear segment about the segment location and shall be + * represented by a Euler Angles record */ + EulerAngles _segmentOrientation; - /** length of the linear segment, in meters, extending in the positive X direction */ - unsigned short _segmentLength; + /** length of the linear segment, in meters, extending in the positive X + * direction */ + unsigned short _segmentLength; - /** The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction. */ - unsigned short _segmentWidth; + /** The total width of the linear segment, in meters, shall be specified by a + * 16-bit unsigned integer. One-half of the width shall extend in the positive + * Y direction, and one-half of the width shall extend in the negative Y + * direction. */ + unsigned short _segmentWidth; - /** The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer. */ - unsigned short _segmentHeight; + /** The height of the linear segment, in meters, above ground shall be + * specified by a 16-bit unsigned integer. */ + unsigned short _segmentHeight; /** The depth of the linear segment, in meters, below ground level */ - unsigned short _segmentDepth; - + unsigned short _segmentDepth; public: - LinearSegmentParameter(); - virtual ~LinearSegmentParameter(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + LinearSegmentParameter(); + virtual ~LinearSegmentParameter(); - unsigned char getSegmentNumber() const; - void setSegmentNumber(unsigned char pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getSegmentModification() const; - void setSegmentModification(unsigned char pX); + unsigned char getSegmentNumber() const; + void setSegmentNumber(unsigned char pX); - unsigned short getGeneralSegmentAppearance() const; - void setGeneralSegmentAppearance(unsigned short pX); + unsigned char getSegmentModification() const; + void setSegmentModification(unsigned char pX); - unsigned short getSpecificSegmentAppearance() const; - void setSpecificSegmentAppearance(unsigned short pX); + unsigned short getGeneralSegmentAppearance() const; + void setGeneralSegmentAppearance(unsigned short pX); - Vector3Double& getSegmentLocation(); - const Vector3Double& getSegmentLocation() const; - void setSegmentLocation(const Vector3Double &pX); + unsigned short getSpecificSegmentAppearance() const; + void setSpecificSegmentAppearance(unsigned short pX); - EulerAngles& getSegmentOrientation(); - const EulerAngles& getSegmentOrientation() const; - void setSegmentOrientation(const EulerAngles &pX); + Vector3Double& getSegmentLocation(); + const Vector3Double& getSegmentLocation() const; + void setSegmentLocation(const Vector3Double& pX); - unsigned short getSegmentLength() const; - void setSegmentLength(unsigned short pX); + EulerAngles& getSegmentOrientation(); + const EulerAngles& getSegmentOrientation() const; + void setSegmentOrientation(const EulerAngles& pX); - unsigned short getSegmentWidth() const; - void setSegmentWidth(unsigned short pX); + unsigned short getSegmentLength() const; + void setSegmentLength(unsigned short pX); - unsigned short getSegmentHeight() const; - void setSegmentHeight(unsigned short pX); + unsigned short getSegmentWidth() const; + void setSegmentWidth(unsigned short pX); - unsigned short getSegmentDepth() const; - void setSegmentDepth(unsigned short pX); + unsigned short getSegmentHeight() const; + void setSegmentHeight(unsigned short pX); + unsigned short getSegmentDepth() const; + void setSegmentDepth(unsigned short pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const LinearSegmentParameter& rhs) const; + bool operator==(const LinearSegmentParameter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -111,7 +120,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LiveEntityIdentifier.cpp b/src/dis7/LiveEntityIdentifier.cpp index 493c720b..7e8da003 100644 --- a/src/dis7/LiveEntityIdentifier.cpp +++ b/src/dis7/LiveEntityIdentifier.cpp @@ -2,79 +2,68 @@ using namespace DIS; +LiveEntityIdentifier::LiveEntityIdentifier() + : _liveSimulationAddress(), _entityNumber(0) {} -LiveEntityIdentifier::LiveEntityIdentifier(): - _liveSimulationAddress(), - _entityNumber(0) -{ -} - -LiveEntityIdentifier::~LiveEntityIdentifier() -{ -} +LiveEntityIdentifier::~LiveEntityIdentifier() {} -LiveSimulationAddress& LiveEntityIdentifier::getLiveSimulationAddress() -{ - return _liveSimulationAddress; +LiveSimulationAddress& LiveEntityIdentifier::getLiveSimulationAddress() { + return _liveSimulationAddress; } -const LiveSimulationAddress& LiveEntityIdentifier::getLiveSimulationAddress() const -{ - return _liveSimulationAddress; +const LiveSimulationAddress& LiveEntityIdentifier::getLiveSimulationAddress() + const { + return _liveSimulationAddress; } -void LiveEntityIdentifier::setLiveSimulationAddress(const LiveSimulationAddress &pX) -{ - _liveSimulationAddress = pX; +void LiveEntityIdentifier::setLiveSimulationAddress( + const LiveSimulationAddress& pX) { + _liveSimulationAddress = pX; } -unsigned short LiveEntityIdentifier::getEntityNumber() const -{ - return _entityNumber; +unsigned short LiveEntityIdentifier::getEntityNumber() const { + return _entityNumber; } -void LiveEntityIdentifier::setEntityNumber(unsigned short pX) -{ - _entityNumber = pX; +void LiveEntityIdentifier::setEntityNumber(unsigned short pX) { + _entityNumber = pX; } -void LiveEntityIdentifier::marshal(DataStream& dataStream) const -{ - _liveSimulationAddress.marshal(dataStream); - dataStream << _entityNumber; +void LiveEntityIdentifier::marshal(DataStream& dataStream) const { + _liveSimulationAddress.marshal(dataStream); + dataStream << _entityNumber; } -void LiveEntityIdentifier::unmarshal(DataStream& dataStream) -{ - _liveSimulationAddress.unmarshal(dataStream); - dataStream >> _entityNumber; +void LiveEntityIdentifier::unmarshal(DataStream& dataStream) { + _liveSimulationAddress.unmarshal(dataStream); + dataStream >> _entityNumber; } +bool LiveEntityIdentifier::operator==(const LiveEntityIdentifier& rhs) const { + bool ivarsEqual = true; -bool LiveEntityIdentifier::operator ==(const LiveEntityIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_liveSimulationAddress == rhs._liveSimulationAddress)) + ivarsEqual = false; + if (!(_entityNumber == rhs._entityNumber)) ivarsEqual = false; - if( ! (_liveSimulationAddress == rhs._liveSimulationAddress) ) ivarsEqual = false; - if( ! (_entityNumber == rhs._entityNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LiveEntityIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int LiveEntityIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _liveSimulationAddress.getMarshalledSize(); // _liveSimulationAddress - marshalSize = marshalSize + 2; // _entityNumber - return marshalSize; + marshalSize = + marshalSize + + _liveSimulationAddress.getMarshalledSize(); // _liveSimulationAddress + marshalSize = marshalSize + 2; // _entityNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +76,7 @@ int LiveEntityIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LiveEntityIdentifier.h b/src/dis7/LiveEntityIdentifier.h index d80bc27b..c6918adb 100644 --- a/src/dis7/LiveEntityIdentifier.h +++ b/src/dis7/LiveEntityIdentifier.h @@ -1,54 +1,51 @@ #pragma once #include -#include #include +#include +namespace DIS { +// The unique designation of each entity in an event or exercise that is +// contained in a Live Entity PDU. Section 6.2.54 -namespace DIS -{ -// The unique designation of each entity in an event or exercise that is contained in a Live Entity PDU. Section 6.2.54 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LiveEntityIdentifier -{ -protected: +class OPENDIS7_EXPORT LiveEntityIdentifier { + protected: /** Live Simulation Address record (see 6.2.55) */ - LiveSimulationAddress _liveSimulationAddress; + LiveSimulationAddress _liveSimulationAddress; /** Live entity number */ - unsigned short _entityNumber; - + unsigned short _entityNumber; public: - LiveEntityIdentifier(); - virtual ~LiveEntityIdentifier(); + LiveEntityIdentifier(); + virtual ~LiveEntityIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - LiveSimulationAddress& getLiveSimulationAddress(); - const LiveSimulationAddress& getLiveSimulationAddress() const; - void setLiveSimulationAddress(const LiveSimulationAddress &pX); + LiveSimulationAddress& getLiveSimulationAddress(); + const LiveSimulationAddress& getLiveSimulationAddress() const; + void setLiveSimulationAddress(const LiveSimulationAddress& pX); - unsigned short getEntityNumber() const; - void setEntityNumber(unsigned short pX); + unsigned short getEntityNumber() const; + void setEntityNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const LiveEntityIdentifier& rhs) const; + bool operator==(const LiveEntityIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LiveEntityPdu.cpp b/src/dis7/LiveEntityPdu.cpp index 73e69e80..fdb52abd 100644 --- a/src/dis7/LiveEntityPdu.cpp +++ b/src/dis7/LiveEntityPdu.cpp @@ -2,79 +2,62 @@ using namespace DIS; +LiveEntityPdu::LiveEntityPdu() + : PduSuperclass(), _subprotocolNumber(0), _padding(0) {} -LiveEntityPdu::LiveEntityPdu() : PduSuperclass(), - _subprotocolNumber(0), - _padding(0) -{ -} +LiveEntityPdu::~LiveEntityPdu() {} -LiveEntityPdu::~LiveEntityPdu() -{ +unsigned short LiveEntityPdu::getSubprotocolNumber() const { + return _subprotocolNumber; } -unsigned short LiveEntityPdu::getSubprotocolNumber() const -{ - return _subprotocolNumber; +void LiveEntityPdu::setSubprotocolNumber(unsigned short pX) { + _subprotocolNumber = pX; } -void LiveEntityPdu::setSubprotocolNumber(unsigned short pX) -{ - _subprotocolNumber = pX; -} +unsigned char LiveEntityPdu::getPadding() const { return _padding; } -unsigned char LiveEntityPdu::getPadding() const -{ - return _padding; -} +void LiveEntityPdu::setPadding(unsigned char pX) { _padding = pX; } -void LiveEntityPdu::setPadding(unsigned char pX) -{ - _padding = pX; +void LiveEntityPdu::marshal(DataStream& dataStream) const { + PduSuperclass::marshal( + dataStream); // Marshal information in superclass first + dataStream << _subprotocolNumber; + dataStream << _padding; } -void LiveEntityPdu::marshal(DataStream& dataStream) const -{ - PduSuperclass::marshal(dataStream); // Marshal information in superclass first - dataStream << _subprotocolNumber; - dataStream << _padding; +void LiveEntityPdu::unmarshal(DataStream& dataStream) { + PduSuperclass::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _subprotocolNumber; + dataStream >> _padding; } -void LiveEntityPdu::unmarshal(DataStream& dataStream) -{ - PduSuperclass::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _subprotocolNumber; - dataStream >> _padding; -} +bool LiveEntityPdu::operator==(const LiveEntityPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = PduSuperclass::operator==(rhs); -bool LiveEntityPdu::operator ==(const LiveEntityPdu& rhs) const - { - bool ivarsEqual = true; + if (!(_subprotocolNumber == rhs._subprotocolNumber)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - ivarsEqual = PduSuperclass::operator==(rhs); - - if( ! (_subprotocolNumber == rhs._subprotocolNumber) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LiveEntityPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int LiveEntityPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = PduSuperclass::getMarshalledSize(); - marshalSize = marshalSize + 2; // _subprotocolNumber - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = PduSuperclass::getMarshalledSize(); + marshalSize = marshalSize + 2; // _subprotocolNumber + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +70,7 @@ int LiveEntityPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LiveEntityPdu.h b/src/dis7/LiveEntityPdu.h index 00b87a75..419d84ed 100644 --- a/src/dis7/LiveEntityPdu.h +++ b/src/dis7/LiveEntityPdu.h @@ -1,53 +1,50 @@ #pragma once #include -#include #include +#include +namespace DIS { +// The live entity PDUs have a header with some different field names, but the +// same length. Section 9.3.2 -namespace DIS -{ -// The live entity PDUs have a header with some different field names, but the same length. Section 9.3.2 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LiveEntityPdu : public PduSuperclass -{ -protected: +class OPENDIS7_EXPORT LiveEntityPdu : public PduSuperclass { + protected: /** Subprotocol used to decode the PDU. Section 13 of EBV. */ - unsigned short _subprotocolNumber; + unsigned short _subprotocolNumber; /** zero-filled array of padding */ - unsigned char _padding; - + unsigned char _padding; public: - LiveEntityPdu(); - virtual ~LiveEntityPdu(); + LiveEntityPdu(); + virtual ~LiveEntityPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSubprotocolNumber() const; - void setSubprotocolNumber(unsigned short pX); + unsigned short getSubprotocolNumber() const; + void setSubprotocolNumber(unsigned short pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const LiveEntityPdu& rhs) const; + bool operator==(const LiveEntityPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -60,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LiveSimulationAddress.cpp b/src/dis7/LiveSimulationAddress.cpp index 5bf67baa..e45206e1 100644 --- a/src/dis7/LiveSimulationAddress.cpp +++ b/src/dis7/LiveSimulationAddress.cpp @@ -2,74 +2,60 @@ using namespace DIS; +LiveSimulationAddress::LiveSimulationAddress() + : _liveSiteNumber(0), _liveApplicationNumber(0) {} -LiveSimulationAddress::LiveSimulationAddress(): - _liveSiteNumber(0), - _liveApplicationNumber(0) -{ -} - -LiveSimulationAddress::~LiveSimulationAddress() -{ -} +LiveSimulationAddress::~LiveSimulationAddress() {} -unsigned char LiveSimulationAddress::getLiveSiteNumber() const -{ - return _liveSiteNumber; +unsigned char LiveSimulationAddress::getLiveSiteNumber() const { + return _liveSiteNumber; } -void LiveSimulationAddress::setLiveSiteNumber(unsigned char pX) -{ - _liveSiteNumber = pX; +void LiveSimulationAddress::setLiveSiteNumber(unsigned char pX) { + _liveSiteNumber = pX; } -unsigned short LiveSimulationAddress::getLiveApplicationNumber() const -{ - return _liveApplicationNumber; +unsigned short LiveSimulationAddress::getLiveApplicationNumber() const { + return _liveApplicationNumber; } -void LiveSimulationAddress::setLiveApplicationNumber(unsigned short pX) -{ - _liveApplicationNumber = pX; +void LiveSimulationAddress::setLiveApplicationNumber(unsigned short pX) { + _liveApplicationNumber = pX; } -void LiveSimulationAddress::marshal(DataStream& dataStream) const -{ - dataStream << _liveSiteNumber; - dataStream << _liveApplicationNumber; +void LiveSimulationAddress::marshal(DataStream& dataStream) const { + dataStream << _liveSiteNumber; + dataStream << _liveApplicationNumber; } -void LiveSimulationAddress::unmarshal(DataStream& dataStream) -{ - dataStream >> _liveSiteNumber; - dataStream >> _liveApplicationNumber; +void LiveSimulationAddress::unmarshal(DataStream& dataStream) { + dataStream >> _liveSiteNumber; + dataStream >> _liveApplicationNumber; } +bool LiveSimulationAddress::operator==(const LiveSimulationAddress& rhs) const { + bool ivarsEqual = true; -bool LiveSimulationAddress::operator ==(const LiveSimulationAddress& rhs) const - { - bool ivarsEqual = true; + if (!(_liveSiteNumber == rhs._liveSiteNumber)) ivarsEqual = false; + if (!(_liveApplicationNumber == rhs._liveApplicationNumber)) + ivarsEqual = false; - if( ! (_liveSiteNumber == rhs._liveSiteNumber) ) ivarsEqual = false; - if( ! (_liveApplicationNumber == rhs._liveApplicationNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int LiveSimulationAddress::getMarshalledSize() const -{ - int marshalSize = 0; +int LiveSimulationAddress::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _liveSiteNumber - marshalSize = marshalSize + 2; // _liveApplicationNumber - return marshalSize; + marshalSize = marshalSize + 1; // _liveSiteNumber + marshalSize = marshalSize + 2; // _liveApplicationNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +68,7 @@ int LiveSimulationAddress::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LiveSimulationAddress.h b/src/dis7/LiveSimulationAddress.h index 4575ac87..b121063c 100644 --- a/src/dis7/LiveSimulationAddress.h +++ b/src/dis7/LiveSimulationAddress.h @@ -1,52 +1,53 @@ #pragma once -#include #include +#include +namespace DIS { +// A simulation's designation associated with all Live Entity IDs contained in +// Live Entity PDUs. Section 6.2.55 -namespace DIS -{ -// A simulation's designation associated with all Live Entity IDs contained in Live Entity PDUs. Section 6.2.55 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LiveSimulationAddress -{ -protected: - /** facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation. */ - unsigned char _liveSiteNumber; - - /** An application associated with a live site is termed a live application. Each live application participating in an event */ - unsigned short _liveApplicationNumber; +class OPENDIS7_EXPORT LiveSimulationAddress { + protected: + /** facility, installation, organizational unit or geographic location may + * have multiple sites associated with it. The Site Number is the first + * component of the Live Simulation Address, which defines a live simulation. + */ + unsigned char _liveSiteNumber; + /** An application associated with a live site is termed a live application. + * Each live application participating in an event */ + unsigned short _liveApplicationNumber; public: - LiveSimulationAddress(); - virtual ~LiveSimulationAddress(); + LiveSimulationAddress(); + virtual ~LiveSimulationAddress(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getLiveSiteNumber() const; - void setLiveSiteNumber(unsigned char pX); + unsigned char getLiveSiteNumber() const; + void setLiveSiteNumber(unsigned char pX); - unsigned short getLiveApplicationNumber() const; - void setLiveApplicationNumber(unsigned short pX); + unsigned short getLiveApplicationNumber() const; + void setLiveApplicationNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const LiveSimulationAddress& rhs) const; + bool operator==(const LiveSimulationAddress& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LogisticsFamilyPdu.cpp b/src/dis7/LogisticsFamilyPdu.cpp index 41c04906..c1c7e5ed 100644 --- a/src/dis7/LogisticsFamilyPdu.cpp +++ b/src/dis7/LogisticsFamilyPdu.cpp @@ -2,51 +2,43 @@ using namespace DIS; - -LogisticsFamilyPdu::LogisticsFamilyPdu() : Pdu() +LogisticsFamilyPdu::LogisticsFamilyPdu() + : Pdu() { - setProtocolFamily( 3 ); + setProtocolFamily(3); } -LogisticsFamilyPdu::~LogisticsFamilyPdu() -{ -} +LogisticsFamilyPdu::~LogisticsFamilyPdu() {} -void LogisticsFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void LogisticsFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void LogisticsFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void LogisticsFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool LogisticsFamilyPdu::operator==(const LogisticsFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool LogisticsFamilyPdu::operator ==(const LogisticsFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int LogisticsFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int LogisticsFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +51,7 @@ int LogisticsFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/LogisticsFamilyPdu.h b/src/dis7/LogisticsFamilyPdu.h index 7490182e..004b6839 100644 --- a/src/dis7/LogisticsFamilyPdu.h +++ b/src/dis7/LogisticsFamilyPdu.h @@ -1,41 +1,37 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Abstract superclass for logistics PDUs. Section 7.4 COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT LogisticsFamilyPdu : public Pdu -{ -protected: - +class OPENDIS7_EXPORT LogisticsFamilyPdu : public Pdu { + protected: public: - LogisticsFamilyPdu(); - virtual ~LogisticsFamilyPdu(); + LogisticsFamilyPdu(); + virtual ~LogisticsFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const LogisticsFamilyPdu& rhs) const; + bool operator==(const LogisticsFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MineEntityIdentifier.cpp b/src/dis7/MineEntityIdentifier.cpp index 5b499c3a..9c3934b5 100644 --- a/src/dis7/MineEntityIdentifier.cpp +++ b/src/dis7/MineEntityIdentifier.cpp @@ -2,79 +2,64 @@ using namespace DIS; +MineEntityIdentifier::MineEntityIdentifier() + : _simulationAddress(), _mineEntityNumber(0) {} -MineEntityIdentifier::MineEntityIdentifier(): - _simulationAddress(), - _mineEntityNumber(0) -{ -} - -MineEntityIdentifier::~MineEntityIdentifier() -{ -} +MineEntityIdentifier::~MineEntityIdentifier() {} -SimulationAddress& MineEntityIdentifier::getSimulationAddress() -{ - return _simulationAddress; +SimulationAddress& MineEntityIdentifier::getSimulationAddress() { + return _simulationAddress; } -const SimulationAddress& MineEntityIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +const SimulationAddress& MineEntityIdentifier::getSimulationAddress() const { + return _simulationAddress; } -void MineEntityIdentifier::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; +void MineEntityIdentifier::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -unsigned short MineEntityIdentifier::getMineEntityNumber() const -{ - return _mineEntityNumber; +unsigned short MineEntityIdentifier::getMineEntityNumber() const { + return _mineEntityNumber; } -void MineEntityIdentifier::setMineEntityNumber(unsigned short pX) -{ - _mineEntityNumber = pX; +void MineEntityIdentifier::setMineEntityNumber(unsigned short pX) { + _mineEntityNumber = pX; } -void MineEntityIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _mineEntityNumber; +void MineEntityIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _mineEntityNumber; } -void MineEntityIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _mineEntityNumber; +void MineEntityIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _mineEntityNumber; } +bool MineEntityIdentifier::operator==(const MineEntityIdentifier& rhs) const { + bool ivarsEqual = true; -bool MineEntityIdentifier::operator ==(const MineEntityIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_mineEntityNumber == rhs._mineEntityNumber)) ivarsEqual = false; - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_mineEntityNumber == rhs._mineEntityNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int MineEntityIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int MineEntityIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _mineEntityNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _mineEntityNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +72,7 @@ int MineEntityIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MineEntityIdentifier.h b/src/dis7/MineEntityIdentifier.h index c34688ef..1fbe4183 100644 --- a/src/dis7/MineEntityIdentifier.h +++ b/src/dis7/MineEntityIdentifier.h @@ -1,54 +1,51 @@ #pragma once #include -#include #include +#include +namespace DIS { +// The unique designation of a mine contained in the Minefield Data PDU. No +// espdus are issued for mine entities. Section 6.2.56 -namespace DIS -{ -// The unique designation of a mine contained in the Minefield Data PDU. No espdus are issued for mine entities. Section 6.2.56 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT MineEntityIdentifier -{ -protected: +class OPENDIS7_EXPORT MineEntityIdentifier { + protected: /** */ - SimulationAddress _simulationAddress; + SimulationAddress _simulationAddress; /** */ - unsigned short _mineEntityNumber; - + unsigned short _mineEntityNumber; public: - MineEntityIdentifier(); - virtual ~MineEntityIdentifier(); + MineEntityIdentifier(); + virtual ~MineEntityIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getMineEntityNumber() const; - void setMineEntityNumber(unsigned short pX); + unsigned short getMineEntityNumber() const; + void setMineEntityNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MineEntityIdentifier& rhs) const; + bool operator==(const MineEntityIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldFamilyPdu.cpp b/src/dis7/MinefieldFamilyPdu.cpp index cd879287..2bff3b79 100644 --- a/src/dis7/MinefieldFamilyPdu.cpp +++ b/src/dis7/MinefieldFamilyPdu.cpp @@ -2,51 +2,43 @@ using namespace DIS; - -MinefieldFamilyPdu::MinefieldFamilyPdu() : Pdu() +MinefieldFamilyPdu::MinefieldFamilyPdu() + : Pdu() { - setProtocolFamily( 8 ); + setProtocolFamily(8); } -MinefieldFamilyPdu::~MinefieldFamilyPdu() -{ -} +MinefieldFamilyPdu::~MinefieldFamilyPdu() {} -void MinefieldFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void MinefieldFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void MinefieldFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void MinefieldFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool MinefieldFamilyPdu::operator==(const MinefieldFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool MinefieldFamilyPdu::operator ==(const MinefieldFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int MinefieldFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int MinefieldFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +51,7 @@ int MinefieldFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldFamilyPdu.h b/src/dis7/MinefieldFamilyPdu.h index 8b48e6ba..005db08c 100644 --- a/src/dis7/MinefieldFamilyPdu.h +++ b/src/dis7/MinefieldFamilyPdu.h @@ -1,41 +1,37 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Abstract superclass for PDUs relating to minefields. Section 7.9 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT MinefieldFamilyPdu : public Pdu -{ -protected: - +class OPENDIS7_EXPORT MinefieldFamilyPdu : public Pdu { + protected: public: - MinefieldFamilyPdu(); - virtual ~MinefieldFamilyPdu(); + MinefieldFamilyPdu(); + virtual ~MinefieldFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldFamilyPdu& rhs) const; + bool operator==(const MinefieldFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldIdentifier.cpp b/src/dis7/MinefieldIdentifier.cpp index 78855a2b..023ac7c4 100644 --- a/src/dis7/MinefieldIdentifier.cpp +++ b/src/dis7/MinefieldIdentifier.cpp @@ -2,79 +2,64 @@ using namespace DIS; +MinefieldIdentifier::MinefieldIdentifier() + : _simulationAddress(), _minefieldNumber(0) {} -MinefieldIdentifier::MinefieldIdentifier(): - _simulationAddress(), - _minefieldNumber(0) -{ -} - -MinefieldIdentifier::~MinefieldIdentifier() -{ -} +MinefieldIdentifier::~MinefieldIdentifier() {} -SimulationAddress& MinefieldIdentifier::getSimulationAddress() -{ - return _simulationAddress; +SimulationAddress& MinefieldIdentifier::getSimulationAddress() { + return _simulationAddress; } -const SimulationAddress& MinefieldIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +const SimulationAddress& MinefieldIdentifier::getSimulationAddress() const { + return _simulationAddress; } -void MinefieldIdentifier::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; +void MinefieldIdentifier::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -unsigned short MinefieldIdentifier::getMinefieldNumber() const -{ - return _minefieldNumber; +unsigned short MinefieldIdentifier::getMinefieldNumber() const { + return _minefieldNumber; } -void MinefieldIdentifier::setMinefieldNumber(unsigned short pX) -{ - _minefieldNumber = pX; +void MinefieldIdentifier::setMinefieldNumber(unsigned short pX) { + _minefieldNumber = pX; } -void MinefieldIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _minefieldNumber; +void MinefieldIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _minefieldNumber; } -void MinefieldIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _minefieldNumber; +void MinefieldIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _minefieldNumber; } +bool MinefieldIdentifier::operator==(const MinefieldIdentifier& rhs) const { + bool ivarsEqual = true; -bool MinefieldIdentifier::operator ==(const MinefieldIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_minefieldNumber == rhs._minefieldNumber)) ivarsEqual = false; - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_minefieldNumber == rhs._minefieldNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int MinefieldIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int MinefieldIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _minefieldNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _minefieldNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +72,7 @@ int MinefieldIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldIdentifier.h b/src/dis7/MinefieldIdentifier.h index 4ebc38b0..5be13c46 100644 --- a/src/dis7/MinefieldIdentifier.h +++ b/src/dis7/MinefieldIdentifier.h @@ -1,54 +1,50 @@ #pragma once #include -#include #include +#include +namespace DIS { +// The unique designation of a minefield Section 6.2.57 -namespace DIS -{ -// The unique designation of a minefield Section 6.2.57 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT MinefieldIdentifier -{ -protected: +class OPENDIS7_EXPORT MinefieldIdentifier { + protected: /** */ - SimulationAddress _simulationAddress; + SimulationAddress _simulationAddress; /** */ - unsigned short _minefieldNumber; - + unsigned short _minefieldNumber; public: - MinefieldIdentifier(); - virtual ~MinefieldIdentifier(); + MinefieldIdentifier(); + virtual ~MinefieldIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getMinefieldNumber() const; - void setMinefieldNumber(unsigned short pX); + unsigned short getMinefieldNumber() const; + void setMinefieldNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldIdentifier& rhs) const; + bool operator==(const MinefieldIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldResponseNackPdu.cpp b/src/dis7/MinefieldResponseNackPdu.cpp index a289543f..09462564 100644 --- a/src/dis7/MinefieldResponseNackPdu.cpp +++ b/src/dis7/MinefieldResponseNackPdu.cpp @@ -2,158 +2,141 @@ using namespace DIS; - -MinefieldResponseNackPdu::MinefieldResponseNackPdu() : MinefieldFamilyPdu(), - _minefieldID(), - _requestingEntityID(), - _requestID(0), - _numberOfMissingPdus(0) -{ - setPduType( 40 ); +MinefieldResponseNackPdu::MinefieldResponseNackPdu() + : MinefieldFamilyPdu(), + _minefieldID(), + _requestingEntityID(), + _requestID(0), + _numberOfMissingPdus(0) { + setPduType(40); } -MinefieldResponseNackPdu::~MinefieldResponseNackPdu() -{ - _missingPduSequenceNumbers.clear(); +MinefieldResponseNackPdu::~MinefieldResponseNackPdu() { + _missingPduSequenceNumbers.clear(); } -EntityID& MinefieldResponseNackPdu::getMinefieldID() -{ - return _minefieldID; -} +EntityID& MinefieldResponseNackPdu::getMinefieldID() { return _minefieldID; } -const EntityID& MinefieldResponseNackPdu::getMinefieldID() const -{ - return _minefieldID; +const EntityID& MinefieldResponseNackPdu::getMinefieldID() const { + return _minefieldID; } -void MinefieldResponseNackPdu::setMinefieldID(const EntityID &pX) -{ - _minefieldID = pX; +void MinefieldResponseNackPdu::setMinefieldID(const EntityID& pX) { + _minefieldID = pX; } -EntityID& MinefieldResponseNackPdu::getRequestingEntityID() -{ - return _requestingEntityID; +EntityID& MinefieldResponseNackPdu::getRequestingEntityID() { + return _requestingEntityID; } -const EntityID& MinefieldResponseNackPdu::getRequestingEntityID() const -{ - return _requestingEntityID; +const EntityID& MinefieldResponseNackPdu::getRequestingEntityID() const { + return _requestingEntityID; } -void MinefieldResponseNackPdu::setRequestingEntityID(const EntityID &pX) -{ - _requestingEntityID = pX; +void MinefieldResponseNackPdu::setRequestingEntityID(const EntityID& pX) { + _requestingEntityID = pX; } -unsigned char MinefieldResponseNackPdu::getRequestID() const -{ - return _requestID; +unsigned char MinefieldResponseNackPdu::getRequestID() const { + return _requestID; } -void MinefieldResponseNackPdu::setRequestID(unsigned char pX) -{ - _requestID = pX; +void MinefieldResponseNackPdu::setRequestID(unsigned char pX) { + _requestID = pX; } -unsigned char MinefieldResponseNackPdu::getNumberOfMissingPdus() const -{ - return _missingPduSequenceNumbers.size(); +unsigned char MinefieldResponseNackPdu::getNumberOfMissingPdus() const { + return _missingPduSequenceNumbers.size(); } -std::vector& MinefieldResponseNackPdu::getMissingPduSequenceNumbers() -{ - return _missingPduSequenceNumbers; +std::vector& +MinefieldResponseNackPdu::getMissingPduSequenceNumbers() { + return _missingPduSequenceNumbers; } -const std::vector& MinefieldResponseNackPdu::getMissingPduSequenceNumbers() const -{ - return _missingPduSequenceNumbers; +const std::vector& +MinefieldResponseNackPdu::getMissingPduSequenceNumbers() const { + return _missingPduSequenceNumbers; } -void MinefieldResponseNackPdu::setMissingPduSequenceNumbers(const std::vector& pX) -{ - _missingPduSequenceNumbers = pX; +void MinefieldResponseNackPdu::setMissingPduSequenceNumbers( + const std::vector& pX) { + _missingPduSequenceNumbers = pX; } -void MinefieldResponseNackPdu::marshal(DataStream& dataStream) const -{ - MinefieldFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _minefieldID.marshal(dataStream); - _requestingEntityID.marshal(dataStream); - dataStream << _requestID; - dataStream << ( unsigned char )_missingPduSequenceNumbers.size(); - - for(size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) - { - EightByteChunk x = _missingPduSequenceNumbers[idx]; - x.marshal(dataStream); - } +void MinefieldResponseNackPdu::marshal(DataStream& dataStream) const { + MinefieldFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _minefieldID.marshal(dataStream); + _requestingEntityID.marshal(dataStream); + dataStream << _requestID; + dataStream << (unsigned char)_missingPduSequenceNumbers.size(); + for (size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { + EightByteChunk x = _missingPduSequenceNumbers[idx]; + x.marshal(dataStream); + } } -void MinefieldResponseNackPdu::unmarshal(DataStream& dataStream) -{ - MinefieldFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _minefieldID.unmarshal(dataStream); - _requestingEntityID.unmarshal(dataStream); - dataStream >> _requestID; - dataStream >> _numberOfMissingPdus; +void MinefieldResponseNackPdu::unmarshal(DataStream& dataStream) { + MinefieldFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _minefieldID.unmarshal(dataStream); + _requestingEntityID.unmarshal(dataStream); + dataStream >> _requestID; + dataStream >> _numberOfMissingPdus; - _missingPduSequenceNumbers.clear(); - for(size_t idx = 0; idx < _numberOfMissingPdus; idx++) - { - EightByteChunk x; - x.unmarshal(dataStream); - _missingPduSequenceNumbers.push_back(x); - } + _missingPduSequenceNumbers.clear(); + for (size_t idx = 0; idx < _numberOfMissingPdus; idx++) { + EightByteChunk x; + x.unmarshal(dataStream); + _missingPduSequenceNumbers.push_back(x); + } } +bool MinefieldResponseNackPdu::operator==( + const MinefieldResponseNackPdu& rhs) const { + bool ivarsEqual = true; -bool MinefieldResponseNackPdu::operator ==(const MinefieldResponseNackPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = MinefieldFamilyPdu::operator==(rhs); - ivarsEqual = MinefieldFamilyPdu::operator==(rhs); + if (!(_minefieldID == rhs._minefieldID)) ivarsEqual = false; + if (!(_requestingEntityID == rhs._requestingEntityID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_minefieldID == rhs._minefieldID) ) ivarsEqual = false; - if( ! (_requestingEntityID == rhs._requestingEntityID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + for (size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { + if (!(_missingPduSequenceNumbers[idx] == + rhs._missingPduSequenceNumbers[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) - { - if( ! ( _missingPduSequenceNumbers[idx] == rhs._missingPduSequenceNumbers[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int MinefieldResponseNackPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int MinefieldResponseNackPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = MinefieldFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID - marshalSize = marshalSize + _requestingEntityID.getMarshalledSize(); // _requestingEntityID - marshalSize = marshalSize + 1; // _requestID - marshalSize = marshalSize + 1; // _numberOfMissingPdus + marshalSize = MinefieldFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID + marshalSize = marshalSize + + _requestingEntityID.getMarshalledSize(); // _requestingEntityID + marshalSize = marshalSize + 1; // _requestID + marshalSize = marshalSize + 1; // _numberOfMissingPdus - for(unsigned long long idx=0; idx < _missingPduSequenceNumbers.size(); idx++) - { - EightByteChunk listElement = _missingPduSequenceNumbers[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _missingPduSequenceNumbers.size(); + idx++) { + EightByteChunk listElement = _missingPduSequenceNumbers[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -166,7 +149,7 @@ int MinefieldResponseNackPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldResponseNackPdu.h b/src/dis7/MinefieldResponseNackPdu.h index 60ef683c..94159af2 100644 --- a/src/dis7/MinefieldResponseNackPdu.h +++ b/src/dis7/MinefieldResponseNackPdu.h @@ -1,77 +1,74 @@ #pragma once -#include -#include -#include #include + +#include +#include #include -#include #include +#include +namespace DIS { +// proivde the means to request a retransmit of a minefield data pdu. +// Section 7.9.5 COMPLETE -namespace DIS -{ -// proivde the means to request a retransmit of a minefield data pdu. Section 7.9.5 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu -{ -protected: +class OPENDIS7_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu { + protected: /** Minefield ID */ - EntityID _minefieldID; + EntityID _minefieldID; /** entity ID making the request */ - EntityID _requestingEntityID; + EntityID _requestingEntityID; /** request ID */ - unsigned char _requestID; + unsigned char _requestID; /** how many pdus were missing */ - unsigned char _numberOfMissingPdus; + unsigned char _numberOfMissingPdus; /** PDU sequence numbers that were missing */ - std::vector _missingPduSequenceNumbers; - + std::vector _missingPduSequenceNumbers; public: - MinefieldResponseNackPdu(); - virtual ~MinefieldResponseNackPdu(); + MinefieldResponseNackPdu(); + virtual ~MinefieldResponseNackPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getMinefieldID(); - const EntityID& getMinefieldID() const; - void setMinefieldID(const EntityID &pX); + EntityID& getMinefieldID(); + const EntityID& getMinefieldID() const; + void setMinefieldID(const EntityID& pX); - EntityID& getRequestingEntityID(); - const EntityID& getRequestingEntityID() const; - void setRequestingEntityID(const EntityID &pX); + EntityID& getRequestingEntityID(); + const EntityID& getRequestingEntityID() const; + void setRequestingEntityID(const EntityID& pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + unsigned char getRequestID() const; + void setRequestID(unsigned char pX); - unsigned char getNumberOfMissingPdus() const; + unsigned char getNumberOfMissingPdus() const; - std::vector& getMissingPduSequenceNumbers(); - const std::vector& getMissingPduSequenceNumbers() const; - void setMissingPduSequenceNumbers(const std::vector& pX); + std::vector& getMissingPduSequenceNumbers(); + const std::vector& getMissingPduSequenceNumbers() const; + void setMissingPduSequenceNumbers(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MinefieldResponseNackPdu& rhs) const; + bool operator==(const MinefieldResponseNackPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -84,7 +81,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldStatePdu.cpp b/src/dis7/MinefieldStatePdu.cpp index 34804a13..de96cddc 100644 --- a/src/dis7/MinefieldStatePdu.cpp +++ b/src/dis7/MinefieldStatePdu.cpp @@ -2,296 +2,244 @@ using namespace DIS; - -MinefieldStatePdu::MinefieldStatePdu() : MinefieldFamilyPdu(), - _minefieldID(), - _minefieldSequence(0), - _forceID(0), - _numberOfPerimeterPoints(0), - _minefieldType(), - _numberOfMineTypes(0), - _minefieldLocation(), - _minefieldOrientation(), - _appearance(0), - _protocolMode(0) -{ - setPduType( 37 ); +MinefieldStatePdu::MinefieldStatePdu() + : MinefieldFamilyPdu(), + _minefieldID(), + _minefieldSequence(0), + _forceID(0), + _numberOfPerimeterPoints(0), + _minefieldType(), + _numberOfMineTypes(0), + _minefieldLocation(), + _minefieldOrientation(), + _appearance(0), + _protocolMode(0) { + setPduType(37); } -MinefieldStatePdu::~MinefieldStatePdu() -{ - _perimeterPoints.clear(); - _mineType.clear(); +MinefieldStatePdu::~MinefieldStatePdu() { + _perimeterPoints.clear(); + _mineType.clear(); } -MinefieldIdentifier& MinefieldStatePdu::getMinefieldID() -{ - return _minefieldID; +MinefieldIdentifier& MinefieldStatePdu::getMinefieldID() { + return _minefieldID; } -const MinefieldIdentifier& MinefieldStatePdu::getMinefieldID() const -{ - return _minefieldID; +const MinefieldIdentifier& MinefieldStatePdu::getMinefieldID() const { + return _minefieldID; } -void MinefieldStatePdu::setMinefieldID(const MinefieldIdentifier &pX) -{ - _minefieldID = pX; +void MinefieldStatePdu::setMinefieldID(const MinefieldIdentifier& pX) { + _minefieldID = pX; } -unsigned short MinefieldStatePdu::getMinefieldSequence() const -{ - return _minefieldSequence; +unsigned short MinefieldStatePdu::getMinefieldSequence() const { + return _minefieldSequence; } -void MinefieldStatePdu::setMinefieldSequence(unsigned short pX) -{ - _minefieldSequence = pX; +void MinefieldStatePdu::setMinefieldSequence(unsigned short pX) { + _minefieldSequence = pX; } -unsigned char MinefieldStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char MinefieldStatePdu::getForceID() const { return _forceID; } -void MinefieldStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void MinefieldStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char MinefieldStatePdu::getNumberOfPerimeterPoints() const -{ - return _perimeterPoints.size(); +unsigned char MinefieldStatePdu::getNumberOfPerimeterPoints() const { + return _perimeterPoints.size(); } -EntityType& MinefieldStatePdu::getMinefieldType() -{ - return _minefieldType; -} +EntityType& MinefieldStatePdu::getMinefieldType() { return _minefieldType; } -const EntityType& MinefieldStatePdu::getMinefieldType() const -{ - return _minefieldType; +const EntityType& MinefieldStatePdu::getMinefieldType() const { + return _minefieldType; } -void MinefieldStatePdu::setMinefieldType(const EntityType &pX) -{ - _minefieldType = pX; +void MinefieldStatePdu::setMinefieldType(const EntityType& pX) { + _minefieldType = pX; } -unsigned short MinefieldStatePdu::getNumberOfMineTypes() const -{ - return _mineType.size(); +unsigned short MinefieldStatePdu::getNumberOfMineTypes() const { + return _mineType.size(); } -Vector3Double& MinefieldStatePdu::getMinefieldLocation() -{ - return _minefieldLocation; +Vector3Double& MinefieldStatePdu::getMinefieldLocation() { + return _minefieldLocation; } -const Vector3Double& MinefieldStatePdu::getMinefieldLocation() const -{ - return _minefieldLocation; +const Vector3Double& MinefieldStatePdu::getMinefieldLocation() const { + return _minefieldLocation; } -void MinefieldStatePdu::setMinefieldLocation(const Vector3Double &pX) -{ - _minefieldLocation = pX; +void MinefieldStatePdu::setMinefieldLocation(const Vector3Double& pX) { + _minefieldLocation = pX; } -EulerAngles& MinefieldStatePdu::getMinefieldOrientation() -{ - return _minefieldOrientation; +EulerAngles& MinefieldStatePdu::getMinefieldOrientation() { + return _minefieldOrientation; } -const EulerAngles& MinefieldStatePdu::getMinefieldOrientation() const -{ - return _minefieldOrientation; +const EulerAngles& MinefieldStatePdu::getMinefieldOrientation() const { + return _minefieldOrientation; } -void MinefieldStatePdu::setMinefieldOrientation(const EulerAngles &pX) -{ - _minefieldOrientation = pX; +void MinefieldStatePdu::setMinefieldOrientation(const EulerAngles& pX) { + _minefieldOrientation = pX; } -unsigned short MinefieldStatePdu::getAppearance() const -{ - return _appearance; -} +unsigned short MinefieldStatePdu::getAppearance() const { return _appearance; } -void MinefieldStatePdu::setAppearance(unsigned short pX) -{ - _appearance = pX; -} +void MinefieldStatePdu::setAppearance(unsigned short pX) { _appearance = pX; } -unsigned short MinefieldStatePdu::getProtocolMode() const -{ - return _protocolMode; +unsigned short MinefieldStatePdu::getProtocolMode() const { + return _protocolMode; } -void MinefieldStatePdu::setProtocolMode(unsigned short pX) -{ - _protocolMode = pX; +void MinefieldStatePdu::setProtocolMode(unsigned short pX) { + _protocolMode = pX; } -std::vector& MinefieldStatePdu::getPerimeterPoints() -{ - return _perimeterPoints; +std::vector& MinefieldStatePdu::getPerimeterPoints() { + return _perimeterPoints; } -const std::vector& MinefieldStatePdu::getPerimeterPoints() const -{ - return _perimeterPoints; +const std::vector& MinefieldStatePdu::getPerimeterPoints() const { + return _perimeterPoints; } -void MinefieldStatePdu::setPerimeterPoints(const std::vector& pX) -{ - _perimeterPoints = pX; +void MinefieldStatePdu::setPerimeterPoints( + const std::vector& pX) { + _perimeterPoints = pX; } -std::vector& MinefieldStatePdu::getMineType() -{ - return _mineType; -} +std::vector& MinefieldStatePdu::getMineType() { return _mineType; } -const std::vector& MinefieldStatePdu::getMineType() const -{ - return _mineType; +const std::vector& MinefieldStatePdu::getMineType() const { + return _mineType; } -void MinefieldStatePdu::setMineType(const std::vector& pX) -{ - _mineType = pX; +void MinefieldStatePdu::setMineType(const std::vector& pX) { + _mineType = pX; } -void MinefieldStatePdu::marshal(DataStream& dataStream) const -{ - MinefieldFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _minefieldID.marshal(dataStream); - dataStream << _minefieldSequence; - dataStream << _forceID; - dataStream << ( unsigned char )_perimeterPoints.size(); - _minefieldType.marshal(dataStream); - dataStream << ( unsigned short )_mineType.size(); - _minefieldLocation.marshal(dataStream); - _minefieldOrientation.marshal(dataStream); - dataStream << _appearance; - dataStream << _protocolMode; - - for(size_t idx = 0; idx < _perimeterPoints.size(); idx++) - { - Vector2Float x = _perimeterPoints[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _mineType.size(); idx++) - { - EntityType x = _mineType[idx]; - x.marshal(dataStream); - } +void MinefieldStatePdu::marshal(DataStream& dataStream) const { + MinefieldFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _minefieldID.marshal(dataStream); + dataStream << _minefieldSequence; + dataStream << _forceID; + dataStream << (unsigned char)_perimeterPoints.size(); + _minefieldType.marshal(dataStream); + dataStream << (unsigned short)_mineType.size(); + _minefieldLocation.marshal(dataStream); + _minefieldOrientation.marshal(dataStream); + dataStream << _appearance; + dataStream << _protocolMode; -} + for (size_t idx = 0; idx < _perimeterPoints.size(); idx++) { + Vector2Float x = _perimeterPoints[idx]; + x.marshal(dataStream); + } -void MinefieldStatePdu::unmarshal(DataStream& dataStream) -{ - MinefieldFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _minefieldID.unmarshal(dataStream); - dataStream >> _minefieldSequence; - dataStream >> _forceID; - dataStream >> _numberOfPerimeterPoints; - _minefieldType.unmarshal(dataStream); - dataStream >> _numberOfMineTypes; - _minefieldLocation.unmarshal(dataStream); - _minefieldOrientation.unmarshal(dataStream); - dataStream >> _appearance; - dataStream >> _protocolMode; - - _perimeterPoints.clear(); - for(size_t idx = 0; idx < _numberOfPerimeterPoints; idx++) - { - Vector2Float x; - x.unmarshal(dataStream); - _perimeterPoints.push_back(x); - } - - _mineType.clear(); - for(size_t idx = 0; idx < _numberOfMineTypes; idx++) - { - EntityType x; - x.unmarshal(dataStream); - _mineType.push_back(x); - } + for (size_t idx = 0; idx < _mineType.size(); idx++) { + EntityType x = _mineType[idx]; + x.marshal(dataStream); + } } +void MinefieldStatePdu::unmarshal(DataStream& dataStream) { + MinefieldFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _minefieldID.unmarshal(dataStream); + dataStream >> _minefieldSequence; + dataStream >> _forceID; + dataStream >> _numberOfPerimeterPoints; + _minefieldType.unmarshal(dataStream); + dataStream >> _numberOfMineTypes; + _minefieldLocation.unmarshal(dataStream); + _minefieldOrientation.unmarshal(dataStream); + dataStream >> _appearance; + dataStream >> _protocolMode; -bool MinefieldStatePdu::operator ==(const MinefieldStatePdu& rhs) const - { - bool ivarsEqual = true; + _perimeterPoints.clear(); + for (size_t idx = 0; idx < _numberOfPerimeterPoints; idx++) { + Vector2Float x; + x.unmarshal(dataStream); + _perimeterPoints.push_back(x); + } - ivarsEqual = MinefieldFamilyPdu::operator==(rhs); - - if( ! (_minefieldID == rhs._minefieldID) ) ivarsEqual = false; - if( ! (_minefieldSequence == rhs._minefieldSequence) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_minefieldType == rhs._minefieldType) ) ivarsEqual = false; - if( ! (_minefieldLocation == rhs._minefieldLocation) ) ivarsEqual = false; - if( ! (_minefieldOrientation == rhs._minefieldOrientation) ) ivarsEqual = false; - if( ! (_appearance == rhs._appearance) ) ivarsEqual = false; - if( ! (_protocolMode == rhs._protocolMode) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _perimeterPoints.size(); idx++) - { - if( ! ( _perimeterPoints[idx] == rhs._perimeterPoints[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _mineType.size(); idx++) - { - if( ! ( _mineType[idx] == rhs._mineType[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int MinefieldStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; + _mineType.clear(); + for (size_t idx = 0; idx < _numberOfMineTypes; idx++) { + EntityType x; + x.unmarshal(dataStream); + _mineType.push_back(x); + } +} - marshalSize = MinefieldFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID - marshalSize = marshalSize + 2; // _minefieldSequence - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _numberOfPerimeterPoints - marshalSize = marshalSize + _minefieldType.getMarshalledSize(); // _minefieldType - marshalSize = marshalSize + 2; // _numberOfMineTypes - marshalSize = marshalSize + _minefieldLocation.getMarshalledSize(); // _minefieldLocation - marshalSize = marshalSize + _minefieldOrientation.getMarshalledSize(); // _minefieldOrientation - marshalSize = marshalSize + 2; // _appearance - marshalSize = marshalSize + 2; // _protocolMode +bool MinefieldStatePdu::operator==(const MinefieldStatePdu& rhs) const { + bool ivarsEqual = true; - for(unsigned long long idx=0; idx < _perimeterPoints.size(); idx++) - { - Vector2Float listElement = _perimeterPoints[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + ivarsEqual = MinefieldFamilyPdu::operator==(rhs); + if (!(_minefieldID == rhs._minefieldID)) ivarsEqual = false; + if (!(_minefieldSequence == rhs._minefieldSequence)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_minefieldType == rhs._minefieldType)) ivarsEqual = false; + if (!(_minefieldLocation == rhs._minefieldLocation)) ivarsEqual = false; + if (!(_minefieldOrientation == rhs._minefieldOrientation)) ivarsEqual = false; + if (!(_appearance == rhs._appearance)) ivarsEqual = false; + if (!(_protocolMode == rhs._protocolMode)) ivarsEqual = false; - for(unsigned long long idx=0; idx < _mineType.size(); idx++) - { - EntityType listElement = _mineType[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (size_t idx = 0; idx < _perimeterPoints.size(); idx++) { + if (!(_perimeterPoints[idx] == rhs._perimeterPoints[idx])) + ivarsEqual = false; + } - return marshalSize; + for (size_t idx = 0; idx < _mineType.size(); idx++) { + if (!(_mineType[idx] == rhs._mineType[idx])) ivarsEqual = false; + } + + return ivarsEqual; +} + +int MinefieldStatePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = MinefieldFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _minefieldID.getMarshalledSize(); // _minefieldID + marshalSize = marshalSize + 2; // _minefieldSequence + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _numberOfPerimeterPoints + marshalSize = + marshalSize + _minefieldType.getMarshalledSize(); // _minefieldType + marshalSize = marshalSize + 2; // _numberOfMineTypes + marshalSize = marshalSize + + _minefieldLocation.getMarshalledSize(); // _minefieldLocation + marshalSize = + marshalSize + + _minefieldOrientation.getMarshalledSize(); // _minefieldOrientation + marshalSize = marshalSize + 2; // _appearance + marshalSize = marshalSize + 2; // _protocolMode + + for (unsigned long long idx = 0; idx < _perimeterPoints.size(); idx++) { + Vector2Float listElement = _perimeterPoints[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _mineType.size(); idx++) { + EntityType listElement = _mineType[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -304,7 +252,7 @@ int MinefieldStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MinefieldStatePdu.h b/src/dis7/MinefieldStatePdu.h index e6ecc9fe..fb2ef157 100644 --- a/src/dis7/MinefieldStatePdu.h +++ b/src/dis7/MinefieldStatePdu.h @@ -1,124 +1,121 @@ #pragma once -#include +#include + #include -#include #include -#include -#include -#include #include -#include +#include +#include +#include #include +#include +namespace DIS { +// information about the complete minefield. The minefield presence, perimiter, +// etc. Section 7.9.2 COMPLETE -namespace DIS -{ -// information about the complete minefield. The minefield presence, perimiter, etc. Section 7.9.2 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu -{ -protected: +class OPENDIS7_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { + protected: /** Minefield ID */ - MinefieldIdentifier _minefieldID; + MinefieldIdentifier _minefieldID; /** Minefield sequence */ - unsigned short _minefieldSequence; + unsigned short _minefieldSequence; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** Number of permieter points */ - unsigned char _numberOfPerimeterPoints; + unsigned char _numberOfPerimeterPoints; /** type of minefield */ - EntityType _minefieldType; + EntityType _minefieldType; /** how many mine types */ - unsigned short _numberOfMineTypes; + unsigned short _numberOfMineTypes; /** location of center of minefield in world coords */ - Vector3Double _minefieldLocation; + Vector3Double _minefieldLocation; /** orientation of minefield */ - EulerAngles _minefieldOrientation; + EulerAngles _minefieldOrientation; /** appearance bitflags */ - unsigned short _appearance; + unsigned short _appearance; /** protocolMode. First two bits are the protocol mode, 14 bits reserved. */ - unsigned short _protocolMode; + unsigned short _protocolMode; /** perimeter points for the minefield */ - std::vector _perimeterPoints; + std::vector _perimeterPoints; /** Type of mines */ - std::vector _mineType; - + std::vector _mineType; public: - MinefieldStatePdu(); - virtual ~MinefieldStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + MinefieldStatePdu(); + virtual ~MinefieldStatePdu(); - MinefieldIdentifier& getMinefieldID(); - const MinefieldIdentifier& getMinefieldID() const; - void setMinefieldID(const MinefieldIdentifier &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getMinefieldSequence() const; - void setMinefieldSequence(unsigned short pX); + MinefieldIdentifier& getMinefieldID(); + const MinefieldIdentifier& getMinefieldID() const; + void setMinefieldID(const MinefieldIdentifier& pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned short getMinefieldSequence() const; + void setMinefieldSequence(unsigned short pX); - unsigned char getNumberOfPerimeterPoints() const; + unsigned char getForceID() const; + void setForceID(unsigned char pX); - EntityType& getMinefieldType(); - const EntityType& getMinefieldType() const; - void setMinefieldType(const EntityType &pX); + unsigned char getNumberOfPerimeterPoints() const; - unsigned short getNumberOfMineTypes() const; + EntityType& getMinefieldType(); + const EntityType& getMinefieldType() const; + void setMinefieldType(const EntityType& pX); - Vector3Double& getMinefieldLocation(); - const Vector3Double& getMinefieldLocation() const; - void setMinefieldLocation(const Vector3Double &pX); + unsigned short getNumberOfMineTypes() const; - EulerAngles& getMinefieldOrientation(); - const EulerAngles& getMinefieldOrientation() const; - void setMinefieldOrientation(const EulerAngles &pX); + Vector3Double& getMinefieldLocation(); + const Vector3Double& getMinefieldLocation() const; + void setMinefieldLocation(const Vector3Double& pX); - unsigned short getAppearance() const; - void setAppearance(unsigned short pX); + EulerAngles& getMinefieldOrientation(); + const EulerAngles& getMinefieldOrientation() const; + void setMinefieldOrientation(const EulerAngles& pX); - unsigned short getProtocolMode() const; - void setProtocolMode(unsigned short pX); + unsigned short getAppearance() const; + void setAppearance(unsigned short pX); - std::vector& getPerimeterPoints(); - const std::vector& getPerimeterPoints() const; - void setPerimeterPoints(const std::vector& pX); + unsigned short getProtocolMode() const; + void setProtocolMode(unsigned short pX); - std::vector& getMineType(); - const std::vector& getMineType() const; - void setMineType(const std::vector& pX); + std::vector& getPerimeterPoints(); + const std::vector& getPerimeterPoints() const; + void setPerimeterPoints(const std::vector& pX); + std::vector& getMineType(); + const std::vector& getMineType() const; + void setMineType(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const MinefieldStatePdu& rhs) const; + bool operator==(const MinefieldStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -131,7 +128,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ModulationParameters.cpp b/src/dis7/ModulationParameters.cpp index 0f181afd..51946b85 100644 --- a/src/dis7/ModulationParameters.cpp +++ b/src/dis7/ModulationParameters.cpp @@ -2,44 +2,31 @@ using namespace DIS; +ModulationParameters::ModulationParameters() {} -ModulationParameters::ModulationParameters() -{ -} - -ModulationParameters::~ModulationParameters() -{ -} - -void ModulationParameters::marshal(DataStream& dataStream) const -{ -} - -void ModulationParameters::unmarshal(DataStream& dataStream) -{ -} +ModulationParameters::~ModulationParameters() {} +void ModulationParameters::marshal(DataStream& dataStream) const {} -bool ModulationParameters::operator ==(const ModulationParameters& rhs) const - { - bool ivarsEqual = true; +void ModulationParameters::unmarshal(DataStream& dataStream) {} +bool ModulationParameters::operator==(const ModulationParameters& rhs) const { + bool ivarsEqual = true; - return ivarsEqual; - } + return ivarsEqual; +} -int ModulationParameters::getMarshalledSize() const -{ - int marshalSize = 0; +int ModulationParameters::getMarshalledSize() const { + int marshalSize = 0; - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -52,7 +39,7 @@ int ModulationParameters::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ModulationParameters.h b/src/dis7/ModulationParameters.h index 0adfd44d..7f24369d 100644 --- a/src/dis7/ModulationParameters.h +++ b/src/dis7/ModulationParameters.h @@ -1,40 +1,37 @@ #pragma once -#include #include +#include +namespace DIS { +// Modulation parameters associated with a specific radio system. +// INCOMPLETE. 6.2.58 -namespace DIS -{ -// Modulation parameters associated with a specific radio system. INCOMPLETE. 6.2.58 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ModulationParameters -{ -protected: - +class OPENDIS7_EXPORT ModulationParameters { + protected: public: - ModulationParameters(); - virtual ~ModulationParameters(); + ModulationParameters(); + virtual ~ModulationParameters(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ModulationParameters& rhs) const; + bool operator==(const ModulationParameters& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -47,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ModulationType.cpp b/src/dis7/ModulationType.cpp index c5bf5fd9..092c2f48 100644 --- a/src/dis7/ModulationType.cpp +++ b/src/dis7/ModulationType.cpp @@ -2,104 +2,75 @@ using namespace DIS; +ModulationType::ModulationType() + : _spreadSpectrum(0), _majorModulation(0), _detail(0), _radioSystem(0) {} -ModulationType::ModulationType(): - _spreadSpectrum(0), - _majorModulation(0), - _detail(0), - _radioSystem(0) -{ -} +ModulationType::~ModulationType() {} -ModulationType::~ModulationType() -{ +unsigned short ModulationType::getSpreadSpectrum() const { + return _spreadSpectrum; } -unsigned short ModulationType::getSpreadSpectrum() const -{ - return _spreadSpectrum; +void ModulationType::setSpreadSpectrum(unsigned short pX) { + _spreadSpectrum = pX; } -void ModulationType::setSpreadSpectrum(unsigned short pX) -{ - _spreadSpectrum = pX; +unsigned short ModulationType::getMajorModulation() const { + return _majorModulation; } -unsigned short ModulationType::getMajorModulation() const -{ - return _majorModulation; +void ModulationType::setMajorModulation(unsigned short pX) { + _majorModulation = pX; } -void ModulationType::setMajorModulation(unsigned short pX) -{ - _majorModulation = pX; -} +unsigned short ModulationType::getDetail() const { return _detail; } -unsigned short ModulationType::getDetail() const -{ - return _detail; -} +void ModulationType::setDetail(unsigned short pX) { _detail = pX; } -void ModulationType::setDetail(unsigned short pX) -{ - _detail = pX; -} +unsigned short ModulationType::getRadioSystem() const { return _radioSystem; } -unsigned short ModulationType::getRadioSystem() const -{ - return _radioSystem; -} +void ModulationType::setRadioSystem(unsigned short pX) { _radioSystem = pX; } -void ModulationType::setRadioSystem(unsigned short pX) -{ - _radioSystem = pX; +void ModulationType::marshal(DataStream& dataStream) const { + dataStream << _spreadSpectrum; + dataStream << _majorModulation; + dataStream << _detail; + dataStream << _radioSystem; } -void ModulationType::marshal(DataStream& dataStream) const -{ - dataStream << _spreadSpectrum; - dataStream << _majorModulation; - dataStream << _detail; - dataStream << _radioSystem; -} - -void ModulationType::unmarshal(DataStream& dataStream) -{ - dataStream >> _spreadSpectrum; - dataStream >> _majorModulation; - dataStream >> _detail; - dataStream >> _radioSystem; +void ModulationType::unmarshal(DataStream& dataStream) { + dataStream >> _spreadSpectrum; + dataStream >> _majorModulation; + dataStream >> _detail; + dataStream >> _radioSystem; } +bool ModulationType::operator==(const ModulationType& rhs) const { + bool ivarsEqual = true; -bool ModulationType::operator ==(const ModulationType& rhs) const - { - bool ivarsEqual = true; + if (!(_spreadSpectrum == rhs._spreadSpectrum)) ivarsEqual = false; + if (!(_majorModulation == rhs._majorModulation)) ivarsEqual = false; + if (!(_detail == rhs._detail)) ivarsEqual = false; + if (!(_radioSystem == rhs._radioSystem)) ivarsEqual = false; - if( ! (_spreadSpectrum == rhs._spreadSpectrum) ) ivarsEqual = false; - if( ! (_majorModulation == rhs._majorModulation) ) ivarsEqual = false; - if( ! (_detail == rhs._detail) ) ivarsEqual = false; - if( ! (_radioSystem == rhs._radioSystem) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ModulationType::getMarshalledSize() const -{ - int marshalSize = 0; +int ModulationType::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _spreadSpectrum - marshalSize = marshalSize + 2; // _majorModulation - marshalSize = marshalSize + 2; // _detail - marshalSize = marshalSize + 2; // _radioSystem - return marshalSize; + marshalSize = marshalSize + 2; // _spreadSpectrum + marshalSize = marshalSize + 2; // _majorModulation + marshalSize = marshalSize + 2; // _detail + marshalSize = marshalSize + 2; // _radioSystem + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +83,7 @@ int ModulationType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ModulationType.h b/src/dis7/ModulationType.h index 8674299a..9484e190 100644 --- a/src/dis7/ModulationType.h +++ b/src/dis7/ModulationType.h @@ -1,64 +1,64 @@ #pragma once -#include #include +#include +namespace DIS { +// Information about the type of modulation used for radio transmission. 6.2.59 -namespace DIS -{ -// Information about the type of modulation used for radio transmission. 6.2.59 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ModulationType -{ -protected: - /** This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bt field. */ - unsigned short _spreadSpectrum; +class OPENDIS7_EXPORT ModulationType { + protected: + /** This field shall indicate the spread spectrum technique or combination of + * spread spectrum techniques in use. Bt field. */ + unsigned short _spreadSpectrum; /** the major classification of the modulation type. */ - unsigned short _majorModulation; - - /** provide certain detailed information depending upon the major modulation type */ - unsigned short _detail; + unsigned short _majorModulation; - /** the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system. */ - unsigned short _radioSystem; + /** provide certain detailed information depending upon the major modulation + * type */ + unsigned short _detail; + /** the radio system associated with this Transmitter PDU and shall be used as + * the basis to interpret other fields whose values depend on a specific radio + * system. */ + unsigned short _radioSystem; public: - ModulationType(); - virtual ~ModulationType(); + ModulationType(); + virtual ~ModulationType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSpreadSpectrum() const; - void setSpreadSpectrum(unsigned short pX); + unsigned short getSpreadSpectrum() const; + void setSpreadSpectrum(unsigned short pX); - unsigned short getMajorModulation() const; - void setMajorModulation(unsigned short pX); + unsigned short getMajorModulation() const; + void setMajorModulation(unsigned short pX); - unsigned short getDetail() const; - void setDetail(unsigned short pX); + unsigned short getDetail() const; + void setDetail(unsigned short pX); - unsigned short getRadioSystem() const; - void setRadioSystem(unsigned short pX); + unsigned short getRadioSystem() const; + void setRadioSystem(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ModulationType& rhs) const; + bool operator==(const ModulationType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +71,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Munition.cpp b/src/dis7/Munition.cpp index 550ca477..8170f942 100644 --- a/src/dis7/Munition.cpp +++ b/src/dis7/Munition.cpp @@ -2,124 +2,82 @@ using namespace DIS; +Munition::Munition() + : _munitionType(), + _station(0), + _quantity(0), + _munitionStatus(0), + _padding(0) {} -Munition::Munition(): - _munitionType(), - _station(0), - _quantity(0), - _munitionStatus(0), - _padding(0) -{ -} - -Munition::~Munition() -{ -} +Munition::~Munition() {} -EntityType& Munition::getMunitionType() -{ - return _munitionType; -} +EntityType& Munition::getMunitionType() { return _munitionType; } -const EntityType& Munition::getMunitionType() const -{ - return _munitionType; -} +const EntityType& Munition::getMunitionType() const { return _munitionType; } -void Munition::setMunitionType(const EntityType &pX) -{ - _munitionType = pX; -} +void Munition::setMunitionType(const EntityType& pX) { _munitionType = pX; } -unsigned int Munition::getStation() const -{ - return _station; -} +unsigned int Munition::getStation() const { return _station; } -void Munition::setStation(unsigned int pX) -{ - _station = pX; -} +void Munition::setStation(unsigned int pX) { _station = pX; } -unsigned short Munition::getQuantity() const -{ - return _quantity; -} +unsigned short Munition::getQuantity() const { return _quantity; } -void Munition::setQuantity(unsigned short pX) -{ - _quantity = pX; -} +void Munition::setQuantity(unsigned short pX) { _quantity = pX; } -unsigned char Munition::getMunitionStatus() const -{ - return _munitionStatus; -} +unsigned char Munition::getMunitionStatus() const { return _munitionStatus; } -void Munition::setMunitionStatus(unsigned char pX) -{ - _munitionStatus = pX; -} +void Munition::setMunitionStatus(unsigned char pX) { _munitionStatus = pX; } -unsigned char Munition::getPadding() const -{ - return _padding; -} +unsigned char Munition::getPadding() const { return _padding; } -void Munition::setPadding(unsigned char pX) -{ - _padding = pX; -} +void Munition::setPadding(unsigned char pX) { _padding = pX; } -void Munition::marshal(DataStream& dataStream) const -{ - _munitionType.marshal(dataStream); - dataStream << _station; - dataStream << _quantity; - dataStream << _munitionStatus; - dataStream << _padding; +void Munition::marshal(DataStream& dataStream) const { + _munitionType.marshal(dataStream); + dataStream << _station; + dataStream << _quantity; + dataStream << _munitionStatus; + dataStream << _padding; } -void Munition::unmarshal(DataStream& dataStream) -{ - _munitionType.unmarshal(dataStream); - dataStream >> _station; - dataStream >> _quantity; - dataStream >> _munitionStatus; - dataStream >> _padding; +void Munition::unmarshal(DataStream& dataStream) { + _munitionType.unmarshal(dataStream); + dataStream >> _station; + dataStream >> _quantity; + dataStream >> _munitionStatus; + dataStream >> _padding; } +bool Munition::operator==(const Munition& rhs) const { + bool ivarsEqual = true; -bool Munition::operator ==(const Munition& rhs) const - { - bool ivarsEqual = true; + if (!(_munitionType == rhs._munitionType)) ivarsEqual = false; + if (!(_station == rhs._station)) ivarsEqual = false; + if (!(_quantity == rhs._quantity)) ivarsEqual = false; + if (!(_munitionStatus == rhs._munitionStatus)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - if( ! (_munitionType == rhs._munitionType) ) ivarsEqual = false; - if( ! (_station == rhs._station) ) ivarsEqual = false; - if( ! (_quantity == rhs._quantity) ) ivarsEqual = false; - if( ! (_munitionStatus == rhs._munitionStatus) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Munition::getMarshalledSize() const -{ - int marshalSize = 0; +int Munition::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _munitionType.getMarshalledSize(); // _munitionType - marshalSize = marshalSize + 4; // _station - marshalSize = marshalSize + 2; // _quantity - marshalSize = marshalSize + 1; // _munitionStatus - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = + marshalSize + _munitionType.getMarshalledSize(); // _munitionType + marshalSize = marshalSize + 4; // _station + marshalSize = marshalSize + 2; // _quantity + marshalSize = marshalSize + 1; // _munitionStatus + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -132,7 +90,7 @@ int Munition::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Munition.h b/src/dis7/Munition.h index 710f7d05..86c3fcdd 100644 --- a/src/dis7/Munition.h +++ b/src/dis7/Munition.h @@ -1,72 +1,73 @@ #pragma once #include -#include #include +#include +namespace DIS { +// An entity's munition (e.g., bomb, missile) information shall be represented +// by one or more Munition records. For each type or location of munition, this +// record shall specify the type, location, quantity and status of munitions +// that an entity contains. Section 6.2.60 -namespace DIS -{ -// An entity's munition (e.g., bomb, missile) information shall be represented by one or more Munition records. For each type or location of munition, this record shall specify the type, location, quantity and status of munitions that an entity contains. Section 6.2.60 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Munition -{ -protected: - /** This field shall identify the entity type of the munition. See section 6.2.30. */ - EntityType _munitionType; +class OPENDIS7_EXPORT Munition { + protected: + /** This field shall identify the entity type of the munition. See + * section 6.2.30. */ + EntityType _munitionType; /** the station or launcher to which the munition is assigned. See Annex I */ - unsigned int _station; + unsigned int _station; /** the quantity remaining of this munition. */ - unsigned short _quantity; + unsigned short _quantity; - /** the status of the munition. It shall be represented by an 8-bit enumeration. */ - unsigned char _munitionStatus; + /** the status of the munition. It shall be represented by an 8-bit + * enumeration. */ + unsigned char _munitionStatus; /** padding */ - unsigned char _padding; - + unsigned char _padding; public: - Munition(); - virtual ~Munition(); + Munition(); + virtual ~Munition(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getMunitionType(); - const EntityType& getMunitionType() const; - void setMunitionType(const EntityType &pX); + EntityType& getMunitionType(); + const EntityType& getMunitionType() const; + void setMunitionType(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + unsigned int getStation() const; + void setStation(unsigned int pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + unsigned short getQuantity() const; + void setQuantity(unsigned short pX); - unsigned char getMunitionStatus() const; - void setMunitionStatus(unsigned char pX); + unsigned char getMunitionStatus() const; + void setMunitionStatus(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Munition& rhs) const; + bool operator==(const Munition& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -79,7 +80,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MunitionDescriptor.cpp b/src/dis7/MunitionDescriptor.cpp index 20edb38d..ae1c2576 100644 --- a/src/dis7/MunitionDescriptor.cpp +++ b/src/dis7/MunitionDescriptor.cpp @@ -2,124 +2,82 @@ using namespace DIS; +MunitionDescriptor::MunitionDescriptor() + : _munitionType(), _warhead(0), _fuse(0), _quantity(0), _rate(0) {} -MunitionDescriptor::MunitionDescriptor(): - _munitionType(), - _warhead(0), - _fuse(0), - _quantity(0), - _rate(0) -{ -} +MunitionDescriptor::~MunitionDescriptor() {} -MunitionDescriptor::~MunitionDescriptor() -{ -} +EntityType& MunitionDescriptor::getMunitionType() { return _munitionType; } -EntityType& MunitionDescriptor::getMunitionType() -{ - return _munitionType; +const EntityType& MunitionDescriptor::getMunitionType() const { + return _munitionType; } -const EntityType& MunitionDescriptor::getMunitionType() const -{ - return _munitionType; +void MunitionDescriptor::setMunitionType(const EntityType& pX) { + _munitionType = pX; } -void MunitionDescriptor::setMunitionType(const EntityType &pX) -{ - _munitionType = pX; -} +unsigned short MunitionDescriptor::getWarhead() const { return _warhead; } -unsigned short MunitionDescriptor::getWarhead() const -{ - return _warhead; -} +void MunitionDescriptor::setWarhead(unsigned short pX) { _warhead = pX; } -void MunitionDescriptor::setWarhead(unsigned short pX) -{ - _warhead = pX; -} - -unsigned short MunitionDescriptor::getFuse() const -{ - return _fuse; -} +unsigned short MunitionDescriptor::getFuse() const { return _fuse; } -void MunitionDescriptor::setFuse(unsigned short pX) -{ - _fuse = pX; -} +void MunitionDescriptor::setFuse(unsigned short pX) { _fuse = pX; } -unsigned short MunitionDescriptor::getQuantity() const -{ - return _quantity; -} +unsigned short MunitionDescriptor::getQuantity() const { return _quantity; } -void MunitionDescriptor::setQuantity(unsigned short pX) -{ - _quantity = pX; -} +void MunitionDescriptor::setQuantity(unsigned short pX) { _quantity = pX; } -unsigned short MunitionDescriptor::getRate() const -{ - return _rate; -} +unsigned short MunitionDescriptor::getRate() const { return _rate; } -void MunitionDescriptor::setRate(unsigned short pX) -{ - _rate = pX; -} +void MunitionDescriptor::setRate(unsigned short pX) { _rate = pX; } -void MunitionDescriptor::marshal(DataStream& dataStream) const -{ - _munitionType.marshal(dataStream); - dataStream << _warhead; - dataStream << _fuse; - dataStream << _quantity; - dataStream << _rate; +void MunitionDescriptor::marshal(DataStream& dataStream) const { + _munitionType.marshal(dataStream); + dataStream << _warhead; + dataStream << _fuse; + dataStream << _quantity; + dataStream << _rate; } -void MunitionDescriptor::unmarshal(DataStream& dataStream) -{ - _munitionType.unmarshal(dataStream); - dataStream >> _warhead; - dataStream >> _fuse; - dataStream >> _quantity; - dataStream >> _rate; +void MunitionDescriptor::unmarshal(DataStream& dataStream) { + _munitionType.unmarshal(dataStream); + dataStream >> _warhead; + dataStream >> _fuse; + dataStream >> _quantity; + dataStream >> _rate; } +bool MunitionDescriptor::operator==(const MunitionDescriptor& rhs) const { + bool ivarsEqual = true; -bool MunitionDescriptor::operator ==(const MunitionDescriptor& rhs) const - { - bool ivarsEqual = true; - - if( ! (_munitionType == rhs._munitionType) ) ivarsEqual = false; - if( ! (_warhead == rhs._warhead) ) ivarsEqual = false; - if( ! (_fuse == rhs._fuse) ) ivarsEqual = false; - if( ! (_quantity == rhs._quantity) ) ivarsEqual = false; - if( ! (_rate == rhs._rate) ) ivarsEqual = false; + if (!(_munitionType == rhs._munitionType)) ivarsEqual = false; + if (!(_warhead == rhs._warhead)) ivarsEqual = false; + if (!(_fuse == rhs._fuse)) ivarsEqual = false; + if (!(_quantity == rhs._quantity)) ivarsEqual = false; + if (!(_rate == rhs._rate)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int MunitionDescriptor::getMarshalledSize() const -{ - int marshalSize = 0; +int MunitionDescriptor::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _munitionType.getMarshalledSize(); // _munitionType - marshalSize = marshalSize + 2; // _warhead - marshalSize = marshalSize + 2; // _fuse - marshalSize = marshalSize + 2; // _quantity - marshalSize = marshalSize + 2; // _rate - return marshalSize; + marshalSize = + marshalSize + _munitionType.getMarshalledSize(); // _munitionType + marshalSize = marshalSize + 2; // _warhead + marshalSize = marshalSize + 2; // _fuse + marshalSize = marshalSize + 2; // _quantity + marshalSize = marshalSize + 2; // _rate + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -132,7 +90,7 @@ int MunitionDescriptor::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MunitionDescriptor.h b/src/dis7/MunitionDescriptor.h index 629a9a70..a75a2dbc 100644 --- a/src/dis7/MunitionDescriptor.h +++ b/src/dis7/MunitionDescriptor.h @@ -1,72 +1,68 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Represents the firing or detonation of a munition. Section 6.2.20.2 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT MunitionDescriptor -{ -protected: +class OPENDIS7_EXPORT MunitionDescriptor { + protected: /** What munition was used in the burst */ - EntityType _munitionType; + EntityType _munitionType; /** type of warhead */ - unsigned short _warhead; + unsigned short _warhead; /** type of fuse used */ - unsigned short _fuse; + unsigned short _fuse; /** how many of the munition were fired */ - unsigned short _quantity; + unsigned short _quantity; /** rate at which the munition was fired */ - unsigned short _rate; - + unsigned short _rate; public: - MunitionDescriptor(); - virtual ~MunitionDescriptor(); + MunitionDescriptor(); + virtual ~MunitionDescriptor(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getMunitionType(); - const EntityType& getMunitionType() const; - void setMunitionType(const EntityType &pX); + EntityType& getMunitionType(); + const EntityType& getMunitionType() const; + void setMunitionType(const EntityType& pX); - unsigned short getWarhead() const; - void setWarhead(unsigned short pX); + unsigned short getWarhead() const; + void setWarhead(unsigned short pX); - unsigned short getFuse() const; - void setFuse(unsigned short pX); + unsigned short getFuse() const; + void setFuse(unsigned short pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + unsigned short getQuantity() const; + void setQuantity(unsigned short pX); - unsigned short getRate() const; - void setRate(unsigned short pX); + unsigned short getRate() const; + void setRate(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MunitionDescriptor& rhs) const; + bool operator==(const MunitionDescriptor& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -79,7 +75,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MunitionReload.cpp b/src/dis7/MunitionReload.cpp index 3d51486f..0d849cee 100644 --- a/src/dis7/MunitionReload.cpp +++ b/src/dis7/MunitionReload.cpp @@ -2,139 +2,107 @@ using namespace DIS; +MunitionReload::MunitionReload() + : _munitionType(), + _station(0), + _standardQuantity(0), + _maximumQuantity(0), + _stationName(0), + _stationNumber(0) {} -MunitionReload::MunitionReload(): - _munitionType(), - _station(0), - _standardQuantity(0), - _maximumQuantity(0), - _stationName(0), - _stationNumber(0) -{ -} +MunitionReload::~MunitionReload() {} -MunitionReload::~MunitionReload() -{ -} +EntityType& MunitionReload::getMunitionType() { return _munitionType; } -EntityType& MunitionReload::getMunitionType() -{ - return _munitionType; +const EntityType& MunitionReload::getMunitionType() const { + return _munitionType; } -const EntityType& MunitionReload::getMunitionType() const -{ - return _munitionType; +void MunitionReload::setMunitionType(const EntityType& pX) { + _munitionType = pX; } -void MunitionReload::setMunitionType(const EntityType &pX) -{ - _munitionType = pX; -} - -unsigned int MunitionReload::getStation() const -{ - return _station; -} +unsigned int MunitionReload::getStation() const { return _station; } -void MunitionReload::setStation(unsigned int pX) -{ - _station = pX; -} +void MunitionReload::setStation(unsigned int pX) { _station = pX; } -unsigned short MunitionReload::getStandardQuantity() const -{ - return _standardQuantity; +unsigned short MunitionReload::getStandardQuantity() const { + return _standardQuantity; } -void MunitionReload::setStandardQuantity(unsigned short pX) -{ - _standardQuantity = pX; +void MunitionReload::setStandardQuantity(unsigned short pX) { + _standardQuantity = pX; } -unsigned short MunitionReload::getMaximumQuantity() const -{ - return _maximumQuantity; +unsigned short MunitionReload::getMaximumQuantity() const { + return _maximumQuantity; } -void MunitionReload::setMaximumQuantity(unsigned short pX) -{ - _maximumQuantity = pX; +void MunitionReload::setMaximumQuantity(unsigned short pX) { + _maximumQuantity = pX; } -unsigned short MunitionReload::getStationName() const -{ - return _stationName; -} +unsigned short MunitionReload::getStationName() const { return _stationName; } -void MunitionReload::setStationName(unsigned short pX) -{ - _stationName = pX; -} +void MunitionReload::setStationName(unsigned short pX) { _stationName = pX; } -unsigned short MunitionReload::getStationNumber() const -{ - return _stationNumber; +unsigned short MunitionReload::getStationNumber() const { + return _stationNumber; } -void MunitionReload::setStationNumber(unsigned short pX) -{ - _stationNumber = pX; +void MunitionReload::setStationNumber(unsigned short pX) { + _stationNumber = pX; } -void MunitionReload::marshal(DataStream& dataStream) const -{ - _munitionType.marshal(dataStream); - dataStream << _station; - dataStream << _standardQuantity; - dataStream << _maximumQuantity; - dataStream << _stationName; - dataStream << _stationNumber; +void MunitionReload::marshal(DataStream& dataStream) const { + _munitionType.marshal(dataStream); + dataStream << _station; + dataStream << _standardQuantity; + dataStream << _maximumQuantity; + dataStream << _stationName; + dataStream << _stationNumber; } -void MunitionReload::unmarshal(DataStream& dataStream) -{ - _munitionType.unmarshal(dataStream); - dataStream >> _station; - dataStream >> _standardQuantity; - dataStream >> _maximumQuantity; - dataStream >> _stationName; - dataStream >> _stationNumber; +void MunitionReload::unmarshal(DataStream& dataStream) { + _munitionType.unmarshal(dataStream); + dataStream >> _station; + dataStream >> _standardQuantity; + dataStream >> _maximumQuantity; + dataStream >> _stationName; + dataStream >> _stationNumber; } +bool MunitionReload::operator==(const MunitionReload& rhs) const { + bool ivarsEqual = true; -bool MunitionReload::operator ==(const MunitionReload& rhs) const - { - bool ivarsEqual = true; + if (!(_munitionType == rhs._munitionType)) ivarsEqual = false; + if (!(_station == rhs._station)) ivarsEqual = false; + if (!(_standardQuantity == rhs._standardQuantity)) ivarsEqual = false; + if (!(_maximumQuantity == rhs._maximumQuantity)) ivarsEqual = false; + if (!(_stationName == rhs._stationName)) ivarsEqual = false; + if (!(_stationNumber == rhs._stationNumber)) ivarsEqual = false; - if( ! (_munitionType == rhs._munitionType) ) ivarsEqual = false; - if( ! (_station == rhs._station) ) ivarsEqual = false; - if( ! (_standardQuantity == rhs._standardQuantity) ) ivarsEqual = false; - if( ! (_maximumQuantity == rhs._maximumQuantity) ) ivarsEqual = false; - if( ! (_stationName == rhs._stationName) ) ivarsEqual = false; - if( ! (_stationNumber == rhs._stationNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int MunitionReload::getMarshalledSize() const -{ - int marshalSize = 0; +int MunitionReload::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _munitionType.getMarshalledSize(); // _munitionType - marshalSize = marshalSize + 4; // _station - marshalSize = marshalSize + 2; // _standardQuantity - marshalSize = marshalSize + 2; // _maximumQuantity - marshalSize = marshalSize + 2; // _stationName - marshalSize = marshalSize + 2; // _stationNumber - return marshalSize; + marshalSize = + marshalSize + _munitionType.getMarshalledSize(); // _munitionType + marshalSize = marshalSize + 4; // _station + marshalSize = marshalSize + 2; // _standardQuantity + marshalSize = marshalSize + 2; // _maximumQuantity + marshalSize = marshalSize + 2; // _stationName + marshalSize = marshalSize + 2; // _stationNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -147,7 +115,7 @@ int MunitionReload::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/MunitionReload.h b/src/dis7/MunitionReload.h index 5fd2136c..e2a1e309 100644 --- a/src/dis7/MunitionReload.h +++ b/src/dis7/MunitionReload.h @@ -1,78 +1,79 @@ #pragma once #include -#include #include +#include +namespace DIS { +// indicate weapons (munitions) previously communicated via the Munition record. +// Section 6.2.61 -namespace DIS -{ -// indicate weapons (munitions) previously communicated via the Munition record. Section 6.2.61 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT MunitionReload -{ -protected: - /** This field shall identify the entity type of the munition. See section 6.2.30. */ - EntityType _munitionType; +class OPENDIS7_EXPORT MunitionReload { + protected: + /** This field shall identify the entity type of the munition. See + * section 6.2.30. */ + EntityType _munitionType; /** the station or launcher to which the munition is assigned. See Annex I */ - unsigned int _station; + unsigned int _station; - /** the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified. */ - unsigned short _standardQuantity; + /** the standard quantity of this munition type normally loaded at this + * station/launcher if a station/launcher is specified. */ + unsigned short _standardQuantity; - /** the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified */ - unsigned short _maximumQuantity; + /** the maximum quantity of this munition type that this station/launcher is + * capable of holding when a station/launcher is specified */ + unsigned short _maximumQuantity; /** the station name within the host at which the part entity is located. */ - unsigned short _stationName; - - /** the number of the particular wing station, cargo hold etc., at which the part is attached. */ - unsigned short _stationNumber; + unsigned short _stationName; + /** the number of the particular wing station, cargo hold etc., at which the + * part is attached. */ + unsigned short _stationNumber; public: - MunitionReload(); - virtual ~MunitionReload(); + MunitionReload(); + virtual ~MunitionReload(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getMunitionType(); - const EntityType& getMunitionType() const; - void setMunitionType(const EntityType &pX); + EntityType& getMunitionType(); + const EntityType& getMunitionType() const; + void setMunitionType(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + unsigned int getStation() const; + void setStation(unsigned int pX); - unsigned short getStandardQuantity() const; - void setStandardQuantity(unsigned short pX); + unsigned short getStandardQuantity() const; + void setStandardQuantity(unsigned short pX); - unsigned short getMaximumQuantity() const; - void setMaximumQuantity(unsigned short pX); + unsigned short getMaximumQuantity() const; + void setMaximumQuantity(unsigned short pX); - unsigned short getStationName() const; - void setStationName(unsigned short pX); + unsigned short getStationName() const; + void setStationName(unsigned short pX); - unsigned short getStationNumber() const; - void setStationNumber(unsigned short pX); + unsigned short getStationNumber() const; + void setStationNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const MunitionReload& rhs) const; + bool operator==(const MunitionReload& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -85,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/NamedLocationIdentification.cpp b/src/dis7/NamedLocationIdentification.cpp index bd30b08e..8960ced6 100644 --- a/src/dis7/NamedLocationIdentification.cpp +++ b/src/dis7/NamedLocationIdentification.cpp @@ -2,74 +2,60 @@ using namespace DIS; +NamedLocationIdentification::NamedLocationIdentification() + : _stationName(0), _stationNumber(0) {} -NamedLocationIdentification::NamedLocationIdentification(): - _stationName(0), - _stationNumber(0) -{ -} - -NamedLocationIdentification::~NamedLocationIdentification() -{ -} +NamedLocationIdentification::~NamedLocationIdentification() {} -unsigned short NamedLocationIdentification::getStationName() const -{ - return _stationName; +unsigned short NamedLocationIdentification::getStationName() const { + return _stationName; } -void NamedLocationIdentification::setStationName(unsigned short pX) -{ - _stationName = pX; +void NamedLocationIdentification::setStationName(unsigned short pX) { + _stationName = pX; } -unsigned short NamedLocationIdentification::getStationNumber() const -{ - return _stationNumber; +unsigned short NamedLocationIdentification::getStationNumber() const { + return _stationNumber; } -void NamedLocationIdentification::setStationNumber(unsigned short pX) -{ - _stationNumber = pX; +void NamedLocationIdentification::setStationNumber(unsigned short pX) { + _stationNumber = pX; } -void NamedLocationIdentification::marshal(DataStream& dataStream) const -{ - dataStream << _stationName; - dataStream << _stationNumber; +void NamedLocationIdentification::marshal(DataStream& dataStream) const { + dataStream << _stationName; + dataStream << _stationNumber; } -void NamedLocationIdentification::unmarshal(DataStream& dataStream) -{ - dataStream >> _stationName; - dataStream >> _stationNumber; +void NamedLocationIdentification::unmarshal(DataStream& dataStream) { + dataStream >> _stationName; + dataStream >> _stationNumber; } +bool NamedLocationIdentification::operator==( + const NamedLocationIdentification& rhs) const { + bool ivarsEqual = true; -bool NamedLocationIdentification::operator ==(const NamedLocationIdentification& rhs) const - { - bool ivarsEqual = true; + if (!(_stationName == rhs._stationName)) ivarsEqual = false; + if (!(_stationNumber == rhs._stationNumber)) ivarsEqual = false; - if( ! (_stationName == rhs._stationName) ) ivarsEqual = false; - if( ! (_stationNumber == rhs._stationNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int NamedLocationIdentification::getMarshalledSize() const -{ - int marshalSize = 0; +int NamedLocationIdentification::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _stationName - marshalSize = marshalSize + 2; // _stationNumber - return marshalSize; + marshalSize = marshalSize + 2; // _stationName + marshalSize = marshalSize + 2; // _stationNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +68,7 @@ int NamedLocationIdentification::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/NamedLocationIdentification.h b/src/dis7/NamedLocationIdentification.h index 9a0a4222..8c82a671 100644 --- a/src/dis7/NamedLocationIdentification.h +++ b/src/dis7/NamedLocationIdentification.h @@ -1,52 +1,53 @@ #pragma once -#include #include +#include +namespace DIS { +// Information about the discrete positional relationship of the part entity +// with respect to the its host entity Section 6.2.62 -namespace DIS -{ -// Information about the discrete positional relationship of the part entity with respect to the its host entity Section 6.2.62 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT NamedLocationIdentification -{ -protected: - /** the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part’s location data fields. This field shall be specified by a 16-bit enumeration */ - unsigned short _stationName; - - /** the number of the particular wing station, cargo hold etc., at which the part is attached. */ - unsigned short _stationNumber; +class OPENDIS7_EXPORT NamedLocationIdentification { + protected: + /** the station name within the host at which the part entity is located. If + * the part entity is On Station, this field shall specify the representation + * of the part’s location data fields. This field shall be specified by a + * 16-bit enumeration */ + unsigned short _stationName; + /** the number of the particular wing station, cargo hold etc., at which the + * part is attached. */ + unsigned short _stationNumber; public: - NamedLocationIdentification(); - virtual ~NamedLocationIdentification(); + NamedLocationIdentification(); + virtual ~NamedLocationIdentification(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getStationName() const; - void setStationName(unsigned short pX); + unsigned short getStationName() const; + void setStationName(unsigned short pX); - unsigned short getStationNumber() const; - void setStationNumber(unsigned short pX); + unsigned short getStationNumber() const; + void setStationNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const NamedLocationIdentification& rhs) const; + bool operator==(const NamedLocationIdentification& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ObjectIdentifier.cpp b/src/dis7/ObjectIdentifier.cpp index fc174835..5584a797 100644 --- a/src/dis7/ObjectIdentifier.cpp +++ b/src/dis7/ObjectIdentifier.cpp @@ -2,79 +2,63 @@ using namespace DIS; +ObjectIdentifier::ObjectIdentifier() : _simulationAddress(), _objectNumber(0) {} -ObjectIdentifier::ObjectIdentifier(): - _simulationAddress(), - _objectNumber(0) -{ -} - -ObjectIdentifier::~ObjectIdentifier() -{ -} +ObjectIdentifier::~ObjectIdentifier() {} -SimulationAddress& ObjectIdentifier::getSimulationAddress() -{ - return _simulationAddress; +SimulationAddress& ObjectIdentifier::getSimulationAddress() { + return _simulationAddress; } -const SimulationAddress& ObjectIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +const SimulationAddress& ObjectIdentifier::getSimulationAddress() const { + return _simulationAddress; } -void ObjectIdentifier::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; +void ObjectIdentifier::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -unsigned short ObjectIdentifier::getObjectNumber() const -{ - return _objectNumber; +unsigned short ObjectIdentifier::getObjectNumber() const { + return _objectNumber; } -void ObjectIdentifier::setObjectNumber(unsigned short pX) -{ - _objectNumber = pX; +void ObjectIdentifier::setObjectNumber(unsigned short pX) { + _objectNumber = pX; } -void ObjectIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _objectNumber; +void ObjectIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _objectNumber; } -void ObjectIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _objectNumber; +void ObjectIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _objectNumber; } +bool ObjectIdentifier::operator==(const ObjectIdentifier& rhs) const { + bool ivarsEqual = true; -bool ObjectIdentifier::operator ==(const ObjectIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_objectNumber == rhs._objectNumber)) ivarsEqual = false; - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_objectNumber == rhs._objectNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ObjectIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int ObjectIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _objectNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _objectNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +71,7 @@ int ObjectIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ObjectIdentifier.h b/src/dis7/ObjectIdentifier.h index 8db4ea04..9a0f7c2b 100644 --- a/src/dis7/ObjectIdentifier.h +++ b/src/dis7/ObjectIdentifier.h @@ -1,54 +1,50 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // The unique designation of an environmental object. Section 6.2.63 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ObjectIdentifier -{ -protected: +class OPENDIS7_EXPORT ObjectIdentifier { + protected: /** Simulation Address */ - SimulationAddress _simulationAddress; + SimulationAddress _simulationAddress; /** */ - unsigned short _objectNumber; - + unsigned short _objectNumber; public: - ObjectIdentifier(); - virtual ~ObjectIdentifier(); + ObjectIdentifier(); + virtual ~ObjectIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getObjectNumber() const; - void setObjectNumber(unsigned short pX); + unsigned short getObjectNumber() const; + void setObjectNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ObjectIdentifier& rhs) const; + bool operator==(const ObjectIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ObjectType.cpp b/src/dis7/ObjectType.cpp index 7f19844b..c390fcb4 100644 --- a/src/dis7/ObjectType.cpp +++ b/src/dis7/ObjectType.cpp @@ -2,104 +2,67 @@ using namespace DIS; +ObjectType::ObjectType() + : _domain(0), _objectKind(0), _category(0), _subcategory(0) {} -ObjectType::ObjectType(): - _domain(0), - _objectKind(0), - _category(0), - _subcategory(0) -{ -} +ObjectType::~ObjectType() {} -ObjectType::~ObjectType() -{ -} +unsigned char ObjectType::getDomain() const { return _domain; } -unsigned char ObjectType::getDomain() const -{ - return _domain; -} +void ObjectType::setDomain(unsigned char pX) { _domain = pX; } -void ObjectType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned char ObjectType::getObjectKind() const { return _objectKind; } -unsigned char ObjectType::getObjectKind() const -{ - return _objectKind; -} +void ObjectType::setObjectKind(unsigned char pX) { _objectKind = pX; } -void ObjectType::setObjectKind(unsigned char pX) -{ - _objectKind = pX; -} +unsigned char ObjectType::getCategory() const { return _category; } -unsigned char ObjectType::getCategory() const -{ - return _category; -} +void ObjectType::setCategory(unsigned char pX) { _category = pX; } -void ObjectType::setCategory(unsigned char pX) -{ - _category = pX; -} - -unsigned char ObjectType::getSubcategory() const -{ - return _subcategory; -} +unsigned char ObjectType::getSubcategory() const { return _subcategory; } -void ObjectType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +void ObjectType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void ObjectType::marshal(DataStream& dataStream) const -{ - dataStream << _domain; - dataStream << _objectKind; - dataStream << _category; - dataStream << _subcategory; +void ObjectType::marshal(DataStream& dataStream) const { + dataStream << _domain; + dataStream << _objectKind; + dataStream << _category; + dataStream << _subcategory; } -void ObjectType::unmarshal(DataStream& dataStream) -{ - dataStream >> _domain; - dataStream >> _objectKind; - dataStream >> _category; - dataStream >> _subcategory; +void ObjectType::unmarshal(DataStream& dataStream) { + dataStream >> _domain; + dataStream >> _objectKind; + dataStream >> _category; + dataStream >> _subcategory; } +bool ObjectType::operator==(const ObjectType& rhs) const { + bool ivarsEqual = true; -bool ObjectType::operator ==(const ObjectType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_objectKind == rhs._objectKind) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_objectKind == rhs._objectKind)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int ObjectType::getMarshalledSize() const -{ - int marshalSize = 0; +int ObjectType::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 1; // _objectKind - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - return marshalSize; + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 1; // _objectKind + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +75,7 @@ int ObjectType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ObjectType.h b/src/dis7/ObjectType.h index dcae930d..7c006421 100644 --- a/src/dis7/ObjectType.h +++ b/src/dis7/ObjectType.h @@ -1,64 +1,60 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // The unique designation of an environmental object. Section 6.2.64 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ObjectType -{ -protected: +class OPENDIS7_EXPORT ObjectType { + protected: /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned char _objectKind; + unsigned char _objectKind; /** category of entity */ - unsigned char _category; + unsigned char _category; /** subcategory of entity */ - unsigned char _subcategory; - + unsigned char _subcategory; public: - ObjectType(); - virtual ~ObjectType(); + ObjectType(); + virtual ~ObjectType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned char getObjectKind() const; - void setObjectKind(unsigned char pX); + unsigned char getObjectKind() const; + void setObjectKind(unsigned char pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ObjectType& rhs) const; + bool operator==(const ObjectType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +67,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/OwnershipStatus.cpp b/src/dis7/OwnershipStatus.cpp index ff4f2d23..dbfe83b1 100644 --- a/src/dis7/OwnershipStatus.cpp +++ b/src/dis7/OwnershipStatus.cpp @@ -2,94 +2,65 @@ using namespace DIS; +OwnershipStatus::OwnershipStatus() + : _entityId(), _ownershipStatus(0), _padding(0) {} -OwnershipStatus::OwnershipStatus(): - _entityId(), - _ownershipStatus(0), - _padding(0) -{ -} +OwnershipStatus::~OwnershipStatus() {} -OwnershipStatus::~OwnershipStatus() -{ -} +EntityID& OwnershipStatus::getEntityId() { return _entityId; } -EntityID& OwnershipStatus::getEntityId() -{ - return _entityId; -} - -const EntityID& OwnershipStatus::getEntityId() const -{ - return _entityId; -} +const EntityID& OwnershipStatus::getEntityId() const { return _entityId; } -void OwnershipStatus::setEntityId(const EntityID &pX) -{ - _entityId = pX; -} +void OwnershipStatus::setEntityId(const EntityID& pX) { _entityId = pX; } -unsigned char OwnershipStatus::getOwnershipStatus() const -{ - return _ownershipStatus; +unsigned char OwnershipStatus::getOwnershipStatus() const { + return _ownershipStatus; } -void OwnershipStatus::setOwnershipStatus(unsigned char pX) -{ - _ownershipStatus = pX; +void OwnershipStatus::setOwnershipStatus(unsigned char pX) { + _ownershipStatus = pX; } -unsigned char OwnershipStatus::getPadding() const -{ - return _padding; -} +unsigned char OwnershipStatus::getPadding() const { return _padding; } -void OwnershipStatus::setPadding(unsigned char pX) -{ - _padding = pX; -} +void OwnershipStatus::setPadding(unsigned char pX) { _padding = pX; } -void OwnershipStatus::marshal(DataStream& dataStream) const -{ - _entityId.marshal(dataStream); - dataStream << _ownershipStatus; - dataStream << _padding; +void OwnershipStatus::marshal(DataStream& dataStream) const { + _entityId.marshal(dataStream); + dataStream << _ownershipStatus; + dataStream << _padding; } -void OwnershipStatus::unmarshal(DataStream& dataStream) -{ - _entityId.unmarshal(dataStream); - dataStream >> _ownershipStatus; - dataStream >> _padding; +void OwnershipStatus::unmarshal(DataStream& dataStream) { + _entityId.unmarshal(dataStream); + dataStream >> _ownershipStatus; + dataStream >> _padding; } +bool OwnershipStatus::operator==(const OwnershipStatus& rhs) const { + bool ivarsEqual = true; -bool OwnershipStatus::operator ==(const OwnershipStatus& rhs) const - { - bool ivarsEqual = true; + if (!(_entityId == rhs._entityId)) ivarsEqual = false; + if (!(_ownershipStatus == rhs._ownershipStatus)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - if( ! (_entityId == rhs._entityId) ) ivarsEqual = false; - if( ! (_ownershipStatus == rhs._ownershipStatus) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int OwnershipStatus::getMarshalledSize() const -{ - int marshalSize = 0; +int OwnershipStatus::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _entityId.getMarshalledSize(); // _entityId - marshalSize = marshalSize + 1; // _ownershipStatus - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + _entityId.getMarshalledSize(); // _entityId + marshalSize = marshalSize + 1; // _ownershipStatus + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -102,7 +73,7 @@ int OwnershipStatus::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/OwnershipStatus.h b/src/dis7/OwnershipStatus.h index f3c9e995..456e9229 100644 --- a/src/dis7/OwnershipStatus.h +++ b/src/dis7/OwnershipStatus.h @@ -1,60 +1,58 @@ #pragma once #include -#include #include +#include +namespace DIS { +// used to convey entity and conflict status information associated with +// transferring ownership of an entity. Section 6.2.65 -namespace DIS -{ -// used to convey entity and conflict status information associated with transferring ownership of an entity. Section 6.2.65 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT OwnershipStatus -{ -protected: +class OPENDIS7_EXPORT OwnershipStatus { + protected: /** EntityID */ - EntityID _entityId; + EntityID _entityId; - /** The ownership and/or ownership conflict status of the entity represented by the Entity ID field. */ - unsigned char _ownershipStatus; + /** The ownership and/or ownership conflict status of the entity represented + * by the Entity ID field. */ + unsigned char _ownershipStatus; /** padding */ - unsigned char _padding; - + unsigned char _padding; public: - OwnershipStatus(); - virtual ~OwnershipStatus(); + OwnershipStatus(); + virtual ~OwnershipStatus(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEntityId(); - const EntityID& getEntityId() const; - void setEntityId(const EntityID &pX); + EntityID& getEntityId(); + const EntityID& getEntityId() const; + void setEntityId(const EntityID& pX); - unsigned char getOwnershipStatus() const; - void setOwnershipStatus(unsigned char pX); + unsigned char getOwnershipStatus() const; + void setOwnershipStatus(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const OwnershipStatus& rhs) const; + bool operator==(const OwnershipStatus& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +65,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Pdu.cpp b/src/dis7/Pdu.cpp index d7bce854..7e7d5a67 100644 --- a/src/dis7/Pdu.cpp +++ b/src/dis7/Pdu.cpp @@ -2,79 +2,57 @@ using namespace DIS; +Pdu::Pdu() : PduSuperclass(), _pduStatus(0), _padding(0) {} -Pdu::Pdu() : PduSuperclass(), - _pduStatus(0), - _padding(0) -{ -} +Pdu::~Pdu() {} -Pdu::~Pdu() -{ -} +unsigned char Pdu::getPduStatus() const { return _pduStatus; } -unsigned char Pdu::getPduStatus() const -{ - return _pduStatus; -} +void Pdu::setPduStatus(unsigned char pX) { _pduStatus = pX; } -void Pdu::setPduStatus(unsigned char pX) -{ - _pduStatus = pX; -} +unsigned char Pdu::getPadding() const { return _padding; } -unsigned char Pdu::getPadding() const -{ - return _padding; -} +void Pdu::setPadding(unsigned char pX) { _padding = pX; } -void Pdu::setPadding(unsigned char pX) -{ - _padding = pX; +void Pdu::marshal(DataStream& dataStream) const { + PduSuperclass::marshal( + dataStream); // Marshal information in superclass first + dataStream << _pduStatus; + dataStream << _padding; } -void Pdu::marshal(DataStream& dataStream) const -{ - PduSuperclass::marshal(dataStream); // Marshal information in superclass first - dataStream << _pduStatus; - dataStream << _padding; -} - -void Pdu::unmarshal(DataStream& dataStream) -{ - PduSuperclass::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _pduStatus; - dataStream >> _padding; +void Pdu::unmarshal(DataStream& dataStream) { + PduSuperclass::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _pduStatus; + dataStream >> _padding; } +bool Pdu::operator==(const Pdu& rhs) const { + bool ivarsEqual = true; -bool Pdu::operator ==(const Pdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = PduSuperclass::operator==(rhs); - ivarsEqual = PduSuperclass::operator==(rhs); + if (!(_pduStatus == rhs._pduStatus)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - if( ! (_pduStatus == rhs._pduStatus) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Pdu::getMarshalledSize() const -{ - int marshalSize = 0; +int Pdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = PduSuperclass::getMarshalledSize(); - marshalSize = marshalSize + 1; // _pduStatus - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = PduSuperclass::getMarshalledSize(); + marshalSize = marshalSize + 1; // _pduStatus + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +65,7 @@ int Pdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Pdu.h b/src/dis7/Pdu.h index 357bddb0..f961892d 100644 --- a/src/dis7/Pdu.h +++ b/src/dis7/Pdu.h @@ -1,53 +1,50 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Adds some fields to the the classic PDU -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Pdu : public PduSuperclass -{ -protected: - /** PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions */ - unsigned char _pduStatus; +class OPENDIS7_EXPORT Pdu : public PduSuperclass { + protected: + /** PDU Status Record. Described in 6.2.67. This field is not present in + * earlier DIS versions */ + unsigned char _pduStatus; /** zero-filled array of padding */ - unsigned char _padding; - + unsigned char _padding; public: - Pdu(); - virtual ~Pdu(); + Pdu(); + virtual ~Pdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getPduStatus() const; - void setPduStatus(unsigned char pX); + unsigned char getPduStatus() const; + void setPduStatus(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Pdu& rhs) const; + bool operator==(const Pdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -60,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduContainer.cpp b/src/dis7/PduContainer.cpp index af7532b3..0f86cad5 100644 --- a/src/dis7/PduContainer.cpp +++ b/src/dis7/PduContainer.cpp @@ -2,97 +2,66 @@ using namespace DIS; +PduContainer::PduContainer() : _numberOfPdus(0) {} -PduContainer::PduContainer(): - _numberOfPdus(0) -{ -} +PduContainer::~PduContainer() { _pdus.clear(); } -PduContainer::~PduContainer() -{ - _pdus.clear(); -} +unsigned int PduContainer::getNumberOfPdus() const { return _pdus.size(); } -unsigned int PduContainer::getNumberOfPdus() const -{ - return _pdus.size(); -} +std::vector& PduContainer::getPdus() { return _pdus; } -std::vector& PduContainer::getPdus() -{ - return _pdus; -} +const std::vector& PduContainer::getPdus() const { return _pdus; } -const std::vector& PduContainer::getPdus() const -{ - return _pdus; -} - -void PduContainer::setPdus(const std::vector& pX) -{ - _pdus = pX; -} +void PduContainer::setPdus(const std::vector& pX) { _pdus = pX; } -void PduContainer::marshal(DataStream& dataStream) const -{ - dataStream << ( int )_pdus.size(); +void PduContainer::marshal(DataStream& dataStream) const { + dataStream << (int)_pdus.size(); - for(size_t idx = 0; idx < _pdus.size(); idx++) - { - Pdu x = _pdus[idx]; - x.marshal(dataStream); - } - -} - -void PduContainer::unmarshal(DataStream& dataStream) -{ - dataStream >> _numberOfPdus; - - _pdus.clear(); - for(size_t idx = 0; idx < _numberOfPdus; idx++) - { - Pdu x; - x.unmarshal(dataStream); - _pdus.push_back(x); - } + for (size_t idx = 0; idx < _pdus.size(); idx++) { + Pdu x = _pdus[idx]; + x.marshal(dataStream); + } } +void PduContainer::unmarshal(DataStream& dataStream) { + dataStream >> _numberOfPdus; -bool PduContainer::operator ==(const PduContainer& rhs) const - { - bool ivarsEqual = true; - + _pdus.clear(); + for (size_t idx = 0; idx < _numberOfPdus; idx++) { + Pdu x; + x.unmarshal(dataStream); + _pdus.push_back(x); + } +} - for(size_t idx = 0; idx < _pdus.size(); idx++) - { - if( ! ( _pdus[idx] == rhs._pdus[idx]) ) ivarsEqual = false; - } +bool PduContainer::operator==(const PduContainer& rhs) const { + bool ivarsEqual = true; + for (size_t idx = 0; idx < _pdus.size(); idx++) { + if (!(_pdus[idx] == rhs._pdus[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int PduContainer::getMarshalledSize() const -{ - int marshalSize = 0; +int PduContainer::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _numberOfPdus + marshalSize = marshalSize + 4; // _numberOfPdus - for(unsigned long long idx=0; idx < _pdus.size(); idx++) - { - Pdu listElement = _pdus[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _pdus.size(); idx++) { + Pdu listElement = _pdus[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +74,7 @@ int PduContainer::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduContainer.h b/src/dis7/PduContainer.h index f67c268b..23faaa89 100644 --- a/src/dis7/PduContainer.h +++ b/src/dis7/PduContainer.h @@ -1,54 +1,51 @@ #pragma once -#include #include -#include -#include +#include +#include +#include -namespace DIS -{ +namespace DIS { // Used for XML compatability. A container that holds PDUs -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT PduContainer -{ -protected: +class OPENDIS7_EXPORT PduContainer { + protected: /** Number of PDUs in the container list */ - unsigned int _numberOfPdus; + unsigned int _numberOfPdus; /** record sets */ - std::vector _pdus; - + std::vector _pdus; public: - PduContainer(); - virtual ~PduContainer(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + PduContainer(); + virtual ~PduContainer(); - unsigned int getNumberOfPdus() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - std::vector& getPdus(); - const std::vector& getPdus() const; - void setPdus(const std::vector& pX); + unsigned int getNumberOfPdus() const; + std::vector& getPdus(); + const std::vector& getPdus() const; + void setPdus(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const PduContainer& rhs) const; + bool operator==(const PduContainer& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduHeader.cpp b/src/dis7/PduHeader.cpp index c1ee5f09..14e82e63 100644 --- a/src/dis7/PduHeader.cpp +++ b/src/dis7/PduHeader.cpp @@ -2,164 +2,106 @@ using namespace DIS; +PduHeader::PduHeader() + : _protocolVersion(7), + _exerciseID(0), + _pduType(0), + _protocolFamily(0), + _timestamp(0), + _pduLength(0), + _pduStatus(0), + _padding(0) {} -PduHeader::PduHeader(): - _protocolVersion(7), - _exerciseID(0), - _pduType(0), - _protocolFamily(0), - _timestamp(0), - _pduLength(0), - _pduStatus(0), - _padding(0) -{ -} +PduHeader::~PduHeader() {} -PduHeader::~PduHeader() -{ -} +unsigned char PduHeader::getProtocolVersion() const { return _protocolVersion; } -unsigned char PduHeader::getProtocolVersion() const -{ - return _protocolVersion; -} +void PduHeader::setProtocolVersion(unsigned char pX) { _protocolVersion = pX; } -void PduHeader::setProtocolVersion(unsigned char pX) -{ - _protocolVersion = pX; -} +unsigned char PduHeader::getExerciseID() const { return _exerciseID; } -unsigned char PduHeader::getExerciseID() const -{ - return _exerciseID; -} +void PduHeader::setExerciseID(unsigned char pX) { _exerciseID = pX; } -void PduHeader::setExerciseID(unsigned char pX) -{ - _exerciseID = pX; -} +unsigned char PduHeader::getPduType() const { return _pduType; } -unsigned char PduHeader::getPduType() const -{ - return _pduType; -} +void PduHeader::setPduType(unsigned char pX) { _pduType = pX; } -void PduHeader::setPduType(unsigned char pX) -{ - _pduType = pX; -} +unsigned char PduHeader::getProtocolFamily() const { return _protocolFamily; } -unsigned char PduHeader::getProtocolFamily() const -{ - return _protocolFamily; -} +void PduHeader::setProtocolFamily(unsigned char pX) { _protocolFamily = pX; } -void PduHeader::setProtocolFamily(unsigned char pX) -{ - _protocolFamily = pX; -} +unsigned int PduHeader::getTimestamp() const { return _timestamp; } -unsigned int PduHeader::getTimestamp() const -{ - return _timestamp; -} +void PduHeader::setTimestamp(unsigned int pX) { _timestamp = pX; } -void PduHeader::setTimestamp(unsigned int pX) -{ - _timestamp = pX; -} +unsigned char PduHeader::getPduLength() const { return _pduLength; } -unsigned char PduHeader::getPduLength() const -{ - return _pduLength; -} +void PduHeader::setPduLength(unsigned char pX) { _pduLength = pX; } -void PduHeader::setPduLength(unsigned char pX) -{ - _pduLength = pX; -} +unsigned short PduHeader::getPduStatus() const { return _pduStatus; } -unsigned short PduHeader::getPduStatus() const -{ - return _pduStatus; -} +void PduHeader::setPduStatus(unsigned short pX) { _pduStatus = pX; } -void PduHeader::setPduStatus(unsigned short pX) -{ - _pduStatus = pX; -} +unsigned char PduHeader::getPadding() const { return _padding; } -unsigned char PduHeader::getPadding() const -{ - return _padding; -} +void PduHeader::setPadding(unsigned char pX) { _padding = pX; } -void PduHeader::setPadding(unsigned char pX) -{ - _padding = pX; +void PduHeader::marshal(DataStream& dataStream) const { + dataStream << _protocolVersion; + dataStream << _exerciseID; + dataStream << _pduType; + dataStream << _protocolFamily; + dataStream << _timestamp; + dataStream << _pduLength; + dataStream << _pduStatus; + dataStream << _padding; } -void PduHeader::marshal(DataStream& dataStream) const -{ - dataStream << _protocolVersion; - dataStream << _exerciseID; - dataStream << _pduType; - dataStream << _protocolFamily; - dataStream << _timestamp; - dataStream << _pduLength; - dataStream << _pduStatus; - dataStream << _padding; +void PduHeader::unmarshal(DataStream& dataStream) { + dataStream >> _protocolVersion; + dataStream >> _exerciseID; + dataStream >> _pduType; + dataStream >> _protocolFamily; + dataStream >> _timestamp; + dataStream >> _pduLength; + dataStream >> _pduStatus; + dataStream >> _padding; } -void PduHeader::unmarshal(DataStream& dataStream) -{ - dataStream >> _protocolVersion; - dataStream >> _exerciseID; - dataStream >> _pduType; - dataStream >> _protocolFamily; - dataStream >> _timestamp; - dataStream >> _pduLength; - dataStream >> _pduStatus; - dataStream >> _padding; +bool PduHeader::operator==(const PduHeader& rhs) const { + bool ivarsEqual = true; + + if (!(_protocolVersion == rhs._protocolVersion)) ivarsEqual = false; + if (!(_exerciseID == rhs._exerciseID)) ivarsEqual = false; + if (!(_pduType == rhs._pduType)) ivarsEqual = false; + if (!(_protocolFamily == rhs._protocolFamily)) ivarsEqual = false; + if (!(_timestamp == rhs._timestamp)) ivarsEqual = false; + if (!(_pduLength == rhs._pduLength)) ivarsEqual = false; + if (!(_pduStatus == rhs._pduStatus)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; + + return ivarsEqual; } +int PduHeader::getMarshalledSize() const { + int marshalSize = 0; -bool PduHeader::operator ==(const PduHeader& rhs) const - { - bool ivarsEqual = true; - - if( ! (_protocolVersion == rhs._protocolVersion) ) ivarsEqual = false; - if( ! (_exerciseID == rhs._exerciseID) ) ivarsEqual = false; - if( ! (_pduType == rhs._pduType) ) ivarsEqual = false; - if( ! (_protocolFamily == rhs._protocolFamily) ) ivarsEqual = false; - if( ! (_timestamp == rhs._timestamp) ) ivarsEqual = false; - if( ! (_pduLength == rhs._pduLength) ) ivarsEqual = false; - if( ! (_pduStatus == rhs._pduStatus) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } - -int PduHeader::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _protocolVersion - marshalSize = marshalSize + 1; // _exerciseID - marshalSize = marshalSize + 1; // _pduType - marshalSize = marshalSize + 1; // _protocolFamily - marshalSize = marshalSize + 4; // _timestamp - marshalSize = marshalSize + 1; // _pduLength - marshalSize = marshalSize + 2; // _pduStatus - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + 1; // _protocolVersion + marshalSize = marshalSize + 1; // _exerciseID + marshalSize = marshalSize + 1; // _pduType + marshalSize = marshalSize + 1; // _protocolFamily + marshalSize = marshalSize + 4; // _timestamp + marshalSize = marshalSize + 1; // _pduLength + marshalSize = marshalSize + 2; // _pduStatus + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -172,7 +114,7 @@ int PduHeader::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduHeader.h b/src/dis7/PduHeader.h index 63c8679a..0f3ad746 100644 --- a/src/dis7/PduHeader.h +++ b/src/dis7/PduHeader.h @@ -1,88 +1,87 @@ #pragma once -#include #include +#include +namespace DIS { +// Not used. The PDU Header Record is directly incoroporated into the PDU class. +// Here for completness only. Section 6.2.66 -namespace DIS -{ -// Not used. The PDU Header Record is directly incoroporated into the PDU class. Here for completness only. Section 6.2.66 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT PduHeader -{ -protected: +class OPENDIS7_EXPORT PduHeader { + protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009. */ - unsigned char _protocolVersion; + unsigned char _protocolVersion; /** Exercise ID */ - unsigned char _exerciseID; + unsigned char _exerciseID; /** Type of pdu, unique for each PDU class */ - unsigned char _pduType; + unsigned char _pduType; /** value that refers to the protocol family, eg SimulationManagement, etc */ - unsigned char _protocolFamily; + unsigned char _protocolFamily; /** Timestamp value */ - unsigned int _timestamp; + unsigned int _timestamp; - /** Length, in bytes, of the PDU. Changed name from length to avoid use of Hibernate QL reserved word. */ - unsigned char _pduLength; + /** Length, in bytes, of the PDU. Changed name from length to avoid use of + * Hibernate QL reserved word. */ + unsigned char _pduLength; - /** PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions */ - unsigned short _pduStatus; + /** PDU Status Record. Described in 6.2.67. This field is not present in + * earlier DIS versions */ + unsigned short _pduStatus; /** zero filled array of padding */ - unsigned char _padding; - + unsigned char _padding; public: - PduHeader(); - virtual ~PduHeader(); + PduHeader(); + virtual ~PduHeader(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getProtocolVersion() const; - void setProtocolVersion(unsigned char pX); + unsigned char getProtocolVersion() const; + void setProtocolVersion(unsigned char pX); - unsigned char getExerciseID() const; - void setExerciseID(unsigned char pX); + unsigned char getExerciseID() const; + void setExerciseID(unsigned char pX); - unsigned char getPduType() const; - void setPduType(unsigned char pX); + unsigned char getPduType() const; + void setPduType(unsigned char pX); - unsigned char getProtocolFamily() const; - void setProtocolFamily(unsigned char pX); + unsigned char getProtocolFamily() const; + void setProtocolFamily(unsigned char pX); - unsigned int getTimestamp() const; - void setTimestamp(unsigned int pX); + unsigned int getTimestamp() const; + void setTimestamp(unsigned int pX); - unsigned char getPduLength() const; - void setPduLength(unsigned char pX); + unsigned char getPduLength() const; + void setPduLength(unsigned char pX); - unsigned short getPduStatus() const; - void setPduStatus(unsigned short pX); + unsigned short getPduStatus() const; + void setPduStatus(unsigned short pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const PduHeader& rhs) const; + bool operator==(const PduHeader& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +94,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduStatus.cpp b/src/dis7/PduStatus.cpp index 16628ec4..5a61937e 100644 --- a/src/dis7/PduStatus.cpp +++ b/src/dis7/PduStatus.cpp @@ -2,59 +2,40 @@ using namespace DIS; +PduStatus::PduStatus() : _pduStatus(0) {} -PduStatus::PduStatus(): - _pduStatus(0) -{ -} - -PduStatus::~PduStatus() -{ -} - -unsigned char PduStatus::getPduStatus() const -{ - return _pduStatus; -} +PduStatus::~PduStatus() {} -void PduStatus::setPduStatus(unsigned char pX) -{ - _pduStatus = pX; -} +unsigned char PduStatus::getPduStatus() const { return _pduStatus; } -void PduStatus::marshal(DataStream& dataStream) const -{ - dataStream << _pduStatus; -} +void PduStatus::setPduStatus(unsigned char pX) { _pduStatus = pX; } -void PduStatus::unmarshal(DataStream& dataStream) -{ - dataStream >> _pduStatus; +void PduStatus::marshal(DataStream& dataStream) const { + dataStream << _pduStatus; } +void PduStatus::unmarshal(DataStream& dataStream) { dataStream >> _pduStatus; } -bool PduStatus::operator ==(const PduStatus& rhs) const - { - bool ivarsEqual = true; +bool PduStatus::operator==(const PduStatus& rhs) const { + bool ivarsEqual = true; - if( ! (_pduStatus == rhs._pduStatus) ) ivarsEqual = false; + if (!(_pduStatus == rhs._pduStatus)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int PduStatus::getMarshalledSize() const -{ - int marshalSize = 0; +int PduStatus::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _pduStatus - return marshalSize; + marshalSize = marshalSize + 1; // _pduStatus + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +48,7 @@ int PduStatus::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduStatus.h b/src/dis7/PduStatus.h index 1aa2ba93..76d7ebfd 100644 --- a/src/dis7/PduStatus.h +++ b/src/dis7/PduStatus.h @@ -1,46 +1,43 @@ #pragma once -#include #include +#include +namespace DIS { +// PDU Status. These are a series of bit fields. Represented here as just a +// byte. Section 6.2.67 -namespace DIS -{ -// PDU Status. These are a series of bit fields. Represented here as just a byte. Section 6.2.67 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT PduStatus -{ -protected: +class OPENDIS7_EXPORT PduStatus { + protected: /** Bit fields */ - unsigned char _pduStatus; - + unsigned char _pduStatus; public: - PduStatus(); - virtual ~PduStatus(); + PduStatus(); + virtual ~PduStatus(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getPduStatus() const; - void setPduStatus(unsigned char pX); + unsigned char getPduStatus() const; + void setPduStatus(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const PduStatus& rhs) const; + bool operator==(const PduStatus& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -53,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduSuperclass.cpp b/src/dis7/PduSuperclass.cpp index 87a5ebb1..4b7608ad 100644 --- a/src/dis7/PduSuperclass.cpp +++ b/src/dis7/PduSuperclass.cpp @@ -2,134 +2,96 @@ using namespace DIS; +PduSuperclass::PduSuperclass() + : _protocolVersion(7), + _exerciseID(0), + _pduType(0), + _protocolFamily(0), + _timestamp(0), + _length(0) {} -PduSuperclass::PduSuperclass(): - _protocolVersion(7), - _exerciseID(0), - _pduType(0), - _protocolFamily(0), - _timestamp(0), - _length(0) -{ -} +PduSuperclass::~PduSuperclass() {} -PduSuperclass::~PduSuperclass() -{ +unsigned char PduSuperclass::getProtocolVersion() const { + return _protocolVersion; } -unsigned char PduSuperclass::getProtocolVersion() const -{ - return _protocolVersion; +void PduSuperclass::setProtocolVersion(unsigned char pX) { + _protocolVersion = pX; } -void PduSuperclass::setProtocolVersion(unsigned char pX) -{ - _protocolVersion = pX; -} +unsigned char PduSuperclass::getExerciseID() const { return _exerciseID; } -unsigned char PduSuperclass::getExerciseID() const -{ - return _exerciseID; -} +void PduSuperclass::setExerciseID(unsigned char pX) { _exerciseID = pX; } -void PduSuperclass::setExerciseID(unsigned char pX) -{ - _exerciseID = pX; -} +unsigned char PduSuperclass::getPduType() const { return _pduType; } -unsigned char PduSuperclass::getPduType() const -{ - return _pduType; -} +void PduSuperclass::setPduType(unsigned char pX) { _pduType = pX; } -void PduSuperclass::setPduType(unsigned char pX) -{ - _pduType = pX; +unsigned char PduSuperclass::getProtocolFamily() const { + return _protocolFamily; } -unsigned char PduSuperclass::getProtocolFamily() const -{ - return _protocolFamily; +void PduSuperclass::setProtocolFamily(unsigned char pX) { + _protocolFamily = pX; } -void PduSuperclass::setProtocolFamily(unsigned char pX) -{ - _protocolFamily = pX; -} +unsigned int PduSuperclass::getTimestamp() const { return _timestamp; } -unsigned int PduSuperclass::getTimestamp() const -{ - return _timestamp; -} +void PduSuperclass::setTimestamp(unsigned int pX) { _timestamp = pX; } -void PduSuperclass::setTimestamp(unsigned int pX) -{ - _timestamp = pX; -} - -unsigned short PduSuperclass::getLength() const -{ - return _length; -} +unsigned short PduSuperclass::getLength() const { return _length; } -void PduSuperclass::setLength(unsigned short pX) -{ - _length = pX; -} +void PduSuperclass::setLength(unsigned short pX) { _length = pX; } -void PduSuperclass::marshal(DataStream& dataStream) const -{ - dataStream << _protocolVersion; - dataStream << _exerciseID; - dataStream << _pduType; - dataStream << _protocolFamily; - dataStream << _timestamp; - dataStream << _length; +void PduSuperclass::marshal(DataStream& dataStream) const { + dataStream << _protocolVersion; + dataStream << _exerciseID; + dataStream << _pduType; + dataStream << _protocolFamily; + dataStream << _timestamp; + dataStream << _length; } -void PduSuperclass::unmarshal(DataStream& dataStream) -{ - dataStream >> _protocolVersion; - dataStream >> _exerciseID; - dataStream >> _pduType; - dataStream >> _protocolFamily; - dataStream >> _timestamp; - dataStream >> _length; +void PduSuperclass::unmarshal(DataStream& dataStream) { + dataStream >> _protocolVersion; + dataStream >> _exerciseID; + dataStream >> _pduType; + dataStream >> _protocolFamily; + dataStream >> _timestamp; + dataStream >> _length; } +bool PduSuperclass::operator==(const PduSuperclass& rhs) const { + bool ivarsEqual = true; -bool PduSuperclass::operator ==(const PduSuperclass& rhs) const - { - bool ivarsEqual = true; - - if( ! (_protocolVersion == rhs._protocolVersion) ) ivarsEqual = false; - if( ! (_exerciseID == rhs._exerciseID) ) ivarsEqual = false; - if( ! (_pduType == rhs._pduType) ) ivarsEqual = false; - if( ! (_protocolFamily == rhs._protocolFamily) ) ivarsEqual = false; - if( ! (_timestamp == rhs._timestamp) ) ivarsEqual = false; - if( ! (_length == rhs._length) ) ivarsEqual = false; + if (!(_protocolVersion == rhs._protocolVersion)) ivarsEqual = false; + if (!(_exerciseID == rhs._exerciseID)) ivarsEqual = false; + if (!(_pduType == rhs._pduType)) ivarsEqual = false; + if (!(_protocolFamily == rhs._protocolFamily)) ivarsEqual = false; + if (!(_timestamp == rhs._timestamp)) ivarsEqual = false; + if (!(_length == rhs._length)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int PduSuperclass::getMarshalledSize() const -{ - int marshalSize = 0; +int PduSuperclass::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _protocolVersion - marshalSize = marshalSize + 1; // _exerciseID - marshalSize = marshalSize + 1; // _pduType - marshalSize = marshalSize + 1; // _protocolFamily - marshalSize = marshalSize + 4; // _timestamp - marshalSize = marshalSize + 2; // _length - return marshalSize; + marshalSize = marshalSize + 1; // _protocolVersion + marshalSize = marshalSize + 1; // _exerciseID + marshalSize = marshalSize + 1; // _pduType + marshalSize = marshalSize + 1; // _protocolFamily + marshalSize = marshalSize + 4; // _timestamp + marshalSize = marshalSize + 2; // _length + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +104,7 @@ int PduSuperclass::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PduSuperclass.h b/src/dis7/PduSuperclass.h index 8ef20884..231b2521 100644 --- a/src/dis7/PduSuperclass.h +++ b/src/dis7/PduSuperclass.h @@ -1,76 +1,73 @@ #pragma once -#include #include +#include +namespace DIS { +// The superclass for all PDUs, including classic and Live Entity (LE) PDUs. +// This incorporates the PduHeader record, section 7.2.2 -namespace DIS -{ -// The superclass for all PDUs, including classic and Live Entity (LE) PDUs. This incorporates the PduHeader record, section 7.2.2 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT PduSuperclass -{ -protected: +class OPENDIS7_EXPORT PduSuperclass { + protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009. */ - unsigned char _protocolVersion; + unsigned char _protocolVersion; /** Exercise ID */ - unsigned char _exerciseID; + unsigned char _exerciseID; /** Type of pdu, unique for each PDU class */ - unsigned char _pduType; + unsigned char _pduType; /** value that refers to the protocol family, eg SimulationManagement, et */ - unsigned char _protocolFamily; + unsigned char _protocolFamily; /** Timestamp value */ - unsigned int _timestamp; + unsigned int _timestamp; /** Length, in bytes, of the PDU */ - unsigned short _length; - + unsigned short _length; public: - PduSuperclass(); - virtual ~PduSuperclass(); + PduSuperclass(); + virtual ~PduSuperclass(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getProtocolVersion() const; - void setProtocolVersion(unsigned char pX); + unsigned char getProtocolVersion() const; + void setProtocolVersion(unsigned char pX); - unsigned char getExerciseID() const; - void setExerciseID(unsigned char pX); + unsigned char getExerciseID() const; + void setExerciseID(unsigned char pX); - unsigned char getPduType() const; - void setPduType(unsigned char pX); + unsigned char getPduType() const; + void setPduType(unsigned char pX); - unsigned char getProtocolFamily() const; - void setProtocolFamily(unsigned char pX); + unsigned char getProtocolFamily() const; + void setProtocolFamily(unsigned char pX); - unsigned int getTimestamp() const; - void setTimestamp(unsigned int pX); + unsigned int getTimestamp() const; + void setTimestamp(unsigned int pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + unsigned short getLength() const; + void setLength(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const PduSuperclass& rhs) const; + bool operator==(const PduSuperclass& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +80,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PointObjectStatePdu.cpp b/src/dis7/PointObjectStatePdu.cpp index ffdb8d08..da1f6d4e 100644 --- a/src/dis7/PointObjectStatePdu.cpp +++ b/src/dis7/PointObjectStatePdu.cpp @@ -2,265 +2,215 @@ using namespace DIS; - -PointObjectStatePdu::PointObjectStatePdu() : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), - _forceID(0), - _modifications(0), - _objectType(), - _objectLocation(), - _objectOrientation(), - _objectAppearance(0.0), - _requesterID(), - _receivingID(), - _pad2(0) -{ - setPduType( 43 ); +PointObjectStatePdu::PointObjectStatePdu() + : SyntheticEnvironmentFamilyPdu(), + _objectID(), + _referencedObjectID(), + _updateNumber(0), + _forceID(0), + _modifications(0), + _objectType(), + _objectLocation(), + _objectOrientation(), + _objectAppearance(0.0), + _requesterID(), + _receivingID(), + _pad2(0) { + setPduType(43); } -PointObjectStatePdu::~PointObjectStatePdu() -{ -} +PointObjectStatePdu::~PointObjectStatePdu() {} -EntityID& PointObjectStatePdu::getObjectID() -{ - return _objectID; -} +EntityID& PointObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& PointObjectStatePdu::getObjectID() const -{ - return _objectID; -} +const EntityID& PointObjectStatePdu::getObjectID() const { return _objectID; } -void PointObjectStatePdu::setObjectID(const EntityID &pX) -{ - _objectID = pX; -} +void PointObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } -EntityID& PointObjectStatePdu::getReferencedObjectID() -{ - return _referencedObjectID; +EntityID& PointObjectStatePdu::getReferencedObjectID() { + return _referencedObjectID; } -const EntityID& PointObjectStatePdu::getReferencedObjectID() const -{ - return _referencedObjectID; +const EntityID& PointObjectStatePdu::getReferencedObjectID() const { + return _referencedObjectID; } -void PointObjectStatePdu::setReferencedObjectID(const EntityID &pX) -{ - _referencedObjectID = pX; +void PointObjectStatePdu::setReferencedObjectID(const EntityID& pX) { + _referencedObjectID = pX; } -unsigned short PointObjectStatePdu::getUpdateNumber() const -{ - return _updateNumber; +unsigned short PointObjectStatePdu::getUpdateNumber() const { + return _updateNumber; } -void PointObjectStatePdu::setUpdateNumber(unsigned short pX) -{ - _updateNumber = pX; +void PointObjectStatePdu::setUpdateNumber(unsigned short pX) { + _updateNumber = pX; } -unsigned char PointObjectStatePdu::getForceID() const -{ - return _forceID; -} +unsigned char PointObjectStatePdu::getForceID() const { return _forceID; } -void PointObjectStatePdu::setForceID(unsigned char pX) -{ - _forceID = pX; -} +void PointObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } -unsigned char PointObjectStatePdu::getModifications() const -{ - return _modifications; +unsigned char PointObjectStatePdu::getModifications() const { + return _modifications; } -void PointObjectStatePdu::setModifications(unsigned char pX) -{ - _modifications = pX; +void PointObjectStatePdu::setModifications(unsigned char pX) { + _modifications = pX; } -ObjectType& PointObjectStatePdu::getObjectType() -{ - return _objectType; -} +ObjectType& PointObjectStatePdu::getObjectType() { return _objectType; } -const ObjectType& PointObjectStatePdu::getObjectType() const -{ - return _objectType; +const ObjectType& PointObjectStatePdu::getObjectType() const { + return _objectType; } -void PointObjectStatePdu::setObjectType(const ObjectType &pX) -{ - _objectType = pX; +void PointObjectStatePdu::setObjectType(const ObjectType& pX) { + _objectType = pX; } -Vector3Double& PointObjectStatePdu::getObjectLocation() -{ - return _objectLocation; +Vector3Double& PointObjectStatePdu::getObjectLocation() { + return _objectLocation; } -const Vector3Double& PointObjectStatePdu::getObjectLocation() const -{ - return _objectLocation; +const Vector3Double& PointObjectStatePdu::getObjectLocation() const { + return _objectLocation; } -void PointObjectStatePdu::setObjectLocation(const Vector3Double &pX) -{ - _objectLocation = pX; +void PointObjectStatePdu::setObjectLocation(const Vector3Double& pX) { + _objectLocation = pX; } -EulerAngles& PointObjectStatePdu::getObjectOrientation() -{ - return _objectOrientation; +EulerAngles& PointObjectStatePdu::getObjectOrientation() { + return _objectOrientation; } -const EulerAngles& PointObjectStatePdu::getObjectOrientation() const -{ - return _objectOrientation; +const EulerAngles& PointObjectStatePdu::getObjectOrientation() const { + return _objectOrientation; } -void PointObjectStatePdu::setObjectOrientation(const EulerAngles &pX) -{ - _objectOrientation = pX; +void PointObjectStatePdu::setObjectOrientation(const EulerAngles& pX) { + _objectOrientation = pX; } -double PointObjectStatePdu::getObjectAppearance() const -{ - return _objectAppearance; +double PointObjectStatePdu::getObjectAppearance() const { + return _objectAppearance; } -void PointObjectStatePdu::setObjectAppearance(double pX) -{ - _objectAppearance = pX; +void PointObjectStatePdu::setObjectAppearance(double pX) { + _objectAppearance = pX; } -SimulationAddress& PointObjectStatePdu::getRequesterID() -{ - return _requesterID; +SimulationAddress& PointObjectStatePdu::getRequesterID() { + return _requesterID; } -const SimulationAddress& PointObjectStatePdu::getRequesterID() const -{ - return _requesterID; +const SimulationAddress& PointObjectStatePdu::getRequesterID() const { + return _requesterID; } -void PointObjectStatePdu::setRequesterID(const SimulationAddress &pX) -{ - _requesterID = pX; +void PointObjectStatePdu::setRequesterID(const SimulationAddress& pX) { + _requesterID = pX; } -SimulationAddress& PointObjectStatePdu::getReceivingID() -{ - return _receivingID; +SimulationAddress& PointObjectStatePdu::getReceivingID() { + return _receivingID; } -const SimulationAddress& PointObjectStatePdu::getReceivingID() const -{ - return _receivingID; +const SimulationAddress& PointObjectStatePdu::getReceivingID() const { + return _receivingID; } -void PointObjectStatePdu::setReceivingID(const SimulationAddress &pX) -{ - _receivingID = pX; +void PointObjectStatePdu::setReceivingID(const SimulationAddress& pX) { + _receivingID = pX; } -unsigned int PointObjectStatePdu::getPad2() const -{ - return _pad2; -} +unsigned int PointObjectStatePdu::getPad2() const { return _pad2; } + +void PointObjectStatePdu::setPad2(unsigned int pX) { _pad2 = pX; } -void PointObjectStatePdu::setPad2(unsigned int pX) -{ - _pad2 = pX; +void PointObjectStatePdu::marshal(DataStream& dataStream) const { + SyntheticEnvironmentFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _objectID.marshal(dataStream); + _referencedObjectID.marshal(dataStream); + dataStream << _updateNumber; + dataStream << _forceID; + dataStream << _modifications; + _objectType.marshal(dataStream); + _objectLocation.marshal(dataStream); + _objectOrientation.marshal(dataStream); + dataStream << _objectAppearance; + _requesterID.marshal(dataStream); + _receivingID.marshal(dataStream); + dataStream << _pad2; } -void PointObjectStatePdu::marshal(DataStream& dataStream) const -{ - SyntheticEnvironmentFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _objectID.marshal(dataStream); - _referencedObjectID.marshal(dataStream); - dataStream << _updateNumber; - dataStream << _forceID; - dataStream << _modifications; - _objectType.marshal(dataStream); - _objectLocation.marshal(dataStream); - _objectOrientation.marshal(dataStream); - dataStream << _objectAppearance; - _requesterID.marshal(dataStream); - _receivingID.marshal(dataStream); - dataStream << _pad2; +void PointObjectStatePdu::unmarshal(DataStream& dataStream) { + SyntheticEnvironmentFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _objectID.unmarshal(dataStream); + _referencedObjectID.unmarshal(dataStream); + dataStream >> _updateNumber; + dataStream >> _forceID; + dataStream >> _modifications; + _objectType.unmarshal(dataStream); + _objectLocation.unmarshal(dataStream); + _objectOrientation.unmarshal(dataStream); + dataStream >> _objectAppearance; + _requesterID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + dataStream >> _pad2; } -void PointObjectStatePdu::unmarshal(DataStream& dataStream) -{ - SyntheticEnvironmentFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _objectID.unmarshal(dataStream); - _referencedObjectID.unmarshal(dataStream); - dataStream >> _updateNumber; - dataStream >> _forceID; - dataStream >> _modifications; - _objectType.unmarshal(dataStream); - _objectLocation.unmarshal(dataStream); - _objectOrientation.unmarshal(dataStream); - dataStream >> _objectAppearance; - _requesterID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - dataStream >> _pad2; +bool PointObjectStatePdu::operator==(const PointObjectStatePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + + if (!(_objectID == rhs._objectID)) ivarsEqual = false; + if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; + if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; + if (!(_forceID == rhs._forceID)) ivarsEqual = false; + if (!(_modifications == rhs._modifications)) ivarsEqual = false; + if (!(_objectType == rhs._objectType)) ivarsEqual = false; + if (!(_objectLocation == rhs._objectLocation)) ivarsEqual = false; + if (!(_objectOrientation == rhs._objectOrientation)) ivarsEqual = false; + if (!(_objectAppearance == rhs._objectAppearance)) ivarsEqual = false; + if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + + return ivarsEqual; } +int PointObjectStatePdu::getMarshalledSize() const { + int marshalSize = 0; -bool PointObjectStatePdu::operator ==(const PointObjectStatePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - - if( ! (_objectID == rhs._objectID) ) ivarsEqual = false; - if( ! (_referencedObjectID == rhs._referencedObjectID) ) ivarsEqual = false; - if( ! (_updateNumber == rhs._updateNumber) ) ivarsEqual = false; - if( ! (_forceID == rhs._forceID) ) ivarsEqual = false; - if( ! (_modifications == rhs._modifications) ) ivarsEqual = false; - if( ! (_objectType == rhs._objectType) ) ivarsEqual = false; - if( ! (_objectLocation == rhs._objectLocation) ) ivarsEqual = false; - if( ! (_objectOrientation == rhs._objectOrientation) ) ivarsEqual = false; - if( ! (_objectAppearance == rhs._objectAppearance) ) ivarsEqual = false; - if( ! (_requesterID == rhs._requesterID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - - return ivarsEqual; - } - -int PointObjectStatePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _modifications - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - marshalSize = marshalSize + _objectLocation.getMarshalledSize(); // _objectLocation - marshalSize = marshalSize + _objectOrientation.getMarshalledSize(); // _objectOrientation - marshalSize = marshalSize + 8; // _objectAppearance - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 4; // _pad2 - return marshalSize; + marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID + marshalSize = marshalSize + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshalSize = marshalSize + 2; // _updateNumber + marshalSize = marshalSize + 1; // _forceID + marshalSize = marshalSize + 1; // _modifications + marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType + marshalSize = + marshalSize + _objectLocation.getMarshalledSize(); // _objectLocation + marshalSize = marshalSize + + _objectOrientation.getMarshalledSize(); // _objectOrientation + marshalSize = marshalSize + 8; // _objectAppearance + marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + 4; // _pad2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -273,7 +223,7 @@ int PointObjectStatePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PointObjectStatePdu.h b/src/dis7/PointObjectStatePdu.h index a86bd8ef..a965c84f 100644 --- a/src/dis7/PointObjectStatePdu.h +++ b/src/dis7/PointObjectStatePdu.h @@ -1,127 +1,124 @@ #pragma once #include -#include -#include -#include #include -#include +#include #include #include -#include +#include #include +#include +namespace DIS { +// : Inormation abut the addition or modification of a synthecic enviroment +// object that is anchored to the terrain with a single point. Section 7.10.4 +// COMPLETE -namespace DIS -{ -// : Inormation abut the addition or modification of a synthecic enviroment object that is anchored to the terrain with a single point. Section 7.10.4 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT PointObjectStatePdu : public SyntheticEnvironmentFamilyPdu -{ -protected: +class OPENDIS7_EXPORT PointObjectStatePdu + : public SyntheticEnvironmentFamilyPdu { + protected: /** Object in synthetic environment */ - EntityID _objectID; + EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + unsigned short _updateNumber; /** force ID */ - unsigned char _forceID; + unsigned char _forceID; /** modifications */ - unsigned char _modifications; + unsigned char _modifications; /** Object type */ - ObjectType _objectType; + ObjectType _objectType; /** Object location */ - Vector3Double _objectLocation; + Vector3Double _objectLocation; /** Object orientation */ - EulerAngles _objectOrientation; + EulerAngles _objectOrientation; /** Object apperance */ - double _objectAppearance; + double _objectAppearance; /** requesterID */ - SimulationAddress _requesterID; + SimulationAddress _requesterID; /** receiver ID */ - SimulationAddress _receivingID; + SimulationAddress _receivingID; /** padding */ - unsigned int _pad2; - + unsigned int _pad2; public: - PointObjectStatePdu(); - virtual ~PointObjectStatePdu(); + PointObjectStatePdu(); + virtual ~PointObjectStatePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID &pX); + EntityID& getObjectID(); + const EntityID& getObjectID() const; + void setObjectID(const EntityID& pX); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID &pX); + EntityID& getReferencedObjectID(); + const EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + unsigned short getUpdateNumber() const; + void setUpdateNumber(unsigned short pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + unsigned char getForceID() const; + void setForceID(unsigned char pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + unsigned char getModifications() const; + void setModifications(unsigned char pX); - ObjectType& getObjectType(); - const ObjectType& getObjectType() const; - void setObjectType(const ObjectType &pX); + ObjectType& getObjectType(); + const ObjectType& getObjectType() const; + void setObjectType(const ObjectType& pX); - Vector3Double& getObjectLocation(); - const Vector3Double& getObjectLocation() const; - void setObjectLocation(const Vector3Double &pX); + Vector3Double& getObjectLocation(); + const Vector3Double& getObjectLocation() const; + void setObjectLocation(const Vector3Double& pX); - EulerAngles& getObjectOrientation(); - const EulerAngles& getObjectOrientation() const; - void setObjectOrientation(const EulerAngles &pX); + EulerAngles& getObjectOrientation(); + const EulerAngles& getObjectOrientation() const; + void setObjectOrientation(const EulerAngles& pX); - double getObjectAppearance() const; - void setObjectAppearance(double pX); + double getObjectAppearance() const; + void setObjectAppearance(double pX); - SimulationAddress& getRequesterID(); - const SimulationAddress& getRequesterID() const; - void setRequesterID(const SimulationAddress &pX); + SimulationAddress& getRequesterID(); + const SimulationAddress& getRequesterID() const; + void setRequesterID(const SimulationAddress& pX); - SimulationAddress& getReceivingID(); - const SimulationAddress& getReceivingID() const; - void setReceivingID(const SimulationAddress &pX); + SimulationAddress& getReceivingID(); + const SimulationAddress& getReceivingID() const; + void setReceivingID(const SimulationAddress& pX); - unsigned int getPad2() const; - void setPad2(unsigned int pX); + unsigned int getPad2() const; + void setPad2(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const PointObjectStatePdu& rhs) const; + bool operator==(const PointObjectStatePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -134,7 +131,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PropulsionSystemData.cpp b/src/dis7/PropulsionSystemData.cpp index bb43ad23..2f64c1b3 100644 --- a/src/dis7/PropulsionSystemData.cpp +++ b/src/dis7/PropulsionSystemData.cpp @@ -2,74 +2,51 @@ using namespace DIS; +PropulsionSystemData::PropulsionSystemData() + : _powerSetting(0.0), _engineRpm(0.0) {} -PropulsionSystemData::PropulsionSystemData(): - _powerSetting(0.0), - _engineRpm(0.0) -{ -} +PropulsionSystemData::~PropulsionSystemData() {} -PropulsionSystemData::~PropulsionSystemData() -{ -} +float PropulsionSystemData::getPowerSetting() const { return _powerSetting; } -float PropulsionSystemData::getPowerSetting() const -{ - return _powerSetting; -} +void PropulsionSystemData::setPowerSetting(float pX) { _powerSetting = pX; } -void PropulsionSystemData::setPowerSetting(float pX) -{ - _powerSetting = pX; -} +float PropulsionSystemData::getEngineRpm() const { return _engineRpm; } -float PropulsionSystemData::getEngineRpm() const -{ - return _engineRpm; -} +void PropulsionSystemData::setEngineRpm(float pX) { _engineRpm = pX; } -void PropulsionSystemData::setEngineRpm(float pX) -{ - _engineRpm = pX; +void PropulsionSystemData::marshal(DataStream& dataStream) const { + dataStream << _powerSetting; + dataStream << _engineRpm; } -void PropulsionSystemData::marshal(DataStream& dataStream) const -{ - dataStream << _powerSetting; - dataStream << _engineRpm; -} - -void PropulsionSystemData::unmarshal(DataStream& dataStream) -{ - dataStream >> _powerSetting; - dataStream >> _engineRpm; +void PropulsionSystemData::unmarshal(DataStream& dataStream) { + dataStream >> _powerSetting; + dataStream >> _engineRpm; } +bool PropulsionSystemData::operator==(const PropulsionSystemData& rhs) const { + bool ivarsEqual = true; -bool PropulsionSystemData::operator ==(const PropulsionSystemData& rhs) const - { - bool ivarsEqual = true; + if (!(_powerSetting == rhs._powerSetting)) ivarsEqual = false; + if (!(_engineRpm == rhs._engineRpm)) ivarsEqual = false; - if( ! (_powerSetting == rhs._powerSetting) ) ivarsEqual = false; - if( ! (_engineRpm == rhs._engineRpm) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int PropulsionSystemData::getMarshalledSize() const -{ - int marshalSize = 0; +int PropulsionSystemData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _powerSetting - marshalSize = marshalSize + 4; // _engineRpm - return marshalSize; + marshalSize = marshalSize + 4; // _powerSetting + marshalSize = marshalSize + 4; // _engineRpm + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +59,7 @@ int PropulsionSystemData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/PropulsionSystemData.h b/src/dis7/PropulsionSystemData.h index 5eb72759..362c5c5d 100644 --- a/src/dis7/PropulsionSystemData.h +++ b/src/dis7/PropulsionSystemData.h @@ -1,52 +1,50 @@ #pragma once -#include #include +#include +namespace DIS { +// contains information describing the propulsion systems of the entity. This +// information shall be provided for each active propulsion system defined. +// Section 6.2.68 -namespace DIS -{ -// contains information describing the propulsion systems of the entity. This information shall be provided for each active propulsion system defined. Section 6.2.68 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT PropulsionSystemData -{ -protected: +class OPENDIS7_EXPORT PropulsionSystemData { + protected: /** powerSetting */ - float _powerSetting; + float _powerSetting; /** engine RPMs */ - float _engineRpm; - + float _engineRpm; public: - PropulsionSystemData(); - virtual ~PropulsionSystemData(); + PropulsionSystemData(); + virtual ~PropulsionSystemData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getPowerSetting() const; - void setPowerSetting(float pX); + float getPowerSetting() const; + void setPowerSetting(float pX); - float getEngineRpm() const; - void setEngineRpm(float pX); + float getEngineRpm() const; + void setEngineRpm(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const PropulsionSystemData& rhs) const; + bool operator==(const PropulsionSystemData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RadioCommunicationsFamilyPdu.cpp b/src/dis7/RadioCommunicationsFamilyPdu.cpp index ddf8c28a..99da939b 100644 --- a/src/dis7/RadioCommunicationsFamilyPdu.cpp +++ b/src/dis7/RadioCommunicationsFamilyPdu.cpp @@ -2,85 +2,69 @@ using namespace DIS; - -RadioCommunicationsFamilyPdu::RadioCommunicationsFamilyPdu() : Pdu(), - _entityId(), - _radioId(0) -{ - setProtocolFamily( 4 ); +RadioCommunicationsFamilyPdu::RadioCommunicationsFamilyPdu() + : Pdu(), _entityId(), _radioId(0) { + setProtocolFamily(4); } -RadioCommunicationsFamilyPdu::~RadioCommunicationsFamilyPdu() -{ -} +RadioCommunicationsFamilyPdu::~RadioCommunicationsFamilyPdu() {} -EntityID& RadioCommunicationsFamilyPdu::getEntityId() -{ - return _entityId; -} +EntityID& RadioCommunicationsFamilyPdu::getEntityId() { return _entityId; } -const EntityID& RadioCommunicationsFamilyPdu::getEntityId() const -{ - return _entityId; +const EntityID& RadioCommunicationsFamilyPdu::getEntityId() const { + return _entityId; } -void RadioCommunicationsFamilyPdu::setEntityId(const EntityID &pX) -{ - _entityId = pX; +void RadioCommunicationsFamilyPdu::setEntityId(const EntityID& pX) { + _entityId = pX; } -unsigned short RadioCommunicationsFamilyPdu::getRadioId() const -{ - return _radioId; +unsigned short RadioCommunicationsFamilyPdu::getRadioId() const { + return _radioId; } -void RadioCommunicationsFamilyPdu::setRadioId(unsigned short pX) -{ - _radioId = pX; +void RadioCommunicationsFamilyPdu::setRadioId(unsigned short pX) { + _radioId = pX; } -void RadioCommunicationsFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _entityId.marshal(dataStream); - dataStream << _radioId; +void RadioCommunicationsFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _entityId.marshal(dataStream); + dataStream << _radioId; } -void RadioCommunicationsFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _entityId.unmarshal(dataStream); - dataStream >> _radioId; +void RadioCommunicationsFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _entityId.unmarshal(dataStream); + dataStream >> _radioId; } +bool RadioCommunicationsFamilyPdu::operator==( + const RadioCommunicationsFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool RadioCommunicationsFamilyPdu::operator ==(const RadioCommunicationsFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); + if (!(_entityId == rhs._entityId)) ivarsEqual = false; + if (!(_radioId == rhs._radioId)) ivarsEqual = false; - if( ! (_entityId == rhs._entityId) ) ivarsEqual = false; - if( ! (_radioId == rhs._radioId) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RadioCommunicationsFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RadioCommunicationsFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _entityId.getMarshalledSize(); // _entityId - marshalSize = marshalSize + 2; // _radioId - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = marshalSize + _entityId.getMarshalledSize(); // _entityId + marshalSize = marshalSize + 2; // _radioId + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -93,7 +77,7 @@ int RadioCommunicationsFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RadioCommunicationsFamilyPdu.h b/src/dis7/RadioCommunicationsFamilyPdu.h index 14c441a4..6fd387ab 100644 --- a/src/dis7/RadioCommunicationsFamilyPdu.h +++ b/src/dis7/RadioCommunicationsFamilyPdu.h @@ -2,54 +2,50 @@ #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Abstract superclass for radio communications PDUs. Section 7.7 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RadioCommunicationsFamilyPdu : public Pdu -{ -protected: +class OPENDIS7_EXPORT RadioCommunicationsFamilyPdu : public Pdu { + protected: /** ID of the entitythat is the source of the communication */ - EntityID _entityId; + EntityID _entityId; /** particular radio within an entity */ - unsigned short _radioId; - + unsigned short _radioId; public: - RadioCommunicationsFamilyPdu(); - virtual ~RadioCommunicationsFamilyPdu(); + RadioCommunicationsFamilyPdu(); + virtual ~RadioCommunicationsFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEntityId(); - const EntityID& getEntityId() const; - void setEntityId(const EntityID &pX); + EntityID& getEntityId(); + const EntityID& getEntityId() const; + void setEntityId(const EntityID& pX); - unsigned short getRadioId() const; - void setRadioId(unsigned short pX); + unsigned short getRadioId() const; + void setRadioId(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RadioCommunicationsFamilyPdu& rhs) const; + bool operator==(const RadioCommunicationsFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -62,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RadioIdentifier.cpp b/src/dis7/RadioIdentifier.cpp index 61c50b03..39561d09 100644 --- a/src/dis7/RadioIdentifier.cpp +++ b/src/dis7/RadioIdentifier.cpp @@ -2,104 +2,78 @@ using namespace DIS; +RadioIdentifier::RadioIdentifier() + : _siteNumber(0), + _applicationNumber(0), + _referenceNumber(0), + _radioNumber(0) {} -RadioIdentifier::RadioIdentifier(): - _siteNumber(0), - _applicationNumber(0), - _referenceNumber(0), - _radioNumber(0) -{ -} +RadioIdentifier::~RadioIdentifier() {} -RadioIdentifier::~RadioIdentifier() -{ -} +unsigned short RadioIdentifier::getSiteNumber() const { return _siteNumber; } -unsigned short RadioIdentifier::getSiteNumber() const -{ - return _siteNumber; -} +void RadioIdentifier::setSiteNumber(unsigned short pX) { _siteNumber = pX; } -void RadioIdentifier::setSiteNumber(unsigned short pX) -{ - _siteNumber = pX; +unsigned short RadioIdentifier::getApplicationNumber() const { + return _applicationNumber; } -unsigned short RadioIdentifier::getApplicationNumber() const -{ - return _applicationNumber; +void RadioIdentifier::setApplicationNumber(unsigned short pX) { + _applicationNumber = pX; } -void RadioIdentifier::setApplicationNumber(unsigned short pX) -{ - _applicationNumber = pX; +unsigned short RadioIdentifier::getReferenceNumber() const { + return _referenceNumber; } -unsigned short RadioIdentifier::getReferenceNumber() const -{ - return _referenceNumber; +void RadioIdentifier::setReferenceNumber(unsigned short pX) { + _referenceNumber = pX; } -void RadioIdentifier::setReferenceNumber(unsigned short pX) -{ - _referenceNumber = pX; -} +unsigned short RadioIdentifier::getRadioNumber() const { return _radioNumber; } -unsigned short RadioIdentifier::getRadioNumber() const -{ - return _radioNumber; -} +void RadioIdentifier::setRadioNumber(unsigned short pX) { _radioNumber = pX; } -void RadioIdentifier::setRadioNumber(unsigned short pX) -{ - _radioNumber = pX; +void RadioIdentifier::marshal(DataStream& dataStream) const { + dataStream << _siteNumber; + dataStream << _applicationNumber; + dataStream << _referenceNumber; + dataStream << _radioNumber; } -void RadioIdentifier::marshal(DataStream& dataStream) const -{ - dataStream << _siteNumber; - dataStream << _applicationNumber; - dataStream << _referenceNumber; - dataStream << _radioNumber; -} - -void RadioIdentifier::unmarshal(DataStream& dataStream) -{ - dataStream >> _siteNumber; - dataStream >> _applicationNumber; - dataStream >> _referenceNumber; - dataStream >> _radioNumber; +void RadioIdentifier::unmarshal(DataStream& dataStream) { + dataStream >> _siteNumber; + dataStream >> _applicationNumber; + dataStream >> _referenceNumber; + dataStream >> _radioNumber; } +bool RadioIdentifier::operator==(const RadioIdentifier& rhs) const { + bool ivarsEqual = true; -bool RadioIdentifier::operator ==(const RadioIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_siteNumber == rhs._siteNumber)) ivarsEqual = false; + if (!(_applicationNumber == rhs._applicationNumber)) ivarsEqual = false; + if (!(_referenceNumber == rhs._referenceNumber)) ivarsEqual = false; + if (!(_radioNumber == rhs._radioNumber)) ivarsEqual = false; - if( ! (_siteNumber == rhs._siteNumber) ) ivarsEqual = false; - if( ! (_applicationNumber == rhs._applicationNumber) ) ivarsEqual = false; - if( ! (_referenceNumber == rhs._referenceNumber) ) ivarsEqual = false; - if( ! (_radioNumber == rhs._radioNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RadioIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int RadioIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _siteNumber - marshalSize = marshalSize + 2; // _applicationNumber - marshalSize = marshalSize + 2; // _referenceNumber - marshalSize = marshalSize + 2; // _radioNumber - return marshalSize; + marshalSize = marshalSize + 2; // _siteNumber + marshalSize = marshalSize + 2; // _applicationNumber + marshalSize = marshalSize + 2; // _referenceNumber + marshalSize = marshalSize + 2; // _radioNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +86,7 @@ int RadioIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RadioIdentifier.h b/src/dis7/RadioIdentifier.h index 2fa885f2..92ddf3f6 100644 --- a/src/dis7/RadioIdentifier.h +++ b/src/dis7/RadioIdentifier.h @@ -1,64 +1,61 @@ #pragma once -#include #include +#include +namespace DIS { +// The unique designation of an attached or unattached radio in an event or +// exercise Section 6.2.69 -namespace DIS -{ -// The unique designation of an attached or unattached radio in an event or exercise Section 6.2.69 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RadioIdentifier -{ -protected: +class OPENDIS7_EXPORT RadioIdentifier { + protected: /** site */ - unsigned short _siteNumber; + unsigned short _siteNumber; /** application number */ - unsigned short _applicationNumber; + unsigned short _applicationNumber; /** reference number */ - unsigned short _referenceNumber; + unsigned short _referenceNumber; /** Radio number */ - unsigned short _radioNumber; - + unsigned short _radioNumber; public: - RadioIdentifier(); - virtual ~RadioIdentifier(); + RadioIdentifier(); + virtual ~RadioIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSiteNumber() const; - void setSiteNumber(unsigned short pX); + unsigned short getSiteNumber() const; + void setSiteNumber(unsigned short pX); - unsigned short getApplicationNumber() const; - void setApplicationNumber(unsigned short pX); + unsigned short getApplicationNumber() const; + void setApplicationNumber(unsigned short pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + unsigned short getReferenceNumber() const; + void setReferenceNumber(unsigned short pX); - unsigned short getRadioNumber() const; - void setRadioNumber(unsigned short pX); + unsigned short getRadioNumber() const; + void setRadioNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RadioIdentifier& rhs) const; + bool operator==(const RadioIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +68,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RadioType.cpp b/src/dis7/RadioType.cpp index 4e26e9ae..b500d883 100644 --- a/src/dis7/RadioType.cpp +++ b/src/dis7/RadioType.cpp @@ -2,149 +2,97 @@ using namespace DIS; +RadioType::RadioType() + : _entityKind(0), + _domain(0), + _country(0), + _category(0), + _subcategory(0), + _specific(0), + _extra(0) {} -RadioType::RadioType(): - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0) -{ -} +RadioType::~RadioType() {} -RadioType::~RadioType() -{ -} +unsigned char RadioType::getEntityKind() const { return _entityKind; } -unsigned char RadioType::getEntityKind() const -{ - return _entityKind; -} +void RadioType::setEntityKind(unsigned char pX) { _entityKind = pX; } -void RadioType::setEntityKind(unsigned char pX) -{ - _entityKind = pX; -} +unsigned char RadioType::getDomain() const { return _domain; } -unsigned char RadioType::getDomain() const -{ - return _domain; -} +void RadioType::setDomain(unsigned char pX) { _domain = pX; } -void RadioType::setDomain(unsigned char pX) -{ - _domain = pX; -} +unsigned short RadioType::getCountry() const { return _country; } -unsigned short RadioType::getCountry() const -{ - return _country; -} +void RadioType::setCountry(unsigned short pX) { _country = pX; } -void RadioType::setCountry(unsigned short pX) -{ - _country = pX; -} +unsigned char RadioType::getCategory() const { return _category; } -unsigned char RadioType::getCategory() const -{ - return _category; -} +void RadioType::setCategory(unsigned char pX) { _category = pX; } -void RadioType::setCategory(unsigned char pX) -{ - _category = pX; -} +unsigned char RadioType::getSubcategory() const { return _subcategory; } -unsigned char RadioType::getSubcategory() const -{ - return _subcategory; -} +void RadioType::setSubcategory(unsigned char pX) { _subcategory = pX; } -void RadioType::setSubcategory(unsigned char pX) -{ - _subcategory = pX; -} +unsigned char RadioType::getSpecific() const { return _specific; } -unsigned char RadioType::getSpecific() const -{ - return _specific; -} +void RadioType::setSpecific(unsigned char pX) { _specific = pX; } -void RadioType::setSpecific(unsigned char pX) -{ - _specific = pX; -} +unsigned char RadioType::getExtra() const { return _extra; } -unsigned char RadioType::getExtra() const -{ - return _extra; -} +void RadioType::setExtra(unsigned char pX) { _extra = pX; } -void RadioType::setExtra(unsigned char pX) -{ - _extra = pX; +void RadioType::marshal(DataStream& dataStream) const { + dataStream << _entityKind; + dataStream << _domain; + dataStream << _country; + dataStream << _category; + dataStream << _subcategory; + dataStream << _specific; + dataStream << _extra; } -void RadioType::marshal(DataStream& dataStream) const -{ - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; +void RadioType::unmarshal(DataStream& dataStream) { + dataStream >> _entityKind; + dataStream >> _domain; + dataStream >> _country; + dataStream >> _category; + dataStream >> _subcategory; + dataStream >> _specific; + dataStream >> _extra; } -void RadioType::unmarshal(DataStream& dataStream) -{ - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; +bool RadioType::operator==(const RadioType& rhs) const { + bool ivarsEqual = true; + + if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; + if (!(_domain == rhs._domain)) ivarsEqual = false; + if (!(_country == rhs._country)) ivarsEqual = false; + if (!(_category == rhs._category)) ivarsEqual = false; + if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; + if (!(_specific == rhs._specific)) ivarsEqual = false; + if (!(_extra == rhs._extra)) ivarsEqual = false; + + return ivarsEqual; } +int RadioType::getMarshalledSize() const { + int marshalSize = 0; -bool RadioType::operator ==(const RadioType& rhs) const - { - bool ivarsEqual = true; - - if( ! (_entityKind == rhs._entityKind) ) ivarsEqual = false; - if( ! (_domain == rhs._domain) ) ivarsEqual = false; - if( ! (_country == rhs._country) ) ivarsEqual = false; - if( ! (_category == rhs._category) ) ivarsEqual = false; - if( ! (_subcategory == rhs._subcategory) ) ivarsEqual = false; - if( ! (_specific == rhs._specific) ) ivarsEqual = false; - if( ! (_extra == rhs._extra) ) ivarsEqual = false; - - return ivarsEqual; - } - -int RadioType::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - return marshalSize; + marshalSize = marshalSize + 1; // _entityKind + marshalSize = marshalSize + 1; // _domain + marshalSize = marshalSize + 2; // _country + marshalSize = marshalSize + 1; // _category + marshalSize = marshalSize + 1; // _subcategory + marshalSize = marshalSize + 1; // _specific + marshalSize = marshalSize + 1; // _extra + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -157,7 +105,7 @@ int RadioType::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RadioType.h b/src/dis7/RadioType.h index a210a7dc..3e778a86 100644 --- a/src/dis7/RadioType.h +++ b/src/dis7/RadioType.h @@ -1,80 +1,76 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Identifies the type of radio. Section 6.2.70 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RadioType -{ -protected: +class OPENDIS7_EXPORT RadioType { + protected: /** Kind of entity */ - unsigned char _entityKind; + unsigned char _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + unsigned short _country; /** category of entity */ - unsigned char _category; + unsigned char _category; /** specific info based on subcategory field */ - unsigned char _subcategory; - - unsigned char _specific; + unsigned char _subcategory; - unsigned char _extra; + unsigned char _specific; + unsigned char _extra; public: - RadioType(); - virtual ~RadioType(); + RadioType(); + virtual ~RadioType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + unsigned char getEntityKind() const; + void setEntityKind(unsigned char pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + unsigned char getDomain() const; + void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + unsigned short getCountry() const; + void setCountry(unsigned short pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + unsigned char getCategory() const; + void setCategory(unsigned char pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + unsigned char getSubcategory() const; + void setSubcategory(unsigned char pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + unsigned char getSpecific() const; + void setSpecific(unsigned char pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + unsigned char getExtra() const; + void setExtra(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RadioType& rhs) const; + bool operator==(const RadioType& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +83,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ReceiverPdu.cpp b/src/dis7/ReceiverPdu.cpp index da80beb5..a7f2fa7a 100644 --- a/src/dis7/ReceiverPdu.cpp +++ b/src/dis7/ReceiverPdu.cpp @@ -2,130 +2,101 @@ using namespace DIS; - -ReceiverPdu::ReceiverPdu() : RadioCommunicationsFamilyPdu(), - _receiverState(0), - _padding1(0), - _receivedPower(0.0), - _transmitterEntityId(), - _transmitterRadioId(0) -{ - setPduType( 27 ); +ReceiverPdu::ReceiverPdu() + : RadioCommunicationsFamilyPdu(), + _receiverState(0), + _padding1(0), + _receivedPower(0.0), + _transmitterEntityId(), + _transmitterRadioId(0) { + setPduType(27); } -ReceiverPdu::~ReceiverPdu() -{ -} +ReceiverPdu::~ReceiverPdu() {} -unsigned short ReceiverPdu::getReceiverState() const -{ - return _receiverState; -} +unsigned short ReceiverPdu::getReceiverState() const { return _receiverState; } -void ReceiverPdu::setReceiverState(unsigned short pX) -{ - _receiverState = pX; -} +void ReceiverPdu::setReceiverState(unsigned short pX) { _receiverState = pX; } -unsigned short ReceiverPdu::getPadding1() const -{ - return _padding1; -} +unsigned short ReceiverPdu::getPadding1() const { return _padding1; } -void ReceiverPdu::setPadding1(unsigned short pX) -{ - _padding1 = pX; -} +void ReceiverPdu::setPadding1(unsigned short pX) { _padding1 = pX; } -float ReceiverPdu::getReceivedPower() const -{ - return _receivedPower; -} +float ReceiverPdu::getReceivedPower() const { return _receivedPower; } -void ReceiverPdu::setReceivedPower(float pX) -{ - _receivedPower = pX; -} +void ReceiverPdu::setReceivedPower(float pX) { _receivedPower = pX; } -EntityID& ReceiverPdu::getTransmitterEntityId() -{ - return _transmitterEntityId; -} +EntityID& ReceiverPdu::getTransmitterEntityId() { return _transmitterEntityId; } -const EntityID& ReceiverPdu::getTransmitterEntityId() const -{ - return _transmitterEntityId; +const EntityID& ReceiverPdu::getTransmitterEntityId() const { + return _transmitterEntityId; } -void ReceiverPdu::setTransmitterEntityId(const EntityID &pX) -{ - _transmitterEntityId = pX; +void ReceiverPdu::setTransmitterEntityId(const EntityID& pX) { + _transmitterEntityId = pX; } -unsigned short ReceiverPdu::getTransmitterRadioId() const -{ - return _transmitterRadioId; +unsigned short ReceiverPdu::getTransmitterRadioId() const { + return _transmitterRadioId; } -void ReceiverPdu::setTransmitterRadioId(unsigned short pX) -{ - _transmitterRadioId = pX; +void ReceiverPdu::setTransmitterRadioId(unsigned short pX) { + _transmitterRadioId = pX; } -void ReceiverPdu::marshal(DataStream& dataStream) const -{ - RadioCommunicationsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _receiverState; - dataStream << _padding1; - dataStream << _receivedPower; - _transmitterEntityId.marshal(dataStream); - dataStream << _transmitterRadioId; +void ReceiverPdu::marshal(DataStream& dataStream) const { + RadioCommunicationsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _receiverState; + dataStream << _padding1; + dataStream << _receivedPower; + _transmitterEntityId.marshal(dataStream); + dataStream << _transmitterRadioId; } -void ReceiverPdu::unmarshal(DataStream& dataStream) -{ - RadioCommunicationsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _receiverState; - dataStream >> _padding1; - dataStream >> _receivedPower; - _transmitterEntityId.unmarshal(dataStream); - dataStream >> _transmitterRadioId; +void ReceiverPdu::unmarshal(DataStream& dataStream) { + RadioCommunicationsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _receiverState; + dataStream >> _padding1; + dataStream >> _receivedPower; + _transmitterEntityId.unmarshal(dataStream); + dataStream >> _transmitterRadioId; } +bool ReceiverPdu::operator==(const ReceiverPdu& rhs) const { + bool ivarsEqual = true; -bool ReceiverPdu::operator ==(const ReceiverPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); - ivarsEqual = RadioCommunicationsFamilyPdu::operator==(rhs); + if (!(_receiverState == rhs._receiverState)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_receivedPower == rhs._receivedPower)) ivarsEqual = false; + if (!(_transmitterEntityId == rhs._transmitterEntityId)) ivarsEqual = false; + if (!(_transmitterRadioId == rhs._transmitterRadioId)) ivarsEqual = false; - if( ! (_receiverState == rhs._receiverState) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_receivedPower == rhs._receivedPower) ) ivarsEqual = false; - if( ! (_transmitterEntityId == rhs._transmitterEntityId) ) ivarsEqual = false; - if( ! (_transmitterRadioId == rhs._transmitterRadioId) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int ReceiverPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ReceiverPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _receiverState - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 4; // _receivedPoser - marshalSize = marshalSize + _transmitterEntityId.getMarshalledSize(); // _transmitterEntityId - marshalSize = marshalSize + 2; // _transmitterRadioId - return marshalSize; + marshalSize = RadioCommunicationsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 2; // _receiverState + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 4; // _receivedPoser + marshalSize = + marshalSize + + _transmitterEntityId.getMarshalledSize(); // _transmitterEntityId + marshalSize = marshalSize + 2; // _transmitterRadioId + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -138,7 +109,7 @@ int ReceiverPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ReceiverPdu.h b/src/dis7/ReceiverPdu.h index 86a64f9e..48628917 100644 --- a/src/dis7/ReceiverPdu.h +++ b/src/dis7/ReceiverPdu.h @@ -2,72 +2,68 @@ #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Communication of a receiver state. Section 7.7.4 COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { + protected: /** encoding scheme used, and enumeration */ - unsigned short _receiverState; + unsigned short _receiverState; /** padding */ - unsigned short _padding1; + unsigned short _padding1; /** received power */ - float _receivedPower; + float _receivedPower; /** ID of transmitter */ - EntityID _transmitterEntityId; + EntityID _transmitterEntityId; /** ID of transmitting radio */ - unsigned short _transmitterRadioId; - + unsigned short _transmitterRadioId; public: - ReceiverPdu(); - virtual ~ReceiverPdu(); + ReceiverPdu(); + virtual ~ReceiverPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getReceiverState() const; - void setReceiverState(unsigned short pX); + unsigned short getReceiverState() const; + void setReceiverState(unsigned short pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + unsigned short getPadding1() const; + void setPadding1(unsigned short pX); - float getReceivedPower() const; - void setReceivedPower(float pX); + float getReceivedPower() const; + void setReceivedPower(float pX); - EntityID& getTransmitterEntityId(); - const EntityID& getTransmitterEntityId() const; - void setTransmitterEntityId(const EntityID &pX); + EntityID& getTransmitterEntityId(); + const EntityID& getTransmitterEntityId() const; + void setTransmitterEntityId(const EntityID& pX); - unsigned short getTransmitterRadioId() const; - void setTransmitterRadioId(unsigned short pX); + unsigned short getTransmitterRadioId() const; + void setTransmitterRadioId(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ReceiverPdu& rhs) const; + bool operator==(const ReceiverPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -80,7 +76,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordQueryReliablePdu.cpp b/src/dis7/RecordQueryReliablePdu.cpp index 2dba5903..3dd69575 100644 --- a/src/dis7/RecordQueryReliablePdu.cpp +++ b/src/dis7/RecordQueryReliablePdu.cpp @@ -2,193 +2,152 @@ using namespace DIS; - -RecordQueryReliablePdu::RecordQueryReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requestID(0), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _eventType(0), - _time(0), - _numberOfRecords(0) -{ - setPduType( 63 ); +RecordQueryReliablePdu::RecordQueryReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requestID(0), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _eventType(0), + _time(0), + _numberOfRecords(0) { + setPduType(63); } -RecordQueryReliablePdu::~RecordQueryReliablePdu() -{ - _recordIDs.clear(); -} +RecordQueryReliablePdu::~RecordQueryReliablePdu() { _recordIDs.clear(); } -unsigned int RecordQueryReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int RecordQueryReliablePdu::getRequestID() const { return _requestID; } -void RecordQueryReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void RecordQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned char RecordQueryReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char RecordQueryReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void RecordQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void RecordQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short RecordQueryReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short RecordQueryReliablePdu::getPad1() const { return _pad1; } -void RecordQueryReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void RecordQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char RecordQueryReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char RecordQueryReliablePdu::getPad2() const { return _pad2; } -void RecordQueryReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void RecordQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned short RecordQueryReliablePdu::getEventType() const -{ - return _eventType; +unsigned short RecordQueryReliablePdu::getEventType() const { + return _eventType; } -void RecordQueryReliablePdu::setEventType(unsigned short pX) -{ - _eventType = pX; +void RecordQueryReliablePdu::setEventType(unsigned short pX) { + _eventType = pX; } -unsigned int RecordQueryReliablePdu::getTime() const -{ - return _time; -} +unsigned int RecordQueryReliablePdu::getTime() const { return _time; } -void RecordQueryReliablePdu::setTime(unsigned int pX) -{ - _time = pX; -} +void RecordQueryReliablePdu::setTime(unsigned int pX) { _time = pX; } -unsigned int RecordQueryReliablePdu::getNumberOfRecords() const -{ - return _recordIDs.size(); +unsigned int RecordQueryReliablePdu::getNumberOfRecords() const { + return _recordIDs.size(); } -std::vector& RecordQueryReliablePdu::getRecordIDs() -{ - return _recordIDs; +std::vector& RecordQueryReliablePdu::getRecordIDs() { + return _recordIDs; } -const std::vector& RecordQueryReliablePdu::getRecordIDs() const -{ - return _recordIDs; +const std::vector& RecordQueryReliablePdu::getRecordIDs() const { + return _recordIDs; } -void RecordQueryReliablePdu::setRecordIDs(const std::vector& pX) -{ - _recordIDs = pX; +void RecordQueryReliablePdu::setRecordIDs( + const std::vector& pX) { + _recordIDs = pX; } -void RecordQueryReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _eventType; - dataStream << _time; - dataStream << ( unsigned int )_recordIDs.size(); - - for(size_t idx = 0; idx < _recordIDs.size(); idx++) - { - FourByteChunk x = _recordIDs[idx]; - x.marshal(dataStream); - } +void RecordQueryReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _eventType; + dataStream << _time; + dataStream << (unsigned int)_recordIDs.size(); + for (size_t idx = 0; idx < _recordIDs.size(); idx++) { + FourByteChunk x = _recordIDs[idx]; + x.marshal(dataStream); + } } -void RecordQueryReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _eventType; - dataStream >> _time; - dataStream >> _numberOfRecords; - - _recordIDs.clear(); - for(size_t idx = 0; idx < _numberOfRecords; idx++) - { - FourByteChunk x; - x.unmarshal(dataStream); - _recordIDs.push_back(x); - } -} +void RecordQueryReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _eventType; + dataStream >> _time; + dataStream >> _numberOfRecords; + _recordIDs.clear(); + for (size_t idx = 0; idx < _numberOfRecords; idx++) { + FourByteChunk x; + x.unmarshal(dataStream); + _recordIDs.push_back(x); + } +} -bool RecordQueryReliablePdu::operator ==(const RecordQueryReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); +bool RecordQueryReliablePdu::operator==( + const RecordQueryReliablePdu& rhs) const { + bool ivarsEqual = true; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_eventType == rhs._eventType) ) ivarsEqual = false; - if( ! (_time == rhs._time) ) ivarsEqual = false; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _recordIDs.size(); idx++) - { - if( ! ( _recordIDs[idx] == rhs._recordIDs[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_eventType == rhs._eventType)) ivarsEqual = false; + if (!(_time == rhs._time)) ivarsEqual = false; + for (size_t idx = 0; idx < _recordIDs.size(); idx++) { + if (!(_recordIDs[idx] == rhs._recordIDs[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int RecordQueryReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RecordQueryReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 2; // _eventType - marshalSize = marshalSize + 4; // _time - marshalSize = marshalSize + 4; // _numberOfRecords + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 2; // _eventType + marshalSize = marshalSize + 4; // _time + marshalSize = marshalSize + 4; // _numberOfRecords - for(unsigned long long idx=0; idx < _recordIDs.size(); idx++) - { - FourByteChunk listElement = _recordIDs[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _recordIDs.size(); idx++) { + FourByteChunk listElement = _recordIDs[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -201,7 +160,7 @@ int RecordQueryReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordQueryReliablePdu.h b/src/dis7/RecordQueryReliablePdu.h index 20bb547b..dad821b5 100644 --- a/src/dis7/RecordQueryReliablePdu.h +++ b/src/dis7/RecordQueryReliablePdu.h @@ -1,91 +1,90 @@ #pragma once -#include #include + +#include #include -#include #include +#include +namespace DIS { +// Section 5.3.12.13: A request for one or more records of data from an entity. +// COMPLETE -namespace DIS -{ -// Section 5.3.12.13: A request for one or more records of data from an entity. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RecordQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT RecordQueryReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** request ID */ - unsigned int _requestID; + unsigned int _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** event type */ - unsigned short _eventType; + unsigned short _eventType; /** time */ - unsigned int _time; + unsigned int _time; /** numberOfRecords */ - unsigned int _numberOfRecords; + unsigned int _numberOfRecords; /** record IDs */ - std::vector _recordIDs; - + std::vector _recordIDs; public: - RecordQueryReliablePdu(); - virtual ~RecordQueryReliablePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RecordQueryReliablePdu(); + virtual ~RecordQueryReliablePdu(); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getTime() const; - void setTime(unsigned int pX); + unsigned short getEventType() const; + void setEventType(unsigned short pX); - unsigned int getNumberOfRecords() const; + unsigned int getTime() const; + void setTime(unsigned int pX); - std::vector& getRecordIDs(); - const std::vector& getRecordIDs() const; - void setRecordIDs(const std::vector& pX); + unsigned int getNumberOfRecords() const; + std::vector& getRecordIDs(); + const std::vector& getRecordIDs() const; + void setRecordIDs(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RecordQueryReliablePdu& rhs) const; + bool operator==(const RecordQueryReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +97,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordQuerySpecification.cpp b/src/dis7/RecordQuerySpecification.cpp index 0096197c..4a606646 100644 --- a/src/dis7/RecordQuerySpecification.cpp +++ b/src/dis7/RecordQuerySpecification.cpp @@ -2,97 +2,76 @@ using namespace DIS; +RecordQuerySpecification::RecordQuerySpecification() : _numberOfRecords(0) {} -RecordQuerySpecification::RecordQuerySpecification(): - _numberOfRecords(0) -{ -} - -RecordQuerySpecification::~RecordQuerySpecification() -{ - _records.clear(); -} +RecordQuerySpecification::~RecordQuerySpecification() { _records.clear(); } -unsigned int RecordQuerySpecification::getNumberOfRecords() const -{ - return _records.size(); +unsigned int RecordQuerySpecification::getNumberOfRecords() const { + return _records.size(); } -std::vector& RecordQuerySpecification::getRecords() -{ - return _records; +std::vector& RecordQuerySpecification::getRecords() { + return _records; } -const std::vector& RecordQuerySpecification::getRecords() const -{ - return _records; +const std::vector& RecordQuerySpecification::getRecords() const { + return _records; } -void RecordQuerySpecification::setRecords(const std::vector& pX) -{ - _records = pX; +void RecordQuerySpecification::setRecords( + const std::vector& pX) { + _records = pX; } -void RecordQuerySpecification::marshal(DataStream& dataStream) const -{ - dataStream << ( unsigned int )_records.size(); - - for(size_t idx = 0; idx < _records.size(); idx++) - { - FourByteChunk x = _records[idx]; - x.marshal(dataStream); - } +void RecordQuerySpecification::marshal(DataStream& dataStream) const { + dataStream << (unsigned int)_records.size(); + for (size_t idx = 0; idx < _records.size(); idx++) { + FourByteChunk x = _records[idx]; + x.marshal(dataStream); + } } -void RecordQuerySpecification::unmarshal(DataStream& dataStream) -{ - dataStream >> _numberOfRecords; - - _records.clear(); - for(size_t idx = 0; idx < _numberOfRecords; idx++) - { - FourByteChunk x; - x.unmarshal(dataStream); - _records.push_back(x); - } -} - - -bool RecordQuerySpecification::operator ==(const RecordQuerySpecification& rhs) const - { - bool ivarsEqual = true; +void RecordQuerySpecification::unmarshal(DataStream& dataStream) { + dataStream >> _numberOfRecords; + _records.clear(); + for (size_t idx = 0; idx < _numberOfRecords; idx++) { + FourByteChunk x; + x.unmarshal(dataStream); + _records.push_back(x); + } +} - for(size_t idx = 0; idx < _records.size(); idx++) - { - if( ! ( _records[idx] == rhs._records[idx]) ) ivarsEqual = false; - } +bool RecordQuerySpecification::operator==( + const RecordQuerySpecification& rhs) const { + bool ivarsEqual = true; + for (size_t idx = 0; idx < _records.size(); idx++) { + if (!(_records[idx] == rhs._records[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int RecordQuerySpecification::getMarshalledSize() const -{ - int marshalSize = 0; +int RecordQuerySpecification::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _numberOfRecords + marshalSize = marshalSize + 4; // _numberOfRecords - for(unsigned long long idx=0; idx < _records.size(); idx++) - { - FourByteChunk listElement = _records[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _records.size(); idx++) { + FourByteChunk listElement = _records[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +84,7 @@ int RecordQuerySpecification::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordQuerySpecification.h b/src/dis7/RecordQuerySpecification.h index b4b03150..95dc6273 100644 --- a/src/dis7/RecordQuerySpecification.h +++ b/src/dis7/RecordQuerySpecification.h @@ -1,53 +1,50 @@ #pragma once -#include #include -#include -#include +#include +#include +#include -namespace DIS -{ +namespace DIS { // The identification of the records being queried 6.2.71 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RecordQuerySpecification -{ -protected: - unsigned int _numberOfRecords; +class OPENDIS7_EXPORT RecordQuerySpecification { + protected: + unsigned int _numberOfRecords; /** variable length list of 32 bit records */ - std::vector _records; - + std::vector _records; public: - RecordQuerySpecification(); - virtual ~RecordQuerySpecification(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RecordQuerySpecification(); + virtual ~RecordQuerySpecification(); - unsigned int getNumberOfRecords() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - std::vector& getRecords(); - const std::vector& getRecords() const; - void setRecords(const std::vector& pX); + unsigned int getNumberOfRecords() const; + std::vector& getRecords(); + const std::vector& getRecords() const; + void setRecords(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RecordQuerySpecification& rhs) const; + bool operator==(const RecordQuerySpecification& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -60,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordSpecification.cpp b/src/dis7/RecordSpecification.cpp index dc74dd5c..950c9cf1 100644 --- a/src/dis7/RecordSpecification.cpp +++ b/src/dis7/RecordSpecification.cpp @@ -2,97 +2,76 @@ using namespace DIS; +RecordSpecification::RecordSpecification() : _numberOfRecordSets(0) {} -RecordSpecification::RecordSpecification(): - _numberOfRecordSets(0) -{ -} - -RecordSpecification::~RecordSpecification() -{ - _recordSets.clear(); -} +RecordSpecification::~RecordSpecification() { _recordSets.clear(); } -unsigned int RecordSpecification::getNumberOfRecordSets() const -{ - return _recordSets.size(); +unsigned int RecordSpecification::getNumberOfRecordSets() const { + return _recordSets.size(); } -std::vector& RecordSpecification::getRecordSets() -{ - return _recordSets; +std::vector& RecordSpecification::getRecordSets() { + return _recordSets; } -const std::vector& RecordSpecification::getRecordSets() const -{ - return _recordSets; +const std::vector& +RecordSpecification::getRecordSets() const { + return _recordSets; } -void RecordSpecification::setRecordSets(const std::vector& pX) -{ - _recordSets = pX; +void RecordSpecification::setRecordSets( + const std::vector& pX) { + _recordSets = pX; } -void RecordSpecification::marshal(DataStream& dataStream) const -{ - dataStream << ( unsigned int )_recordSets.size(); - - for(size_t idx = 0; idx < _recordSets.size(); idx++) - { - RecordSpecificationElement x = _recordSets[idx]; - x.marshal(dataStream); - } +void RecordSpecification::marshal(DataStream& dataStream) const { + dataStream << (unsigned int)_recordSets.size(); + for (size_t idx = 0; idx < _recordSets.size(); idx++) { + RecordSpecificationElement x = _recordSets[idx]; + x.marshal(dataStream); + } } -void RecordSpecification::unmarshal(DataStream& dataStream) -{ - dataStream >> _numberOfRecordSets; - - _recordSets.clear(); - for(size_t idx = 0; idx < _numberOfRecordSets; idx++) - { - RecordSpecificationElement x; - x.unmarshal(dataStream); - _recordSets.push_back(x); - } -} - - -bool RecordSpecification::operator ==(const RecordSpecification& rhs) const - { - bool ivarsEqual = true; +void RecordSpecification::unmarshal(DataStream& dataStream) { + dataStream >> _numberOfRecordSets; + _recordSets.clear(); + for (size_t idx = 0; idx < _numberOfRecordSets; idx++) { + RecordSpecificationElement x; + x.unmarshal(dataStream); + _recordSets.push_back(x); + } +} - for(size_t idx = 0; idx < _recordSets.size(); idx++) - { - if( ! ( _recordSets[idx] == rhs._recordSets[idx]) ) ivarsEqual = false; - } +bool RecordSpecification::operator==(const RecordSpecification& rhs) const { + bool ivarsEqual = true; + for (size_t idx = 0; idx < _recordSets.size(); idx++) { + if (!(_recordSets[idx] == rhs._recordSets[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int RecordSpecification::getMarshalledSize() const -{ - int marshalSize = 0; +int RecordSpecification::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _numberOfRecordSets + marshalSize = marshalSize + 4; // _numberOfRecordSets - for(unsigned long long idx=0; idx < _recordSets.size(); idx++) - { - RecordSpecificationElement listElement = _recordSets[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _recordSets.size(); idx++) { + RecordSpecificationElement listElement = _recordSets[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +84,7 @@ int RecordSpecification::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordSpecification.h b/src/dis7/RecordSpecification.h index 7100b47c..6823a2c8 100644 --- a/src/dis7/RecordSpecification.h +++ b/src/dis7/RecordSpecification.h @@ -1,54 +1,52 @@ #pragma once -#include #include -#include -#include +#include +#include +#include -namespace DIS -{ -// This record shall specify the number of record sets contained in the Record Specification record and the record details. Section 6.2.72. +namespace DIS { +// This record shall specify the number of record sets contained in the Record +// Specification record and the record details. Section 6.2.72. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RecordSpecification -{ -protected: +class OPENDIS7_EXPORT RecordSpecification { + protected: /** The number of record sets */ - unsigned int _numberOfRecordSets; + unsigned int _numberOfRecordSets; /** variable length list record specifications. */ - std::vector _recordSets; - + std::vector _recordSets; public: - RecordSpecification(); - virtual ~RecordSpecification(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RecordSpecification(); + virtual ~RecordSpecification(); - unsigned int getNumberOfRecordSets() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - std::vector& getRecordSets(); - const std::vector& getRecordSets() const; - void setRecordSets(const std::vector& pX); + unsigned int getNumberOfRecordSets() const; + std::vector& getRecordSets(); + const std::vector& getRecordSets() const; + void setRecordSets(const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RecordSpecification& rhs) const; + bool operator==(const RecordSpecification& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +59,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordSpecificationElement.cpp b/src/dis7/RecordSpecificationElement.cpp index 3dadceab..35bc3158 100644 --- a/src/dis7/RecordSpecificationElement.cpp +++ b/src/dis7/RecordSpecificationElement.cpp @@ -2,134 +2,110 @@ using namespace DIS; +RecordSpecificationElement::RecordSpecificationElement() + : _recordID(0), + _recordSetSerialNumber(0), + _recordLength(0), + _recordCount(0), + _recordValues(0), + _pad4(0) {} -RecordSpecificationElement::RecordSpecificationElement(): - _recordID(0), - _recordSetSerialNumber(0), - _recordLength(0), - _recordCount(0), - _recordValues(0), - _pad4(0) -{ -} +RecordSpecificationElement::~RecordSpecificationElement() {} -RecordSpecificationElement::~RecordSpecificationElement() -{ +unsigned int RecordSpecificationElement::getRecordID() const { + return _recordID; } -unsigned int RecordSpecificationElement::getRecordID() const -{ - return _recordID; +void RecordSpecificationElement::setRecordID(unsigned int pX) { + _recordID = pX; } -void RecordSpecificationElement::setRecordID(unsigned int pX) -{ - _recordID = pX; +unsigned int RecordSpecificationElement::getRecordSetSerialNumber() const { + return _recordSetSerialNumber; } -unsigned int RecordSpecificationElement::getRecordSetSerialNumber() const -{ - return _recordSetSerialNumber; +void RecordSpecificationElement::setRecordSetSerialNumber(unsigned int pX) { + _recordSetSerialNumber = pX; } -void RecordSpecificationElement::setRecordSetSerialNumber(unsigned int pX) -{ - _recordSetSerialNumber = pX; +unsigned short RecordSpecificationElement::getRecordLength() const { + return _recordLength; } -unsigned short RecordSpecificationElement::getRecordLength() const -{ - return _recordLength; +void RecordSpecificationElement::setRecordLength(unsigned short pX) { + _recordLength = pX; } -void RecordSpecificationElement::setRecordLength(unsigned short pX) -{ - _recordLength = pX; +unsigned short RecordSpecificationElement::getRecordCount() const { + return _recordCount; } -unsigned short RecordSpecificationElement::getRecordCount() const -{ - return _recordCount; +void RecordSpecificationElement::setRecordCount(unsigned short pX) { + _recordCount = pX; } -void RecordSpecificationElement::setRecordCount(unsigned short pX) -{ - _recordCount = pX; +unsigned short RecordSpecificationElement::getRecordValues() const { + return _recordValues; } -unsigned short RecordSpecificationElement::getRecordValues() const -{ - return _recordValues; +void RecordSpecificationElement::setRecordValues(unsigned short pX) { + _recordValues = pX; } -void RecordSpecificationElement::setRecordValues(unsigned short pX) -{ - _recordValues = pX; -} +unsigned char RecordSpecificationElement::getPad4() const { return _pad4; } -unsigned char RecordSpecificationElement::getPad4() const -{ - return _pad4; -} +void RecordSpecificationElement::setPad4(unsigned char pX) { _pad4 = pX; } -void RecordSpecificationElement::setPad4(unsigned char pX) -{ - _pad4 = pX; +void RecordSpecificationElement::marshal(DataStream& dataStream) const { + dataStream << _recordID; + dataStream << _recordSetSerialNumber; + dataStream << _recordLength; + dataStream << _recordCount; + dataStream << _recordValues; + dataStream << _pad4; } -void RecordSpecificationElement::marshal(DataStream& dataStream) const -{ - dataStream << _recordID; - dataStream << _recordSetSerialNumber; - dataStream << _recordLength; - dataStream << _recordCount; - dataStream << _recordValues; - dataStream << _pad4; +void RecordSpecificationElement::unmarshal(DataStream& dataStream) { + dataStream >> _recordID; + dataStream >> _recordSetSerialNumber; + dataStream >> _recordLength; + dataStream >> _recordCount; + dataStream >> _recordValues; + dataStream >> _pad4; } -void RecordSpecificationElement::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordID; - dataStream >> _recordSetSerialNumber; - dataStream >> _recordLength; - dataStream >> _recordCount; - dataStream >> _recordValues; - dataStream >> _pad4; -} +bool RecordSpecificationElement::operator==( + const RecordSpecificationElement& rhs) const { + bool ivarsEqual = true; + if (!(_recordID == rhs._recordID)) ivarsEqual = false; + if (!(_recordSetSerialNumber == rhs._recordSetSerialNumber)) + ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; + if (!(_recordCount == rhs._recordCount)) ivarsEqual = false; + if (!(_recordValues == rhs._recordValues)) ivarsEqual = false; + if (!(_pad4 == rhs._pad4)) ivarsEqual = false; -bool RecordSpecificationElement::operator ==(const RecordSpecificationElement& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordID == rhs._recordID) ) ivarsEqual = false; - if( ! (_recordSetSerialNumber == rhs._recordSetSerialNumber) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - if( ! (_recordCount == rhs._recordCount) ) ivarsEqual = false; - if( ! (_recordValues == rhs._recordValues) ) ivarsEqual = false; - if( ! (_pad4 == rhs._pad4) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RecordSpecificationElement::getMarshalledSize() const -{ - int marshalSize = 0; +int RecordSpecificationElement::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _recordID - marshalSize = marshalSize + 4; // _recordSetSerialNumber - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _recordCount - marshalSize = marshalSize + 2; // _recordValues - marshalSize = marshalSize + 1; // _pad4 - return marshalSize; + marshalSize = marshalSize + 4; // _recordID + marshalSize = marshalSize + 4; // _recordSetSerialNumber + marshalSize = marshalSize + 2; // _recordLength + marshalSize = marshalSize + 2; // _recordCount + marshalSize = marshalSize + 2; // _recordValues + marshalSize = marshalSize + 1; // _pad4 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +118,7 @@ int RecordSpecificationElement::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RecordSpecificationElement.h b/src/dis7/RecordSpecificationElement.h index aea03050..df3c0d6d 100644 --- a/src/dis7/RecordSpecificationElement.h +++ b/src/dis7/RecordSpecificationElement.h @@ -1,76 +1,79 @@ #pragma once -#include #include +#include +namespace DIS { +// Synthetic record, made up from section 6.2.72. This is used to acheive a +// repeating variable list element. -namespace DIS -{ -// Synthetic record, made up from section 6.2.72. This is used to acheive a repeating variable list element. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RecordSpecificationElement -{ -protected: - /** the data structure used to convey the parameter values of the record for each record. 32 bit enumeration. */ - unsigned int _recordID; +class OPENDIS7_EXPORT RecordSpecificationElement { + protected: + /** the data structure used to convey the parameter values of the record for + * each record. 32 bit enumeration. */ + unsigned int _recordID; /** the serial number of the first record in the block of records */ - unsigned int _recordSetSerialNumber; + unsigned int _recordSetSerialNumber; /** the length, in bits, of the record. Note, bits, not bytes. */ - unsigned short _recordLength; + unsigned short _recordLength; /** the number of records included in the record set */ - unsigned short _recordCount; - - /** the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. ^^^This is wrong--variable sized data records, bit values. THis MUST be patched after generation. */ - unsigned short _recordValues; + unsigned short _recordCount; - /** Padding of 0 to 31 unused bits as required for 32-bit alignment of the Record Set field. ^^^This is wrong--variable sized padding. MUST be patched post-code generation */ - unsigned char _pad4; + /** the concatenated records of the format specified by the Record ID field. + * The length of this field is the Record Length multiplied by the Record + * Count, in units of bits. ^^^This is wrong--variable sized data records, bit + * values. THis MUST be patched after generation. */ + unsigned short _recordValues; + /** Padding of 0 to 31 unused bits as required for 32-bit alignment of the + * Record Set field. ^^^This is wrong--variable sized padding. MUST be patched + * post-code generation */ + unsigned char _pad4; public: - RecordSpecificationElement(); - virtual ~RecordSpecificationElement(); + RecordSpecificationElement(); + virtual ~RecordSpecificationElement(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordID() const; - void setRecordID(unsigned int pX); + unsigned int getRecordID() const; + void setRecordID(unsigned int pX); - unsigned int getRecordSetSerialNumber() const; - void setRecordSetSerialNumber(unsigned int pX); + unsigned int getRecordSetSerialNumber() const; + void setRecordSetSerialNumber(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + unsigned short getRecordLength() const; + void setRecordLength(unsigned short pX); - unsigned short getRecordCount() const; - void setRecordCount(unsigned short pX); + unsigned short getRecordCount() const; + void setRecordCount(unsigned short pX); - unsigned short getRecordValues() const; - void setRecordValues(unsigned short pX); + unsigned short getRecordValues() const; + void setRecordValues(unsigned short pX); - unsigned char getPad4() const; - void setPad4(unsigned char pX); + unsigned char getPad4() const; + void setPad4(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RecordSpecificationElement& rhs) const; + bool operator==(const RecordSpecificationElement& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Relationship.cpp b/src/dis7/Relationship.cpp index bb4bcd7e..d0511784 100644 --- a/src/dis7/Relationship.cpp +++ b/src/dis7/Relationship.cpp @@ -2,74 +2,50 @@ using namespace DIS; +Relationship::Relationship() : _nature(0), _position(0) {} -Relationship::Relationship(): - _nature(0), - _position(0) -{ -} +Relationship::~Relationship() {} -Relationship::~Relationship() -{ -} +unsigned short Relationship::getNature() const { return _nature; } -unsigned short Relationship::getNature() const -{ - return _nature; -} +void Relationship::setNature(unsigned short pX) { _nature = pX; } -void Relationship::setNature(unsigned short pX) -{ - _nature = pX; -} +unsigned short Relationship::getPosition() const { return _position; } -unsigned short Relationship::getPosition() const -{ - return _position; -} +void Relationship::setPosition(unsigned short pX) { _position = pX; } -void Relationship::setPosition(unsigned short pX) -{ - _position = pX; +void Relationship::marshal(DataStream& dataStream) const { + dataStream << _nature; + dataStream << _position; } -void Relationship::marshal(DataStream& dataStream) const -{ - dataStream << _nature; - dataStream << _position; -} - -void Relationship::unmarshal(DataStream& dataStream) -{ - dataStream >> _nature; - dataStream >> _position; +void Relationship::unmarshal(DataStream& dataStream) { + dataStream >> _nature; + dataStream >> _position; } +bool Relationship::operator==(const Relationship& rhs) const { + bool ivarsEqual = true; -bool Relationship::operator ==(const Relationship& rhs) const - { - bool ivarsEqual = true; + if (!(_nature == rhs._nature)) ivarsEqual = false; + if (!(_position == rhs._position)) ivarsEqual = false; - if( ! (_nature == rhs._nature) ) ivarsEqual = false; - if( ! (_position == rhs._position) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Relationship::getMarshalledSize() const -{ - int marshalSize = 0; +int Relationship::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _nature - marshalSize = marshalSize + 2; // _position - return marshalSize; + marshalSize = marshalSize + 2; // _nature + marshalSize = marshalSize + 2; // _position + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int Relationship::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Relationship.h b/src/dis7/Relationship.h index 69e834ce..f3be4ec5 100644 --- a/src/dis7/Relationship.h +++ b/src/dis7/Relationship.h @@ -1,52 +1,50 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // The relationship of the part entity to its host entity. Section 6.2.73. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Relationship -{ -protected: - /** the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration */ - unsigned short _nature; - - /** the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration */ - unsigned short _position; +class OPENDIS7_EXPORT Relationship { + protected: + /** the nature or purpose for joining of the part entity to the host entity + * and shall be represented by a 16-bit enumeration */ + unsigned short _nature; + /** the position of the part entity with respect to the host entity and shall + * be represented by a 16-bit enumeration */ + unsigned short _position; public: - Relationship(); - virtual ~Relationship(); + Relationship(); + virtual ~Relationship(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getNature() const; - void setNature(unsigned short pX); + unsigned short getNature() const; + void setNature(unsigned short pX); - unsigned short getPosition() const; - void setPosition(unsigned short pX); + unsigned short getPosition() const; + void setPosition(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Relationship& rhs) const; + bool operator==(const Relationship& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RemoveEntityPdu.cpp b/src/dis7/RemoveEntityPdu.cpp index d54df389..4479e6d0 100644 --- a/src/dis7/RemoveEntityPdu.cpp +++ b/src/dis7/RemoveEntityPdu.cpp @@ -2,105 +2,80 @@ using namespace DIS; - -RemoveEntityPdu::RemoveEntityPdu() : SimulationManagementFamilyPdu(), - _originatingID(), - _receivingID(), - _requestID(0) -{ - setPduType( 12 ); +RemoveEntityPdu::RemoveEntityPdu() + : SimulationManagementFamilyPdu(), + _originatingID(), + _receivingID(), + _requestID(0) { + setPduType(12); } -RemoveEntityPdu::~RemoveEntityPdu() -{ -} +RemoveEntityPdu::~RemoveEntityPdu() {} -EntityID& RemoveEntityPdu::getOriginatingID() -{ - return _originatingID; -} +EntityID& RemoveEntityPdu::getOriginatingID() { return _originatingID; } -const EntityID& RemoveEntityPdu::getOriginatingID() const -{ - return _originatingID; +const EntityID& RemoveEntityPdu::getOriginatingID() const { + return _originatingID; } -void RemoveEntityPdu::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; +void RemoveEntityPdu::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -EntityID& RemoveEntityPdu::getReceivingID() -{ - return _receivingID; -} +EntityID& RemoveEntityPdu::getReceivingID() { return _receivingID; } -const EntityID& RemoveEntityPdu::getReceivingID() const -{ - return _receivingID; -} +const EntityID& RemoveEntityPdu::getReceivingID() const { return _receivingID; } -void RemoveEntityPdu::setReceivingID(const EntityID &pX) -{ - _receivingID = pX; -} +void RemoveEntityPdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned int RemoveEntityPdu::getRequestID() const -{ - return _requestID; -} +unsigned int RemoveEntityPdu::getRequestID() const { return _requestID; } -void RemoveEntityPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void RemoveEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } -void RemoveEntityPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingID.marshal(dataStream); - _receivingID.marshal(dataStream); - dataStream << _requestID; +void RemoveEntityPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingID.marshal(dataStream); + _receivingID.marshal(dataStream); + dataStream << _requestID; } -void RemoveEntityPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - dataStream >> _requestID; +void RemoveEntityPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + dataStream >> _requestID; } +bool RemoveEntityPdu::operator==(const RemoveEntityPdu& rhs) const { + bool ivarsEqual = true; -bool RemoveEntityPdu::operator ==(const RemoveEntityPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RemoveEntityPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RemoveEntityPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -113,7 +88,7 @@ int RemoveEntityPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RemoveEntityPdu.h b/src/dis7/RemoveEntityPdu.h index c21aa3be..094d293b 100644 --- a/src/dis7/RemoveEntityPdu.h +++ b/src/dis7/RemoveEntityPdu.h @@ -1,63 +1,60 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// Section 7.5.3 The removal of an entity from an exercise shall be communicated +// with a Remove Entity PDU. COMPLETE -namespace DIS -{ -// Section 7.5.3 The removal of an entity from an exercise shall be communicated with a Remove Entity PDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for originating entity(or simulation) */ - EntityID _originatingID; + EntityID _originatingID; /** Identifier for the receiving entity(or simulation) */ - EntityID _receivingID; - - /** This field shall identify the specific and unique start/resume request being made by the SM */ - unsigned int _requestID; + EntityID _receivingID; + /** This field shall identify the specific and unique start/resume request + * being made by the SM */ + unsigned int _requestID; public: - RemoveEntityPdu(); - virtual ~RemoveEntityPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RemoveEntityPdu(); + virtual ~RemoveEntityPdu(); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingID(); - const EntityID& getReceivingID() const; - void setReceivingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + EntityID& getReceivingID(); + const EntityID& getReceivingID() const; + void setReceivingID(const EntityID& pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RemoveEntityPdu& rhs) const; + bool operator==(const RemoveEntityPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -70,7 +67,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RemoveEntityReliablePdu.cpp b/src/dis7/RemoveEntityReliablePdu.cpp index c1934ffe..986fcb67 100644 --- a/src/dis7/RemoveEntityReliablePdu.cpp +++ b/src/dis7/RemoveEntityReliablePdu.cpp @@ -2,110 +2,89 @@ using namespace DIS; - -RemoveEntityReliablePdu::RemoveEntityReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0) -{ - setPduType( 52 ); +RemoveEntityReliablePdu::RemoveEntityReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0) { + setPduType(52); } -RemoveEntityReliablePdu::~RemoveEntityReliablePdu() -{ -} +RemoveEntityReliablePdu::~RemoveEntityReliablePdu() {} -unsigned char RemoveEntityReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char RemoveEntityReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void RemoveEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void RemoveEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short RemoveEntityReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short RemoveEntityReliablePdu::getPad1() const { return _pad1; } -void RemoveEntityReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void RemoveEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char RemoveEntityReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char RemoveEntityReliablePdu::getPad2() const { return _pad2; } -void RemoveEntityReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void RemoveEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int RemoveEntityReliablePdu::getRequestID() const -{ - return _requestID; +unsigned int RemoveEntityReliablePdu::getRequestID() const { + return _requestID; } -void RemoveEntityReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void RemoveEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void RemoveEntityReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; +void RemoveEntityReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; } -void RemoveEntityReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; +void RemoveEntityReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; } +bool RemoveEntityReliablePdu::operator==( + const RemoveEntityReliablePdu& rhs) const { + bool ivarsEqual = true; -bool RemoveEntityReliablePdu::operator ==(const RemoveEntityReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RemoveEntityReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RemoveEntityReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -118,7 +97,7 @@ int RemoveEntityReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RemoveEntityReliablePdu.h b/src/dis7/RemoveEntityReliablePdu.h index d5f74fa8..e2fa10e5 100644 --- a/src/dis7/RemoveEntityReliablePdu.h +++ b/src/dis7/RemoveEntityReliablePdu.h @@ -1,65 +1,62 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.2: Removal of an entity , reliable. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RemoveEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT RemoveEntityReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - RemoveEntityReliablePdu(); - virtual ~RemoveEntityReliablePdu(); + RemoveEntityReliablePdu(); + virtual ~RemoveEntityReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const RemoveEntityReliablePdu& rhs) const; + bool operator==(const RemoveEntityReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -72,7 +69,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RepairCompletePdu.cpp b/src/dis7/RepairCompletePdu.cpp index d203a1ff..bebfe483 100644 --- a/src/dis7/RepairCompletePdu.cpp +++ b/src/dis7/RepairCompletePdu.cpp @@ -2,120 +2,98 @@ using namespace DIS; - -RepairCompletePdu::RepairCompletePdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _repairingEntityID(), - _repair(0), - _padding4(0) -{ - setPduType( 9 ); +RepairCompletePdu::RepairCompletePdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _repairingEntityID(), + _repair(0), + _padding4(0) { + setPduType(9); } -RepairCompletePdu::~RepairCompletePdu() -{ -} +RepairCompletePdu::~RepairCompletePdu() {} -EntityID& RepairCompletePdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& RepairCompletePdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& RepairCompletePdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& RepairCompletePdu::getReceivingEntityID() const { + return _receivingEntityID; } -void RepairCompletePdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void RepairCompletePdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& RepairCompletePdu::getRepairingEntityID() -{ - return _repairingEntityID; +EntityID& RepairCompletePdu::getRepairingEntityID() { + return _repairingEntityID; } -const EntityID& RepairCompletePdu::getRepairingEntityID() const -{ - return _repairingEntityID; +const EntityID& RepairCompletePdu::getRepairingEntityID() const { + return _repairingEntityID; } -void RepairCompletePdu::setRepairingEntityID(const EntityID &pX) -{ - _repairingEntityID = pX; +void RepairCompletePdu::setRepairingEntityID(const EntityID& pX) { + _repairingEntityID = pX; } -unsigned short RepairCompletePdu::getRepair() const -{ - return _repair; -} +unsigned short RepairCompletePdu::getRepair() const { return _repair; } -void RepairCompletePdu::setRepair(unsigned short pX) -{ - _repair = pX; -} +void RepairCompletePdu::setRepair(unsigned short pX) { _repair = pX; } -short RepairCompletePdu::getPadding4() const -{ - return _padding4; -} +short RepairCompletePdu::getPadding4() const { return _padding4; } -void RepairCompletePdu::setPadding4(short pX) -{ - _padding4 = pX; -} +void RepairCompletePdu::setPadding4(short pX) { _padding4 = pX; } -void RepairCompletePdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _repairingEntityID.marshal(dataStream); - dataStream << _repair; - dataStream << _padding4; +void RepairCompletePdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _repairingEntityID.marshal(dataStream); + dataStream << _repair; + dataStream << _padding4; } -void RepairCompletePdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _repairingEntityID.unmarshal(dataStream); - dataStream >> _repair; - dataStream >> _padding4; +void RepairCompletePdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _repairingEntityID.unmarshal(dataStream); + dataStream >> _repair; + dataStream >> _padding4; } +bool RepairCompletePdu::operator==(const RepairCompletePdu& rhs) const { + bool ivarsEqual = true; -bool RepairCompletePdu::operator ==(const RepairCompletePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_repairingEntityID == rhs._repairingEntityID) ) ivarsEqual = false; - if( ! (_repair == rhs._repair) ) ivarsEqual = false; - if( ! (_padding4 == rhs._padding4) ) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_repairingEntityID == rhs._repairingEntityID)) ivarsEqual = false; + if (!(_repair == rhs._repair)) ivarsEqual = false; + if (!(_padding4 == rhs._padding4)) ivarsEqual = false; - return ivarsEqual; - } - -int RepairCompletePdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _repairingEntityID.getMarshalledSize(); // _repairingEntityID - marshalSize = marshalSize + 2; // _repair - marshalSize = marshalSize + 2; // _padding4 - return marshalSize; +int RepairCompletePdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _repairingEntityID.getMarshalledSize(); // _repairingEntityID + marshalSize = marshalSize + 2; // _repair + marshalSize = marshalSize + 2; // _padding4 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -128,7 +106,7 @@ int RepairCompletePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RepairCompletePdu.h b/src/dis7/RepairCompletePdu.h index c5822edb..02577915 100644 --- a/src/dis7/RepairCompletePdu.h +++ b/src/dis7/RepairCompletePdu.h @@ -1,69 +1,65 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// Section 7.4.6. Service Request PDU is received and repair is complete. +// COMPLETE -namespace DIS -{ -// Section 7.4.6. Service Request PDU is received and repair is complete. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RepairCompletePdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT RepairCompletePdu : public LogisticsFamilyPdu { + protected: /** Entity that is receiving service. See 6.2.28 */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** Entity that is supplying. See 6.2.28 */ - EntityID _repairingEntityID; + EntityID _repairingEntityID; /** Enumeration for type of repair. See 6.2.74 */ - unsigned short _repair; + unsigned short _repair; /** padding, number prevents conflict with superclass ivar name */ - short _padding4; - + short _padding4; public: - RepairCompletePdu(); - virtual ~RepairCompletePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RepairCompletePdu(); + virtual ~RepairCompletePdu(); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getRepairingEntityID(); - const EntityID& getRepairingEntityID() const; - void setRepairingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - unsigned short getRepair() const; - void setRepair(unsigned short pX); + EntityID& getRepairingEntityID(); + const EntityID& getRepairingEntityID() const; + void setRepairingEntityID(const EntityID& pX); - short getPadding4() const; - void setPadding4(short pX); + unsigned short getRepair() const; + void setRepair(unsigned short pX); + short getPadding4() const; + void setPadding4(short pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RepairCompletePdu& rhs) const; + bool operator==(const RepairCompletePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -76,7 +72,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RepairResponsePdu.cpp b/src/dis7/RepairResponsePdu.cpp index d78b636c..e0aa1da2 100644 --- a/src/dis7/RepairResponsePdu.cpp +++ b/src/dis7/RepairResponsePdu.cpp @@ -2,135 +2,111 @@ using namespace DIS; - -RepairResponsePdu::RepairResponsePdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _repairingEntityID(), - _repairResult(0), - _padding1(0), - _padding2(0) -{ - setPduType( 10 ); +RepairResponsePdu::RepairResponsePdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _repairingEntityID(), + _repairResult(0), + _padding1(0), + _padding2(0) { + setPduType(10); } -RepairResponsePdu::~RepairResponsePdu() -{ -} +RepairResponsePdu::~RepairResponsePdu() {} -EntityID& RepairResponsePdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& RepairResponsePdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& RepairResponsePdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& RepairResponsePdu::getReceivingEntityID() const { + return _receivingEntityID; } -void RepairResponsePdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void RepairResponsePdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& RepairResponsePdu::getRepairingEntityID() -{ - return _repairingEntityID; +EntityID& RepairResponsePdu::getRepairingEntityID() { + return _repairingEntityID; } -const EntityID& RepairResponsePdu::getRepairingEntityID() const -{ - return _repairingEntityID; +const EntityID& RepairResponsePdu::getRepairingEntityID() const { + return _repairingEntityID; } -void RepairResponsePdu::setRepairingEntityID(const EntityID &pX) -{ - _repairingEntityID = pX; +void RepairResponsePdu::setRepairingEntityID(const EntityID& pX) { + _repairingEntityID = pX; } -unsigned char RepairResponsePdu::getRepairResult() const -{ - return _repairResult; +unsigned char RepairResponsePdu::getRepairResult() const { + return _repairResult; } -void RepairResponsePdu::setRepairResult(unsigned char pX) -{ - _repairResult = pX; +void RepairResponsePdu::setRepairResult(unsigned char pX) { + _repairResult = pX; } -short RepairResponsePdu::getPadding1() const -{ - return _padding1; -} +short RepairResponsePdu::getPadding1() const { return _padding1; } -void RepairResponsePdu::setPadding1(short pX) -{ - _padding1 = pX; -} +void RepairResponsePdu::setPadding1(short pX) { _padding1 = pX; } -char RepairResponsePdu::getPadding2() const -{ - return _padding2; -} +char RepairResponsePdu::getPadding2() const { return _padding2; } -void RepairResponsePdu::setPadding2(char pX) -{ - _padding2 = pX; -} +void RepairResponsePdu::setPadding2(char pX) { _padding2 = pX; } -void RepairResponsePdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _repairingEntityID.marshal(dataStream); - dataStream << _repairResult; - dataStream << _padding1; - dataStream << _padding2; +void RepairResponsePdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _repairingEntityID.marshal(dataStream); + dataStream << _repairResult; + dataStream << _padding1; + dataStream << _padding2; } -void RepairResponsePdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _repairingEntityID.unmarshal(dataStream); - dataStream >> _repairResult; - dataStream >> _padding1; - dataStream >> _padding2; +void RepairResponsePdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _repairingEntityID.unmarshal(dataStream); + dataStream >> _repairResult; + dataStream >> _padding1; + dataStream >> _padding2; } +bool RepairResponsePdu::operator==(const RepairResponsePdu& rhs) const { + bool ivarsEqual = true; -bool RepairResponsePdu::operator ==(const RepairResponsePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_repairingEntityID == rhs._repairingEntityID)) ivarsEqual = false; + if (!(_repairResult == rhs._repairResult)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_repairingEntityID == rhs._repairingEntityID) ) ivarsEqual = false; - if( ! (_repairResult == rhs._repairResult) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int RepairResponsePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int RepairResponsePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _repairingEntityID.getMarshalledSize(); // _repairingEntityID - marshalSize = marshalSize + 1; // _repairResult - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - return marshalSize; + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _repairingEntityID.getMarshalledSize(); // _repairingEntityID + marshalSize = marshalSize + 1; // _repairResult + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -143,7 +119,7 @@ int RepairResponsePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/RepairResponsePdu.h b/src/dis7/RepairResponsePdu.h index c73d32b9..7e9be190 100644 --- a/src/dis7/RepairResponsePdu.h +++ b/src/dis7/RepairResponsePdu.h @@ -1,75 +1,70 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 7.4.7. Sent after repair complete PDU. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT RepairResponsePdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { + protected: /** Entity that requested repairs. See 6.2.28 */ - EntityID _receivingEntityID; + EntityID _receivingEntityID; /** Entity that is repairing. See 6.2.28 */ - EntityID _repairingEntityID; + EntityID _repairingEntityID; /** Result of repair operation */ - unsigned char _repairResult; + unsigned char _repairResult; /** padding */ - short _padding1; + short _padding1; /** padding */ - char _padding2; - + char _padding2; public: - RepairResponsePdu(); - virtual ~RepairResponsePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + RepairResponsePdu(); + virtual ~RepairResponsePdu(); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getRepairingEntityID(); - const EntityID& getRepairingEntityID() const; - void setRepairingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - unsigned char getRepairResult() const; - void setRepairResult(unsigned char pX); + EntityID& getRepairingEntityID(); + const EntityID& getRepairingEntityID() const; + void setRepairingEntityID(const EntityID& pX); - short getPadding1() const; - void setPadding1(short pX); + unsigned char getRepairResult() const; + void setRepairResult(unsigned char pX); - char getPadding2() const; - void setPadding2(char pX); + short getPadding1() const; + void setPadding1(short pX); + char getPadding2() const; + void setPadding2(char pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const RepairResponsePdu& rhs) const; + bool operator==(const RepairResponsePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +77,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ResupplyOfferPdu.cpp b/src/dis7/ResupplyOfferPdu.cpp index e6660c46..1784fb28 100644 --- a/src/dis7/ResupplyOfferPdu.cpp +++ b/src/dis7/ResupplyOfferPdu.cpp @@ -2,173 +2,140 @@ using namespace DIS; - -ResupplyOfferPdu::ResupplyOfferPdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _supplyingEntityID(), - _numberOfSupplyTypes(0), - _padding1(0), - _padding2(0) -{ - setPduType( 6 ); +ResupplyOfferPdu::ResupplyOfferPdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _supplyingEntityID(), + _numberOfSupplyTypes(0), + _padding1(0), + _padding2(0) { + setPduType(6); } -ResupplyOfferPdu::~ResupplyOfferPdu() -{ - _supplies.clear(); -} +ResupplyOfferPdu::~ResupplyOfferPdu() { _supplies.clear(); } -EntityID& ResupplyOfferPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& ResupplyOfferPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& ResupplyOfferPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& ResupplyOfferPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void ResupplyOfferPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void ResupplyOfferPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& ResupplyOfferPdu::getSupplyingEntityID() -{ - return _supplyingEntityID; +EntityID& ResupplyOfferPdu::getSupplyingEntityID() { + return _supplyingEntityID; } -const EntityID& ResupplyOfferPdu::getSupplyingEntityID() const -{ - return _supplyingEntityID; +const EntityID& ResupplyOfferPdu::getSupplyingEntityID() const { + return _supplyingEntityID; } -void ResupplyOfferPdu::setSupplyingEntityID(const EntityID &pX) -{ - _supplyingEntityID = pX; +void ResupplyOfferPdu::setSupplyingEntityID(const EntityID& pX) { + _supplyingEntityID = pX; } -unsigned char ResupplyOfferPdu::getNumberOfSupplyTypes() const -{ - return _supplies.size(); +unsigned char ResupplyOfferPdu::getNumberOfSupplyTypes() const { + return _supplies.size(); } -char ResupplyOfferPdu::getPadding1() const -{ - return _padding1; -} +char ResupplyOfferPdu::getPadding1() const { return _padding1; } -void ResupplyOfferPdu::setPadding1(char pX) -{ - _padding1 = pX; -} +void ResupplyOfferPdu::setPadding1(char pX) { _padding1 = pX; } -short ResupplyOfferPdu::getPadding2() const -{ - return _padding2; -} +short ResupplyOfferPdu::getPadding2() const { return _padding2; } -void ResupplyOfferPdu::setPadding2(short pX) -{ - _padding2 = pX; -} +void ResupplyOfferPdu::setPadding2(short pX) { _padding2 = pX; } -std::vector& ResupplyOfferPdu::getSupplies() -{ - return _supplies; +std::vector& ResupplyOfferPdu::getSupplies() { + return _supplies; } -const std::vector& ResupplyOfferPdu::getSupplies() const -{ - return _supplies; +const std::vector& ResupplyOfferPdu::getSupplies() const { + return _supplies; } -void ResupplyOfferPdu::setSupplies(const std::vector& pX) -{ - _supplies = pX; +void ResupplyOfferPdu::setSupplies(const std::vector& pX) { + _supplies = pX; } -void ResupplyOfferPdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _supplyingEntityID.marshal(dataStream); - dataStream << ( unsigned char )_supplies.size(); - dataStream << _padding1; - dataStream << _padding2; - - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - SupplyQuantity x = _supplies[idx]; - x.marshal(dataStream); - } - -} +void ResupplyOfferPdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _supplyingEntityID.marshal(dataStream); + dataStream << (unsigned char)_supplies.size(); + dataStream << _padding1; + dataStream << _padding2; -void ResupplyOfferPdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _supplyingEntityID.unmarshal(dataStream); - dataStream >> _numberOfSupplyTypes; - dataStream >> _padding1; - dataStream >> _padding2; - - _supplies.clear(); - for(size_t idx = 0; idx < _numberOfSupplyTypes; idx++) - { - SupplyQuantity x; - x.unmarshal(dataStream); - _supplies.push_back(x); - } + for (size_t idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity x = _supplies[idx]; + x.marshal(dataStream); + } } +void ResupplyOfferPdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _supplyingEntityID.unmarshal(dataStream); + dataStream >> _numberOfSupplyTypes; + dataStream >> _padding1; + dataStream >> _padding2; -bool ResupplyOfferPdu::operator ==(const ResupplyOfferPdu& rhs) const - { - bool ivarsEqual = true; + _supplies.clear(); + for (size_t idx = 0; idx < _numberOfSupplyTypes; idx++) { + SupplyQuantity x; + x.unmarshal(dataStream); + _supplies.push_back(x); + } +} - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); +bool ResupplyOfferPdu::operator==(const ResupplyOfferPdu& rhs) const { + bool ivarsEqual = true; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_supplyingEntityID == rhs._supplyingEntityID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - if( ! ( _supplies[idx] == rhs._supplies[idx]) ) ivarsEqual = false; - } + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_supplyingEntityID == rhs._supplyingEntityID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + if (!(_supplies[idx] == rhs._supplies[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int ResupplyOfferPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ResupplyOfferPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID - marshalSize = marshalSize + 1; // _numberOfSupplyTypes - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 2; // _padding2 + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID + marshalSize = marshalSize + 1; // _numberOfSupplyTypes + marshalSize = marshalSize + 1; // _padding1 + marshalSize = marshalSize + 2; // _padding2 - for(unsigned long long idx=0; idx < _supplies.size(); idx++) - { - SupplyQuantity listElement = _supplies[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity listElement = _supplies[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -181,7 +148,7 @@ int ResupplyOfferPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ResupplyOfferPdu.h b/src/dis7/ResupplyOfferPdu.h index 87df26d3..74cd44dd 100644 --- a/src/dis7/ResupplyOfferPdu.h +++ b/src/dis7/ResupplyOfferPdu.h @@ -1,83 +1,84 @@ #pragma once -#include -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Information used to communicate the offer of supplies by a supplying entity +// to a receiving entity. Section 7.4.3 COMPLETE -namespace DIS -{ -// Information used to communicate the offer of supplies by a supplying entity to a receiving entity. Section 7.4.3 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu -{ -protected: - /** Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3 */ - EntityID _receivingEntityID; +class OPENDIS7_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { + protected: + /** Field identifies the Entity and respective Entity Record ID that is + * receiving service (see 6.2.28), Section 7.4.3 */ + EntityID _receivingEntityID; - /** Identifies the Entity and respective Entity ID Record that is supplying (see 6.2.28), Section 7.4.3 */ - EntityID _supplyingEntityID; + /** Identifies the Entity and respective Entity ID Record that is supplying + * (see 6.2.28), Section 7.4.3 */ + EntityID _supplyingEntityID; /** How many supplies types are being offered, Section 7.4.3 */ - unsigned char _numberOfSupplyTypes; + unsigned char _numberOfSupplyTypes; /** padding */ - char _padding1; + char _padding1; /** padding */ - short _padding2; - - /** A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3 */ - std::vector _supplies; + short _padding2; + /** A Reord that Specifies the type of supply and the amount of that supply + * for each of the supply types in numberOfSupplyTypes (see 6.2.85), + * Section 7.4.3 */ + std::vector _supplies; public: - ResupplyOfferPdu(); - virtual ~ResupplyOfferPdu(); + ResupplyOfferPdu(); + virtual ~ResupplyOfferPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - EntityID& getSupplyingEntityID(); - const EntityID& getSupplyingEntityID() const; - void setSupplyingEntityID(const EntityID &pX); + EntityID& getSupplyingEntityID(); + const EntityID& getSupplyingEntityID() const; + void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + unsigned char getNumberOfSupplyTypes() const; - char getPadding1() const; - void setPadding1(char pX); + char getPadding1() const; + void setPadding1(char pX); - short getPadding2() const; - void setPadding2(short pX); + short getPadding2() const; + void setPadding2(short pX); - std::vector& getSupplies(); - const std::vector& getSupplies() const; - void setSupplies(const std::vector& pX); + std::vector& getSupplies(); + const std::vector& getSupplies() const; + void setSupplies(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ResupplyOfferPdu& rhs) const; + bool operator==(const ResupplyOfferPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -90,7 +91,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ResupplyReceivedPdu.cpp b/src/dis7/ResupplyReceivedPdu.cpp index bce99a5c..0defe26d 100644 --- a/src/dis7/ResupplyReceivedPdu.cpp +++ b/src/dis7/ResupplyReceivedPdu.cpp @@ -2,173 +2,140 @@ using namespace DIS; - -ResupplyReceivedPdu::ResupplyReceivedPdu() : LogisticsFamilyPdu(), - _receivingEntityID(), - _supplyingEntityID(), - _numberOfSupplyTypes(0), - _padding1(0), - _padding2(0) -{ - setPduType( 7 ); +ResupplyReceivedPdu::ResupplyReceivedPdu() + : LogisticsFamilyPdu(), + _receivingEntityID(), + _supplyingEntityID(), + _numberOfSupplyTypes(0), + _padding1(0), + _padding2(0) { + setPduType(7); } -ResupplyReceivedPdu::~ResupplyReceivedPdu() -{ - _supplies.clear(); -} +ResupplyReceivedPdu::~ResupplyReceivedPdu() { _supplies.clear(); } -EntityID& ResupplyReceivedPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& ResupplyReceivedPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& ResupplyReceivedPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& ResupplyReceivedPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void ResupplyReceivedPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void ResupplyReceivedPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -EntityID& ResupplyReceivedPdu::getSupplyingEntityID() -{ - return _supplyingEntityID; +EntityID& ResupplyReceivedPdu::getSupplyingEntityID() { + return _supplyingEntityID; } -const EntityID& ResupplyReceivedPdu::getSupplyingEntityID() const -{ - return _supplyingEntityID; +const EntityID& ResupplyReceivedPdu::getSupplyingEntityID() const { + return _supplyingEntityID; } -void ResupplyReceivedPdu::setSupplyingEntityID(const EntityID &pX) -{ - _supplyingEntityID = pX; +void ResupplyReceivedPdu::setSupplyingEntityID(const EntityID& pX) { + _supplyingEntityID = pX; } -unsigned char ResupplyReceivedPdu::getNumberOfSupplyTypes() const -{ - return _supplies.size(); +unsigned char ResupplyReceivedPdu::getNumberOfSupplyTypes() const { + return _supplies.size(); } -short ResupplyReceivedPdu::getPadding1() const -{ - return _padding1; -} +short ResupplyReceivedPdu::getPadding1() const { return _padding1; } -void ResupplyReceivedPdu::setPadding1(short pX) -{ - _padding1 = pX; -} +void ResupplyReceivedPdu::setPadding1(short pX) { _padding1 = pX; } -char ResupplyReceivedPdu::getPadding2() const -{ - return _padding2; -} +char ResupplyReceivedPdu::getPadding2() const { return _padding2; } -void ResupplyReceivedPdu::setPadding2(char pX) -{ - _padding2 = pX; -} +void ResupplyReceivedPdu::setPadding2(char pX) { _padding2 = pX; } -std::vector& ResupplyReceivedPdu::getSupplies() -{ - return _supplies; +std::vector& ResupplyReceivedPdu::getSupplies() { + return _supplies; } -const std::vector& ResupplyReceivedPdu::getSupplies() const -{ - return _supplies; +const std::vector& ResupplyReceivedPdu::getSupplies() const { + return _supplies; } -void ResupplyReceivedPdu::setSupplies(const std::vector& pX) -{ - _supplies = pX; +void ResupplyReceivedPdu::setSupplies(const std::vector& pX) { + _supplies = pX; } -void ResupplyReceivedPdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _receivingEntityID.marshal(dataStream); - _supplyingEntityID.marshal(dataStream); - dataStream << ( unsigned char )_supplies.size(); - dataStream << _padding1; - dataStream << _padding2; - - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - SupplyQuantity x = _supplies[idx]; - x.marshal(dataStream); - } - -} +void ResupplyReceivedPdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _receivingEntityID.marshal(dataStream); + _supplyingEntityID.marshal(dataStream); + dataStream << (unsigned char)_supplies.size(); + dataStream << _padding1; + dataStream << _padding2; -void ResupplyReceivedPdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _receivingEntityID.unmarshal(dataStream); - _supplyingEntityID.unmarshal(dataStream); - dataStream >> _numberOfSupplyTypes; - dataStream >> _padding1; - dataStream >> _padding2; - - _supplies.clear(); - for(size_t idx = 0; idx < _numberOfSupplyTypes; idx++) - { - SupplyQuantity x; - x.unmarshal(dataStream); - _supplies.push_back(x); - } + for (size_t idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity x = _supplies[idx]; + x.marshal(dataStream); + } } +void ResupplyReceivedPdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _receivingEntityID.unmarshal(dataStream); + _supplyingEntityID.unmarshal(dataStream); + dataStream >> _numberOfSupplyTypes; + dataStream >> _padding1; + dataStream >> _padding2; -bool ResupplyReceivedPdu::operator ==(const ResupplyReceivedPdu& rhs) const - { - bool ivarsEqual = true; + _supplies.clear(); + for (size_t idx = 0; idx < _numberOfSupplyTypes; idx++) { + SupplyQuantity x; + x.unmarshal(dataStream); + _supplies.push_back(x); + } +} - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); +bool ResupplyReceivedPdu::operator==(const ResupplyReceivedPdu& rhs) const { + bool ivarsEqual = true; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - if( ! (_supplyingEntityID == rhs._supplyingEntityID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - if( ! ( _supplies[idx] == rhs._supplies[idx]) ) ivarsEqual = false; - } + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; + if (!(_supplyingEntityID == rhs._supplyingEntityID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + if (!(_supplies[idx] == rhs._supplies[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int ResupplyReceivedPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ResupplyReceivedPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - marshalSize = marshalSize + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID - marshalSize = marshalSize + 1; // _numberOfSupplyTypes - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + marshalSize = marshalSize + + _supplyingEntityID.getMarshalledSize(); // _supplyingEntityID + marshalSize = marshalSize + 1; // _numberOfSupplyTypes + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 1; // _padding2 - for(unsigned long long idx=0; idx < _supplies.size(); idx++) - { - SupplyQuantity listElement = _supplies[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity listElement = _supplies[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -181,7 +148,7 @@ int ResupplyReceivedPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ResupplyReceivedPdu.h b/src/dis7/ResupplyReceivedPdu.h index f1e001b3..3baae502 100644 --- a/src/dis7/ResupplyReceivedPdu.h +++ b/src/dis7/ResupplyReceivedPdu.h @@ -1,83 +1,83 @@ #pragma once -#include -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 7.4.4. Receipt of supplies is communicated by issuing Resupply +// Received PDU. COMPLETE -namespace DIS -{ -// Section 7.4.4. Receipt of supplies is communicated by issuing Resupply Received PDU. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu -{ -protected: - /** Entity that is receiving service. Shall be represented by Entity Identifier record (see 6.2.28) */ - EntityID _receivingEntityID; +class OPENDIS7_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { + protected: + /** Entity that is receiving service. Shall be represented by Entity + * Identifier record (see 6.2.28) */ + EntityID _receivingEntityID; - /** Entity that is supplying. Shall be represented by Entity Identifier record (see 6.2.28) */ - EntityID _supplyingEntityID; + /** Entity that is supplying. Shall be represented by Entity Identifier + * record (see 6.2.28) */ + EntityID _supplyingEntityID; /** How many supplies are taken by receiving entity */ - unsigned char _numberOfSupplyTypes; + unsigned char _numberOfSupplyTypes; /** padding */ - short _padding1; + short _padding1; /** padding */ - char _padding2; - - /** Type and amount of supplies for each specified supply type. See 6.2.85 for supply quantity record. */ - std::vector _supplies; + char _padding2; + /** Type and amount of supplies for each specified supply type. See 6.2.85 + * for supply quantity record. */ + std::vector _supplies; public: - ResupplyReceivedPdu(); - virtual ~ResupplyReceivedPdu(); + ResupplyReceivedPdu(); + virtual ~ResupplyReceivedPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); - EntityID& getSupplyingEntityID(); - const EntityID& getSupplyingEntityID() const; - void setSupplyingEntityID(const EntityID &pX); + EntityID& getSupplyingEntityID(); + const EntityID& getSupplyingEntityID() const; + void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + unsigned char getNumberOfSupplyTypes() const; - short getPadding1() const; - void setPadding1(short pX); + short getPadding1() const; + void setPadding1(short pX); - char getPadding2() const; - void setPadding2(char pX); + char getPadding2() const; + void setPadding2(char pX); - std::vector& getSupplies(); - const std::vector& getSupplies() const; - void setSupplies(const std::vector& pX); + std::vector& getSupplies(); + const std::vector& getSupplies() const; + void setSupplies(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ResupplyReceivedPdu& rhs) const; + bool operator==(const ResupplyReceivedPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -90,7 +90,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SecondaryOperationalData.cpp b/src/dis7/SecondaryOperationalData.cpp index bc65be17..ef86de3b 100644 --- a/src/dis7/SecondaryOperationalData.cpp +++ b/src/dis7/SecondaryOperationalData.cpp @@ -2,89 +2,78 @@ using namespace DIS; +SecondaryOperationalData::SecondaryOperationalData() + : _operationalData1(0), + _operationalData2(0), + _numberOfIFFFundamentalParameterRecords(0) {} -SecondaryOperationalData::SecondaryOperationalData(): - _operationalData1(0), - _operationalData2(0), - _numberOfIFFFundamentalParameterRecords(0) -{ -} - -SecondaryOperationalData::~SecondaryOperationalData() -{ -} +SecondaryOperationalData::~SecondaryOperationalData() {} -unsigned char SecondaryOperationalData::getOperationalData1() const -{ - return _operationalData1; +unsigned char SecondaryOperationalData::getOperationalData1() const { + return _operationalData1; } -void SecondaryOperationalData::setOperationalData1(unsigned char pX) -{ - _operationalData1 = pX; +void SecondaryOperationalData::setOperationalData1(unsigned char pX) { + _operationalData1 = pX; } -unsigned char SecondaryOperationalData::getOperationalData2() const -{ - return _operationalData2; +unsigned char SecondaryOperationalData::getOperationalData2() const { + return _operationalData2; } -void SecondaryOperationalData::setOperationalData2(unsigned char pX) -{ - _operationalData2 = pX; +void SecondaryOperationalData::setOperationalData2(unsigned char pX) { + _operationalData2 = pX; } -unsigned short SecondaryOperationalData::getNumberOfIFFFundamentalParameterRecords() const -{ - return _numberOfIFFFundamentalParameterRecords; +unsigned short +SecondaryOperationalData::getNumberOfIFFFundamentalParameterRecords() const { + return _numberOfIFFFundamentalParameterRecords; } -void SecondaryOperationalData::setNumberOfIFFFundamentalParameterRecords(unsigned short pX) -{ - _numberOfIFFFundamentalParameterRecords = pX; +void SecondaryOperationalData::setNumberOfIFFFundamentalParameterRecords( + unsigned short pX) { + _numberOfIFFFundamentalParameterRecords = pX; } -void SecondaryOperationalData::marshal(DataStream& dataStream) const -{ - dataStream << _operationalData1; - dataStream << _operationalData2; - dataStream << _numberOfIFFFundamentalParameterRecords; +void SecondaryOperationalData::marshal(DataStream& dataStream) const { + dataStream << _operationalData1; + dataStream << _operationalData2; + dataStream << _numberOfIFFFundamentalParameterRecords; } -void SecondaryOperationalData::unmarshal(DataStream& dataStream) -{ - dataStream >> _operationalData1; - dataStream >> _operationalData2; - dataStream >> _numberOfIFFFundamentalParameterRecords; +void SecondaryOperationalData::unmarshal(DataStream& dataStream) { + dataStream >> _operationalData1; + dataStream >> _operationalData2; + dataStream >> _numberOfIFFFundamentalParameterRecords; } +bool SecondaryOperationalData::operator==( + const SecondaryOperationalData& rhs) const { + bool ivarsEqual = true; -bool SecondaryOperationalData::operator ==(const SecondaryOperationalData& rhs) const - { - bool ivarsEqual = true; + if (!(_operationalData1 == rhs._operationalData1)) ivarsEqual = false; + if (!(_operationalData2 == rhs._operationalData2)) ivarsEqual = false; + if (!(_numberOfIFFFundamentalParameterRecords == + rhs._numberOfIFFFundamentalParameterRecords)) + ivarsEqual = false; - if( ! (_operationalData1 == rhs._operationalData1) ) ivarsEqual = false; - if( ! (_operationalData2 == rhs._operationalData2) ) ivarsEqual = false; - if( ! (_numberOfIFFFundamentalParameterRecords == rhs._numberOfIFFFundamentalParameterRecords) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SecondaryOperationalData::getMarshalledSize() const -{ - int marshalSize = 0; +int SecondaryOperationalData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _operationalData1 - marshalSize = marshalSize + 1; // _operationalData2 - marshalSize = marshalSize + 2; // _numberOfIFFFundamentalParameterRecords - return marshalSize; + marshalSize = marshalSize + 1; // _operationalData1 + marshalSize = marshalSize + 1; // _operationalData2 + marshalSize = marshalSize + 2; // _numberOfIFFFundamentalParameterRecords + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +86,7 @@ int SecondaryOperationalData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SecondaryOperationalData.h b/src/dis7/SecondaryOperationalData.h index 8f3dd7cd..4a233dea 100644 --- a/src/dis7/SecondaryOperationalData.h +++ b/src/dis7/SecondaryOperationalData.h @@ -1,58 +1,57 @@ #pragma once -#include #include +#include +namespace DIS { +// Additional operational data for an IFF emitting system and the number of IFF +// Fundamental Parameter Data records Section 6.2.76. -namespace DIS -{ -// Additional operational data for an IFF emitting system and the number of IFF Fundamental Parameter Data records Section 6.2.76. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SecondaryOperationalData -{ -protected: - /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */ - unsigned char _operationalData1; +class OPENDIS7_EXPORT SecondaryOperationalData { + protected: + /** additional operational characteristics of the IFF emitting system. Each + * 8-bit field will vary depending on the system type. */ + unsigned char _operationalData1; - /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */ - unsigned char _operationalData2; + /** additional operational characteristics of the IFF emitting system. Each + * 8-bit field will vary depending on the system type. */ + unsigned char _operationalData2; /** the number of IFF Fundamental Parameter Data records that follow */ - unsigned short _numberOfIFFFundamentalParameterRecords; - + unsigned short _numberOfIFFFundamentalParameterRecords; public: - SecondaryOperationalData(); - virtual ~SecondaryOperationalData(); + SecondaryOperationalData(); + virtual ~SecondaryOperationalData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getOperationalData1() const; - void setOperationalData1(unsigned char pX); + unsigned char getOperationalData1() const; + void setOperationalData1(unsigned char pX); - unsigned char getOperationalData2() const; - void setOperationalData2(unsigned char pX); + unsigned char getOperationalData2() const; + void setOperationalData2(unsigned char pX); - unsigned short getNumberOfIFFFundamentalParameterRecords() const; - void setNumberOfIFFFundamentalParameterRecords(unsigned short pX); + unsigned short getNumberOfIFFFundamentalParameterRecords() const; + void setNumberOfIFFFundamentalParameterRecords(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SecondaryOperationalData& rhs) const; + bool operator==(const SecondaryOperationalData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +64,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SeesPdu.cpp b/src/dis7/SeesPdu.cpp index e5a4c0ea..fecb2176 100644 --- a/src/dis7/SeesPdu.cpp +++ b/src/dis7/SeesPdu.cpp @@ -2,221 +2,200 @@ using namespace DIS; - -SeesPdu::SeesPdu() : DistributedEmissionsFamilyPdu(), - _orginatingEntityID(), - _infraredSignatureRepresentationIndex(0), - _acousticSignatureRepresentationIndex(0), - _radarCrossSectionSignatureRepresentationIndex(0), - _numberOfPropulsionSystems(0), - _numberOfVectoringNozzleSystems(0) -{ - setPduType( 30 ); +SeesPdu::SeesPdu() + : DistributedEmissionsFamilyPdu(), + _orginatingEntityID(), + _infraredSignatureRepresentationIndex(0), + _acousticSignatureRepresentationIndex(0), + _radarCrossSectionSignatureRepresentationIndex(0), + _numberOfPropulsionSystems(0), + _numberOfVectoringNozzleSystems(0) { + setPduType(30); } -SeesPdu::~SeesPdu() -{ - _propulsionSystemData.clear(); - _vectoringSystemData.clear(); +SeesPdu::~SeesPdu() { + _propulsionSystemData.clear(); + _vectoringSystemData.clear(); } -EntityID& SeesPdu::getOrginatingEntityID() -{ - return _orginatingEntityID; -} +EntityID& SeesPdu::getOrginatingEntityID() { return _orginatingEntityID; } -const EntityID& SeesPdu::getOrginatingEntityID() const -{ - return _orginatingEntityID; +const EntityID& SeesPdu::getOrginatingEntityID() const { + return _orginatingEntityID; } -void SeesPdu::setOrginatingEntityID(const EntityID &pX) -{ - _orginatingEntityID = pX; +void SeesPdu::setOrginatingEntityID(const EntityID& pX) { + _orginatingEntityID = pX; } -unsigned short SeesPdu::getInfraredSignatureRepresentationIndex() const -{ - return _infraredSignatureRepresentationIndex; +unsigned short SeesPdu::getInfraredSignatureRepresentationIndex() const { + return _infraredSignatureRepresentationIndex; } -void SeesPdu::setInfraredSignatureRepresentationIndex(unsigned short pX) -{ - _infraredSignatureRepresentationIndex = pX; +void SeesPdu::setInfraredSignatureRepresentationIndex(unsigned short pX) { + _infraredSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getAcousticSignatureRepresentationIndex() const -{ - return _acousticSignatureRepresentationIndex; +unsigned short SeesPdu::getAcousticSignatureRepresentationIndex() const { + return _acousticSignatureRepresentationIndex; } -void SeesPdu::setAcousticSignatureRepresentationIndex(unsigned short pX) -{ - _acousticSignatureRepresentationIndex = pX; +void SeesPdu::setAcousticSignatureRepresentationIndex(unsigned short pX) { + _acousticSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() const -{ - return _radarCrossSectionSignatureRepresentationIndex; +unsigned short SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() + const { + return _radarCrossSectionSignatureRepresentationIndex; } -void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX) -{ - _radarCrossSectionSignatureRepresentationIndex = pX; +void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex( + unsigned short pX) { + _radarCrossSectionSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getNumberOfPropulsionSystems() const -{ - return _propulsionSystemData.size(); +unsigned short SeesPdu::getNumberOfPropulsionSystems() const { + return _propulsionSystemData.size(); } -unsigned short SeesPdu::getNumberOfVectoringNozzleSystems() const -{ - return _vectoringSystemData.size(); +unsigned short SeesPdu::getNumberOfVectoringNozzleSystems() const { + return _vectoringSystemData.size(); } -std::vector& SeesPdu::getPropulsionSystemData() -{ - return _propulsionSystemData; +std::vector& SeesPdu::getPropulsionSystemData() { + return _propulsionSystemData; } -const std::vector& SeesPdu::getPropulsionSystemData() const -{ - return _propulsionSystemData; +const std::vector& SeesPdu::getPropulsionSystemData() + const { + return _propulsionSystemData; } -void SeesPdu::setPropulsionSystemData(const std::vector& pX) -{ - _propulsionSystemData = pX; +void SeesPdu::setPropulsionSystemData( + const std::vector& pX) { + _propulsionSystemData = pX; } -std::vector& SeesPdu::getVectoringSystemData() -{ - return _vectoringSystemData; +std::vector& SeesPdu::getVectoringSystemData() { + return _vectoringSystemData; } -const std::vector& SeesPdu::getVectoringSystemData() const -{ - return _vectoringSystemData; +const std::vector& SeesPdu::getVectoringSystemData() + const { + return _vectoringSystemData; } -void SeesPdu::setVectoringSystemData(const std::vector& pX) -{ - _vectoringSystemData = pX; +void SeesPdu::setVectoringSystemData( + const std::vector& pX) { + _vectoringSystemData = pX; } -void SeesPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _orginatingEntityID.marshal(dataStream); - dataStream << _infraredSignatureRepresentationIndex; - dataStream << _acousticSignatureRepresentationIndex; - dataStream << _radarCrossSectionSignatureRepresentationIndex; - dataStream << ( unsigned short )_propulsionSystemData.size(); - dataStream << ( unsigned short )_vectoringSystemData.size(); - - for(size_t idx = 0; idx < _propulsionSystemData.size(); idx++) - { - PropulsionSystemData x = _propulsionSystemData[idx]; - x.marshal(dataStream); - } +void SeesPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _orginatingEntityID.marshal(dataStream); + dataStream << _infraredSignatureRepresentationIndex; + dataStream << _acousticSignatureRepresentationIndex; + dataStream << _radarCrossSectionSignatureRepresentationIndex; + dataStream << (unsigned short)_propulsionSystemData.size(); + dataStream << (unsigned short)_vectoringSystemData.size(); + for (size_t idx = 0; idx < _propulsionSystemData.size(); idx++) { + PropulsionSystemData x = _propulsionSystemData[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _vectoringSystemData.size(); idx++) - { - VectoringNozzleSystem x = _vectoringSystemData[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _vectoringSystemData.size(); idx++) { + VectoringNozzleSystem x = _vectoringSystemData[idx]; + x.marshal(dataStream); + } } -void SeesPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _orginatingEntityID.unmarshal(dataStream); - dataStream >> _infraredSignatureRepresentationIndex; - dataStream >> _acousticSignatureRepresentationIndex; - dataStream >> _radarCrossSectionSignatureRepresentationIndex; - dataStream >> _numberOfPropulsionSystems; - dataStream >> _numberOfVectoringNozzleSystems; +void SeesPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _orginatingEntityID.unmarshal(dataStream); + dataStream >> _infraredSignatureRepresentationIndex; + dataStream >> _acousticSignatureRepresentationIndex; + dataStream >> _radarCrossSectionSignatureRepresentationIndex; + dataStream >> _numberOfPropulsionSystems; + dataStream >> _numberOfVectoringNozzleSystems; - _propulsionSystemData.clear(); - for(size_t idx = 0; idx < _numberOfPropulsionSystems; idx++) - { - PropulsionSystemData x; - x.unmarshal(dataStream); - _propulsionSystemData.push_back(x); - } + _propulsionSystemData.clear(); + for (size_t idx = 0; idx < _numberOfPropulsionSystems; idx++) { + PropulsionSystemData x; + x.unmarshal(dataStream); + _propulsionSystemData.push_back(x); + } - _vectoringSystemData.clear(); - for(size_t idx = 0; idx < _numberOfVectoringNozzleSystems; idx++) - { - VectoringNozzleSystem x; - x.unmarshal(dataStream); - _vectoringSystemData.push_back(x); - } + _vectoringSystemData.clear(); + for (size_t idx = 0; idx < _numberOfVectoringNozzleSystems; idx++) { + VectoringNozzleSystem x; + x.unmarshal(dataStream); + _vectoringSystemData.push_back(x); + } } +bool SeesPdu::operator==(const SeesPdu& rhs) const { + bool ivarsEqual = true; -bool SeesPdu::operator ==(const SeesPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - - if( ! (_orginatingEntityID == rhs._orginatingEntityID) ) ivarsEqual = false; - if( ! (_infraredSignatureRepresentationIndex == rhs._infraredSignatureRepresentationIndex) ) ivarsEqual = false; - if( ! (_acousticSignatureRepresentationIndex == rhs._acousticSignatureRepresentationIndex) ) ivarsEqual = false; - if( ! (_radarCrossSectionSignatureRepresentationIndex == rhs._radarCrossSectionSignatureRepresentationIndex) ) ivarsEqual = false; + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _propulsionSystemData.size(); idx++) - { - if( ! ( _propulsionSystemData[idx] == rhs._propulsionSystemData[idx]) ) ivarsEqual = false; - } + if (!(_orginatingEntityID == rhs._orginatingEntityID)) ivarsEqual = false; + if (!(_infraredSignatureRepresentationIndex == + rhs._infraredSignatureRepresentationIndex)) + ivarsEqual = false; + if (!(_acousticSignatureRepresentationIndex == + rhs._acousticSignatureRepresentationIndex)) + ivarsEqual = false; + if (!(_radarCrossSectionSignatureRepresentationIndex == + rhs._radarCrossSectionSignatureRepresentationIndex)) + ivarsEqual = false; + for (size_t idx = 0; idx < _propulsionSystemData.size(); idx++) { + if (!(_propulsionSystemData[idx] == rhs._propulsionSystemData[idx])) + ivarsEqual = false; + } - for(size_t idx = 0; idx < _vectoringSystemData.size(); idx++) - { - if( ! ( _vectoringSystemData[idx] == rhs._vectoringSystemData[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int SeesPdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID - marshalSize = marshalSize + 2; // _infraredSignatureRepresentationIndex - marshalSize = marshalSize + 2; // _acousticSignatureRepresentationIndex - marshalSize = marshalSize + 2; // _radarCrossSectionSignatureRepresentationIndex - marshalSize = marshalSize + 2; // _numberOfPropulsionSystems - marshalSize = marshalSize + 2; // _numberOfVectoringNozzleSystems - - for(unsigned long long idx=0; idx < _propulsionSystemData.size(); idx++) - { - PropulsionSystemData listElement = _propulsionSystemData[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (size_t idx = 0; idx < _vectoringSystemData.size(); idx++) { + if (!(_vectoringSystemData[idx] == rhs._vectoringSystemData[idx])) + ivarsEqual = false; + } + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _vectoringSystemData.size(); idx++) - { - VectoringNozzleSystem listElement = _vectoringSystemData[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int SeesPdu::getMarshalledSize() const { + int marshalSize = 0; - return marshalSize; + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _orginatingEntityID.getMarshalledSize(); // _orginatingEntityID + marshalSize = marshalSize + 2; // _infraredSignatureRepresentationIndex + marshalSize = marshalSize + 2; // _acousticSignatureRepresentationIndex + marshalSize = + marshalSize + 2; // _radarCrossSectionSignatureRepresentationIndex + marshalSize = marshalSize + 2; // _numberOfPropulsionSystems + marshalSize = marshalSize + 2; // _numberOfVectoringNozzleSystems + + for (unsigned long long idx = 0; idx < _propulsionSystemData.size(); idx++) { + PropulsionSystemData listElement = _propulsionSystemData[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _vectoringSystemData.size(); idx++) { + VectoringNozzleSystem listElement = _vectoringSystemData[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -229,7 +208,7 @@ int SeesPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SeesPdu.h b/src/dis7/SeesPdu.h index e8e1576d..f25d1b1b 100644 --- a/src/dis7/SeesPdu.h +++ b/src/dis7/SeesPdu.h @@ -1,94 +1,92 @@ #pragma once +#include + +#include #include #include #include -#include -#include -#include #include +#include +namespace DIS { +// SEES PDU, supplemental emissions entity state information. Section 7.6.6 +// COMPLETE -namespace DIS -{ -// SEES PDU, supplemental emissions entity state information. Section 7.6.6 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu { + protected: /** Originating entity ID */ - EntityID _orginatingEntityID; + EntityID _orginatingEntityID; /** IR Signature representation index */ - unsigned short _infraredSignatureRepresentationIndex; + unsigned short _infraredSignatureRepresentationIndex; /** acoustic Signature representation index */ - unsigned short _acousticSignatureRepresentationIndex; + unsigned short _acousticSignatureRepresentationIndex; /** radar cross section representation index */ - unsigned short _radarCrossSectionSignatureRepresentationIndex; + unsigned short _radarCrossSectionSignatureRepresentationIndex; /** how many propulsion systems */ - unsigned short _numberOfPropulsionSystems; + unsigned short _numberOfPropulsionSystems; /** how many vectoring nozzle systems */ - unsigned short _numberOfVectoringNozzleSystems; + unsigned short _numberOfVectoringNozzleSystems; /** variable length list of propulsion system data */ - std::vector _propulsionSystemData; + std::vector _propulsionSystemData; /** variable length list of vectoring system data */ - std::vector _vectoringSystemData; - + std::vector _vectoringSystemData; public: - SeesPdu(); - virtual ~SeesPdu(); + SeesPdu(); + virtual ~SeesPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOrginatingEntityID(); - const EntityID& getOrginatingEntityID() const; - void setOrginatingEntityID(const EntityID &pX); + EntityID& getOrginatingEntityID(); + const EntityID& getOrginatingEntityID() const; + void setOrginatingEntityID(const EntityID& pX); - unsigned short getInfraredSignatureRepresentationIndex() const; - void setInfraredSignatureRepresentationIndex(unsigned short pX); + unsigned short getInfraredSignatureRepresentationIndex() const; + void setInfraredSignatureRepresentationIndex(unsigned short pX); - unsigned short getAcousticSignatureRepresentationIndex() const; - void setAcousticSignatureRepresentationIndex(unsigned short pX); + unsigned short getAcousticSignatureRepresentationIndex() const; + void setAcousticSignatureRepresentationIndex(unsigned short pX); - unsigned short getRadarCrossSectionSignatureRepresentationIndex() const; - void setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX); + unsigned short getRadarCrossSectionSignatureRepresentationIndex() const; + void setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX); - unsigned short getNumberOfPropulsionSystems() const; + unsigned short getNumberOfPropulsionSystems() const; - unsigned short getNumberOfVectoringNozzleSystems() const; + unsigned short getNumberOfVectoringNozzleSystems() const; - std::vector& getPropulsionSystemData(); - const std::vector& getPropulsionSystemData() const; - void setPropulsionSystemData(const std::vector& pX); + std::vector& getPropulsionSystemData(); + const std::vector& getPropulsionSystemData() const; + void setPropulsionSystemData(const std::vector& pX); - std::vector& getVectoringSystemData(); - const std::vector& getVectoringSystemData() const; - void setVectoringSystemData(const std::vector& pX); + std::vector& getVectoringSystemData(); + const std::vector& getVectoringSystemData() const; + void setVectoringSystemData(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SeesPdu& rhs) const; + bool operator==(const SeesPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -101,7 +99,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Sensor.cpp b/src/dis7/Sensor.cpp index 6321be75..17400f05 100644 --- a/src/dis7/Sensor.cpp +++ b/src/dis7/Sensor.cpp @@ -2,134 +2,90 @@ using namespace DIS; +Sensor::Sensor() + : _sensorTypeSource(0), + _sensorOnOffStatus(0), + _sensorType(0), + _station(0), + _quantity(0), + _padding(0) {} -Sensor::Sensor(): - _sensorTypeSource(0), - _sensorOnOffStatus(0), - _sensorType(0), - _station(0), - _quantity(0), - _padding(0) -{ -} - -Sensor::~Sensor() -{ -} +Sensor::~Sensor() {} -unsigned char Sensor::getSensorTypeSource() const -{ - return _sensorTypeSource; -} +unsigned char Sensor::getSensorTypeSource() const { return _sensorTypeSource; } -void Sensor::setSensorTypeSource(unsigned char pX) -{ - _sensorTypeSource = pX; -} +void Sensor::setSensorTypeSource(unsigned char pX) { _sensorTypeSource = pX; } -unsigned char Sensor::getSensorOnOffStatus() const -{ - return _sensorOnOffStatus; +unsigned char Sensor::getSensorOnOffStatus() const { + return _sensorOnOffStatus; } -void Sensor::setSensorOnOffStatus(unsigned char pX) -{ - _sensorOnOffStatus = pX; -} +void Sensor::setSensorOnOffStatus(unsigned char pX) { _sensorOnOffStatus = pX; } -unsigned short Sensor::getSensorType() const -{ - return _sensorType; -} +unsigned short Sensor::getSensorType() const { return _sensorType; } -void Sensor::setSensorType(unsigned short pX) -{ - _sensorType = pX; -} +void Sensor::setSensorType(unsigned short pX) { _sensorType = pX; } -unsigned int Sensor::getStation() const -{ - return _station; -} +unsigned int Sensor::getStation() const { return _station; } -void Sensor::setStation(unsigned int pX) -{ - _station = pX; -} +void Sensor::setStation(unsigned int pX) { _station = pX; } -unsigned short Sensor::getQuantity() const -{ - return _quantity; -} +unsigned short Sensor::getQuantity() const { return _quantity; } -void Sensor::setQuantity(unsigned short pX) -{ - _quantity = pX; -} +void Sensor::setQuantity(unsigned short pX) { _quantity = pX; } -unsigned short Sensor::getPadding() const -{ - return _padding; -} +unsigned short Sensor::getPadding() const { return _padding; } -void Sensor::setPadding(unsigned short pX) -{ - _padding = pX; -} +void Sensor::setPadding(unsigned short pX) { _padding = pX; } -void Sensor::marshal(DataStream& dataStream) const -{ - dataStream << _sensorTypeSource; - dataStream << _sensorOnOffStatus; - dataStream << _sensorType; - dataStream << _station; - dataStream << _quantity; - dataStream << _padding; +void Sensor::marshal(DataStream& dataStream) const { + dataStream << _sensorTypeSource; + dataStream << _sensorOnOffStatus; + dataStream << _sensorType; + dataStream << _station; + dataStream << _quantity; + dataStream << _padding; } -void Sensor::unmarshal(DataStream& dataStream) -{ - dataStream >> _sensorTypeSource; - dataStream >> _sensorOnOffStatus; - dataStream >> _sensorType; - dataStream >> _station; - dataStream >> _quantity; - dataStream >> _padding; +void Sensor::unmarshal(DataStream& dataStream) { + dataStream >> _sensorTypeSource; + dataStream >> _sensorOnOffStatus; + dataStream >> _sensorType; + dataStream >> _station; + dataStream >> _quantity; + dataStream >> _padding; } +bool Sensor::operator==(const Sensor& rhs) const { + bool ivarsEqual = true; -bool Sensor::operator ==(const Sensor& rhs) const - { - bool ivarsEqual = true; + if (!(_sensorTypeSource == rhs._sensorTypeSource)) ivarsEqual = false; + if (!(_sensorOnOffStatus == rhs._sensorOnOffStatus)) ivarsEqual = false; + if (!(_sensorType == rhs._sensorType)) ivarsEqual = false; + if (!(_station == rhs._station)) ivarsEqual = false; + if (!(_quantity == rhs._quantity)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - if( ! (_sensorTypeSource == rhs._sensorTypeSource) ) ivarsEqual = false; - if( ! (_sensorOnOffStatus == rhs._sensorOnOffStatus) ) ivarsEqual = false; - if( ! (_sensorType == rhs._sensorType) ) ivarsEqual = false; - if( ! (_station == rhs._station) ) ivarsEqual = false; - if( ! (_quantity == rhs._quantity) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Sensor::getMarshalledSize() const -{ - int marshalSize = 0; +int Sensor::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _sensorTypeSource - marshalSize = marshalSize + 1; // _sensorOnOffStatus - marshalSize = marshalSize + 2; // _sensorType - marshalSize = marshalSize + 4; // _station - marshalSize = marshalSize + 2; // _quantity - marshalSize = marshalSize + 2; // _padding - return marshalSize; + marshalSize = marshalSize + 1; // _sensorTypeSource + marshalSize = marshalSize + 1; // _sensorOnOffStatus + marshalSize = marshalSize + 2; // _sensorType + marshalSize = marshalSize + 4; // _station + marshalSize = marshalSize + 2; // _quantity + marshalSize = marshalSize + 2; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +98,7 @@ int Sensor::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Sensor.h b/src/dis7/Sensor.h index 309a2647..656b7262 100644 --- a/src/dis7/Sensor.h +++ b/src/dis7/Sensor.h @@ -1,76 +1,76 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // An entity's sensor information. Section 6.2.77. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Sensor -{ -protected: +class OPENDIS7_EXPORT Sensor { + protected: /** the source of the Sensor Type field */ - unsigned char _sensorTypeSource; + unsigned char _sensorTypeSource; /** the on/off status of the sensor */ - unsigned char _sensorOnOffStatus; + unsigned char _sensorOnOffStatus; /** the sensor type and shall be represented by a 16-bit enumeration. */ - unsigned short _sensorType; + unsigned short _sensorType; - /** the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part */ - unsigned int _station; + /** the station to which the sensor is assigned. A zero value shall indi- + * cate that this Sensor record is not associated with any particular station + * and represents the total quan- tity of this sensor for this entity. If this + * field is non-zero, it shall either reference an attached part or an + * articulated part */ + unsigned int _station; /** quantity of the sensor */ - unsigned short _quantity; + unsigned short _quantity; /** padding */ - unsigned short _padding; - + unsigned short _padding; public: - Sensor(); - virtual ~Sensor(); + Sensor(); + virtual ~Sensor(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getSensorTypeSource() const; - void setSensorTypeSource(unsigned char pX); + unsigned char getSensorTypeSource() const; + void setSensorTypeSource(unsigned char pX); - unsigned char getSensorOnOffStatus() const; - void setSensorOnOffStatus(unsigned char pX); + unsigned char getSensorOnOffStatus() const; + void setSensorOnOffStatus(unsigned char pX); - unsigned short getSensorType() const; - void setSensorType(unsigned short pX); + unsigned short getSensorType() const; + void setSensorType(unsigned short pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + unsigned int getStation() const; + void setStation(unsigned int pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + unsigned short getQuantity() const; + void setQuantity(unsigned short pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Sensor& rhs) const; + bool operator==(const Sensor& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +83,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SeparationVP.cpp b/src/dis7/SeparationVP.cpp index db496f38..4539d301 100644 --- a/src/dis7/SeparationVP.cpp +++ b/src/dis7/SeparationVP.cpp @@ -2,154 +2,116 @@ using namespace DIS; +SeparationVP::SeparationVP() + : _recordType(4), + _reasonForSeparation(0), + _preEntityIndicator(0), + _padding1(0), + _parentEntityID(), + _padding2(0), + _stationLocation(0) {} -SeparationVP::SeparationVP(): - _recordType(4), - _reasonForSeparation(0), - _preEntityIndicator(0), - _padding1(0), - _parentEntityID(), - _padding2(0), - _stationLocation(0) -{ -} +SeparationVP::~SeparationVP() {} -SeparationVP::~SeparationVP() -{ -} +unsigned char SeparationVP::getRecordType() const { return _recordType; } -unsigned char SeparationVP::getRecordType() const -{ - return _recordType; -} +void SeparationVP::setRecordType(unsigned char pX) { _recordType = pX; } -void SeparationVP::setRecordType(unsigned char pX) -{ - _recordType = pX; +unsigned char SeparationVP::getReasonForSeparation() const { + return _reasonForSeparation; } -unsigned char SeparationVP::getReasonForSeparation() const -{ - return _reasonForSeparation; +void SeparationVP::setReasonForSeparation(unsigned char pX) { + _reasonForSeparation = pX; } -void SeparationVP::setReasonForSeparation(unsigned char pX) -{ - _reasonForSeparation = pX; +unsigned char SeparationVP::getPreEntityIndicator() const { + return _preEntityIndicator; } -unsigned char SeparationVP::getPreEntityIndicator() const -{ - return _preEntityIndicator; +void SeparationVP::setPreEntityIndicator(unsigned char pX) { + _preEntityIndicator = pX; } -void SeparationVP::setPreEntityIndicator(unsigned char pX) -{ - _preEntityIndicator = pX; -} +unsigned char SeparationVP::getPadding1() const { return _padding1; } -unsigned char SeparationVP::getPadding1() const -{ - return _padding1; -} +void SeparationVP::setPadding1(unsigned char pX) { _padding1 = pX; } -void SeparationVP::setPadding1(unsigned char pX) -{ - _padding1 = pX; -} +EntityID& SeparationVP::getParentEntityID() { return _parentEntityID; } -EntityID& SeparationVP::getParentEntityID() -{ - return _parentEntityID; +const EntityID& SeparationVP::getParentEntityID() const { + return _parentEntityID; } -const EntityID& SeparationVP::getParentEntityID() const -{ - return _parentEntityID; +void SeparationVP::setParentEntityID(const EntityID& pX) { + _parentEntityID = pX; } -void SeparationVP::setParentEntityID(const EntityID &pX) -{ - _parentEntityID = pX; -} +unsigned short SeparationVP::getPadding2() const { return _padding2; } -unsigned short SeparationVP::getPadding2() const -{ - return _padding2; -} +void SeparationVP::setPadding2(unsigned short pX) { _padding2 = pX; } -void SeparationVP::setPadding2(unsigned short pX) -{ - _padding2 = pX; +unsigned int SeparationVP::getStationLocation() const { + return _stationLocation; } -unsigned int SeparationVP::getStationLocation() const -{ - return _stationLocation; +void SeparationVP::setStationLocation(unsigned int pX) { + _stationLocation = pX; } -void SeparationVP::setStationLocation(unsigned int pX) -{ - _stationLocation = pX; +void SeparationVP::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _reasonForSeparation; + dataStream << _preEntityIndicator; + dataStream << _padding1; + _parentEntityID.marshal(dataStream); + dataStream << _padding2; + dataStream << _stationLocation; } -void SeparationVP::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _reasonForSeparation; - dataStream << _preEntityIndicator; - dataStream << _padding1; - _parentEntityID.marshal(dataStream); - dataStream << _padding2; - dataStream << _stationLocation; +void SeparationVP::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _reasonForSeparation; + dataStream >> _preEntityIndicator; + dataStream >> _padding1; + _parentEntityID.unmarshal(dataStream); + dataStream >> _padding2; + dataStream >> _stationLocation; } -void SeparationVP::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _reasonForSeparation; - dataStream >> _preEntityIndicator; - dataStream >> _padding1; - _parentEntityID.unmarshal(dataStream); - dataStream >> _padding2; - dataStream >> _stationLocation; +bool SeparationVP::operator==(const SeparationVP& rhs) const { + bool ivarsEqual = true; + + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_reasonForSeparation == rhs._reasonForSeparation)) ivarsEqual = false; + if (!(_preEntityIndicator == rhs._preEntityIndicator)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_parentEntityID == rhs._parentEntityID)) ivarsEqual = false; + if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + if (!(_stationLocation == rhs._stationLocation)) ivarsEqual = false; + + return ivarsEqual; } +int SeparationVP::getMarshalledSize() const { + int marshalSize = 0; -bool SeparationVP::operator ==(const SeparationVP& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_reasonForSeparation == rhs._reasonForSeparation) ) ivarsEqual = false; - if( ! (_preEntityIndicator == rhs._preEntityIndicator) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_parentEntityID == rhs._parentEntityID) ) ivarsEqual = false; - if( ! (_padding2 == rhs._padding2) ) ivarsEqual = false; - if( ! (_stationLocation == rhs._stationLocation) ) ivarsEqual = false; - - return ivarsEqual; - } - -int SeparationVP::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _recordType - marshalSize = marshalSize + 1; // _reasonForSeparation - marshalSize = marshalSize + 1; // _preEntityIndicator - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + _parentEntityID.getMarshalledSize(); // _parentEntityID - marshalSize = marshalSize + 2; // _padding2 - marshalSize = marshalSize + 4; // _stationLocation - return marshalSize; + marshalSize = marshalSize + 1; // _recordType + marshalSize = marshalSize + 1; // _reasonForSeparation + marshalSize = marshalSize + 1; // _preEntityIndicator + marshalSize = marshalSize + 1; // _padding1 + marshalSize = + marshalSize + _parentEntityID.getMarshalledSize(); // _parentEntityID + marshalSize = marshalSize + 2; // _padding2 + marshalSize = marshalSize + 4; // _stationLocation + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -162,7 +124,7 @@ int SeparationVP::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SeparationVP.h b/src/dis7/SeparationVP.h index 900b35e1..bcfa392b 100644 --- a/src/dis7/SeparationVP.h +++ b/src/dis7/SeparationVP.h @@ -1,84 +1,81 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Physical separation of an entity from another entity. Section 6.2.93.6 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SeparationVP -{ -protected: - /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; +class OPENDIS7_EXPORT SeparationVP { + protected: + /** the identification of the Variable Parameter record. Enumeration from EBV + */ + unsigned char _recordType; /** Reason for separation. EBV */ - unsigned char _reasonForSeparation; + unsigned char _reasonForSeparation; /** Whether the entity existed prior to separation EBV */ - unsigned char _preEntityIndicator; + unsigned char _preEntityIndicator; /** padding */ - unsigned char _padding1; + unsigned char _padding1; /** ID of parent */ - EntityID _parentEntityID; + EntityID _parentEntityID; /** padding */ - unsigned short _padding2; + unsigned short _padding2; /** Station separated from */ - unsigned int _stationLocation; - + unsigned int _stationLocation; public: - SeparationVP(); - virtual ~SeparationVP(); + SeparationVP(); + virtual ~SeparationVP(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + unsigned char getRecordType() const; + void setRecordType(unsigned char pX); - unsigned char getReasonForSeparation() const; - void setReasonForSeparation(unsigned char pX); + unsigned char getReasonForSeparation() const; + void setReasonForSeparation(unsigned char pX); - unsigned char getPreEntityIndicator() const; - void setPreEntityIndicator(unsigned char pX); + unsigned char getPreEntityIndicator() const; + void setPreEntityIndicator(unsigned char pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + unsigned char getPadding1() const; + void setPadding1(unsigned char pX); - EntityID& getParentEntityID(); - const EntityID& getParentEntityID() const; - void setParentEntityID(const EntityID &pX); + EntityID& getParentEntityID(); + const EntityID& getParentEntityID() const; + void setParentEntityID(const EntityID& pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + unsigned short getPadding2() const; + void setPadding2(unsigned short pX); - unsigned int getStationLocation() const; - void setStationLocation(unsigned int pX); + unsigned int getStationLocation() const; + void setStationLocation(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SeparationVP& rhs) const; + bool operator==(const SeparationVP& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -91,7 +88,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ServiceRequestPdu.cpp b/src/dis7/ServiceRequestPdu.cpp index 265a4fc6..92560a4d 100644 --- a/src/dis7/ServiceRequestPdu.cpp +++ b/src/dis7/ServiceRequestPdu.cpp @@ -2,173 +2,149 @@ using namespace DIS; - -ServiceRequestPdu::ServiceRequestPdu() : LogisticsFamilyPdu(), - _requestingEntityID(), - _servicingEntityID(), - _serviceTypeRequested(0), - _numberOfSupplyTypes(0), - _serviceRequestPadding(0) -{ - setPduType( 5 ); +ServiceRequestPdu::ServiceRequestPdu() + : LogisticsFamilyPdu(), + _requestingEntityID(), + _servicingEntityID(), + _serviceTypeRequested(0), + _numberOfSupplyTypes(0), + _serviceRequestPadding(0) { + setPduType(5); } -ServiceRequestPdu::~ServiceRequestPdu() -{ - _supplies.clear(); -} +ServiceRequestPdu::~ServiceRequestPdu() { _supplies.clear(); } -EntityID& ServiceRequestPdu::getRequestingEntityID() -{ - return _requestingEntityID; +EntityID& ServiceRequestPdu::getRequestingEntityID() { + return _requestingEntityID; } -const EntityID& ServiceRequestPdu::getRequestingEntityID() const -{ - return _requestingEntityID; +const EntityID& ServiceRequestPdu::getRequestingEntityID() const { + return _requestingEntityID; } -void ServiceRequestPdu::setRequestingEntityID(const EntityID &pX) -{ - _requestingEntityID = pX; +void ServiceRequestPdu::setRequestingEntityID(const EntityID& pX) { + _requestingEntityID = pX; } -EntityID& ServiceRequestPdu::getServicingEntityID() -{ - return _servicingEntityID; +EntityID& ServiceRequestPdu::getServicingEntityID() { + return _servicingEntityID; } -const EntityID& ServiceRequestPdu::getServicingEntityID() const -{ - return _servicingEntityID; +const EntityID& ServiceRequestPdu::getServicingEntityID() const { + return _servicingEntityID; } -void ServiceRequestPdu::setServicingEntityID(const EntityID &pX) -{ - _servicingEntityID = pX; +void ServiceRequestPdu::setServicingEntityID(const EntityID& pX) { + _servicingEntityID = pX; } -unsigned char ServiceRequestPdu::getServiceTypeRequested() const -{ - return _serviceTypeRequested; +unsigned char ServiceRequestPdu::getServiceTypeRequested() const { + return _serviceTypeRequested; } -void ServiceRequestPdu::setServiceTypeRequested(unsigned char pX) -{ - _serviceTypeRequested = pX; +void ServiceRequestPdu::setServiceTypeRequested(unsigned char pX) { + _serviceTypeRequested = pX; } -unsigned char ServiceRequestPdu::getNumberOfSupplyTypes() const -{ - return _supplies.size(); +unsigned char ServiceRequestPdu::getNumberOfSupplyTypes() const { + return _supplies.size(); } -short ServiceRequestPdu::getServiceRequestPadding() const -{ - return _serviceRequestPadding; +short ServiceRequestPdu::getServiceRequestPadding() const { + return _serviceRequestPadding; } -void ServiceRequestPdu::setServiceRequestPadding(short pX) -{ - _serviceRequestPadding = pX; +void ServiceRequestPdu::setServiceRequestPadding(short pX) { + _serviceRequestPadding = pX; } -std::vector& ServiceRequestPdu::getSupplies() -{ - return _supplies; +std::vector& ServiceRequestPdu::getSupplies() { + return _supplies; } -const std::vector& ServiceRequestPdu::getSupplies() const -{ - return _supplies; +const std::vector& ServiceRequestPdu::getSupplies() const { + return _supplies; } -void ServiceRequestPdu::setSupplies(const std::vector& pX) -{ - _supplies = pX; +void ServiceRequestPdu::setSupplies(const std::vector& pX) { + _supplies = pX; } -void ServiceRequestPdu::marshal(DataStream& dataStream) const -{ - LogisticsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _requestingEntityID.marshal(dataStream); - _servicingEntityID.marshal(dataStream); - dataStream << _serviceTypeRequested; - dataStream << ( unsigned char )_supplies.size(); - dataStream << _serviceRequestPadding; - - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - SupplyQuantity x = _supplies[idx]; - x.marshal(dataStream); - } +void ServiceRequestPdu::marshal(DataStream& dataStream) const { + LogisticsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _requestingEntityID.marshal(dataStream); + _servicingEntityID.marshal(dataStream); + dataStream << _serviceTypeRequested; + dataStream << (unsigned char)_supplies.size(); + dataStream << _serviceRequestPadding; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity x = _supplies[idx]; + x.marshal(dataStream); + } } -void ServiceRequestPdu::unmarshal(DataStream& dataStream) -{ - LogisticsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _requestingEntityID.unmarshal(dataStream); - _servicingEntityID.unmarshal(dataStream); - dataStream >> _serviceTypeRequested; - dataStream >> _numberOfSupplyTypes; - dataStream >> _serviceRequestPadding; +void ServiceRequestPdu::unmarshal(DataStream& dataStream) { + LogisticsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _requestingEntityID.unmarshal(dataStream); + _servicingEntityID.unmarshal(dataStream); + dataStream >> _serviceTypeRequested; + dataStream >> _numberOfSupplyTypes; + dataStream >> _serviceRequestPadding; - _supplies.clear(); - for(size_t idx = 0; idx < _numberOfSupplyTypes; idx++) - { - SupplyQuantity x; - x.unmarshal(dataStream); - _supplies.push_back(x); - } + _supplies.clear(); + for (size_t idx = 0; idx < _numberOfSupplyTypes; idx++) { + SupplyQuantity x; + x.unmarshal(dataStream); + _supplies.push_back(x); + } } +bool ServiceRequestPdu::operator==(const ServiceRequestPdu& rhs) const { + bool ivarsEqual = true; -bool ServiceRequestPdu::operator ==(const ServiceRequestPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = LogisticsFamilyPdu::operator==(rhs); - ivarsEqual = LogisticsFamilyPdu::operator==(rhs); + if (!(_requestingEntityID == rhs._requestingEntityID)) ivarsEqual = false; + if (!(_servicingEntityID == rhs._servicingEntityID)) ivarsEqual = false; + if (!(_serviceTypeRequested == rhs._serviceTypeRequested)) ivarsEqual = false; + if (!(_serviceRequestPadding == rhs._serviceRequestPadding)) + ivarsEqual = false; - if( ! (_requestingEntityID == rhs._requestingEntityID) ) ivarsEqual = false; - if( ! (_servicingEntityID == rhs._servicingEntityID) ) ivarsEqual = false; - if( ! (_serviceTypeRequested == rhs._serviceTypeRequested) ) ivarsEqual = false; - if( ! (_serviceRequestPadding == rhs._serviceRequestPadding) ) ivarsEqual = false; + for (size_t idx = 0; idx < _supplies.size(); idx++) { + if (!(_supplies[idx] == rhs._supplies[idx])) ivarsEqual = false; + } - for(size_t idx = 0; idx < _supplies.size(); idx++) - { - if( ! ( _supplies[idx] == rhs._supplies[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int ServiceRequestPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int ServiceRequestPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = LogisticsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _requestingEntityID.getMarshalledSize(); // _requestingEntityID - marshalSize = marshalSize + _servicingEntityID.getMarshalledSize(); // _servicingEntityID - marshalSize = marshalSize + 1; // _serviceTypeRequested - marshalSize = marshalSize + 1; // _numberOfSupplyTypes - marshalSize = marshalSize + 2; // _serviceRequestPadding + marshalSize = LogisticsFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + + _requestingEntityID.getMarshalledSize(); // _requestingEntityID + marshalSize = marshalSize + + _servicingEntityID.getMarshalledSize(); // _servicingEntityID + marshalSize = marshalSize + 1; // _serviceTypeRequested + marshalSize = marshalSize + 1; // _numberOfSupplyTypes + marshalSize = marshalSize + 2; // _serviceRequestPadding - for(unsigned long long idx=0; idx < _supplies.size(); idx++) - { - SupplyQuantity listElement = _supplies[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + SupplyQuantity listElement = _supplies[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -181,7 +157,7 @@ int ServiceRequestPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/ServiceRequestPdu.h b/src/dis7/ServiceRequestPdu.h index 032ef706..b3147de3 100644 --- a/src/dis7/ServiceRequestPdu.h +++ b/src/dis7/ServiceRequestPdu.h @@ -1,82 +1,79 @@ #pragma once -#include -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Service Request PDU shall be used to communicate information associated with +// one entity requesting a service from another). Section 7.4.2 COMPLETE -namespace DIS -{ -// Service Request PDU shall be used to communicate information associated with one entity requesting a service from another). Section 7.4.2 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { + protected: /** Entity that is requesting service (see 6.2.28), Section 7.4.2 */ - EntityID _requestingEntityID; + EntityID _requestingEntityID; /** Entity that is providing the service (see 6.2.28), Section 7.4.2 */ - EntityID _servicingEntityID; + EntityID _servicingEntityID; /** Type of service requested, Section 7.4.2 */ - unsigned char _serviceTypeRequested; + unsigned char _serviceTypeRequested; /** How many requested, Section 7.4.2 */ - unsigned char _numberOfSupplyTypes; + unsigned char _numberOfSupplyTypes; /** padding */ - short _serviceRequestPadding; - - std::vector _supplies; + short _serviceRequestPadding; + std::vector _supplies; public: - ServiceRequestPdu(); - virtual ~ServiceRequestPdu(); + ServiceRequestPdu(); + virtual ~ServiceRequestPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getRequestingEntityID(); - const EntityID& getRequestingEntityID() const; - void setRequestingEntityID(const EntityID &pX); + EntityID& getRequestingEntityID(); + const EntityID& getRequestingEntityID() const; + void setRequestingEntityID(const EntityID& pX); - EntityID& getServicingEntityID(); - const EntityID& getServicingEntityID() const; - void setServicingEntityID(const EntityID &pX); + EntityID& getServicingEntityID(); + const EntityID& getServicingEntityID() const; + void setServicingEntityID(const EntityID& pX); - unsigned char getServiceTypeRequested() const; - void setServiceTypeRequested(unsigned char pX); + unsigned char getServiceTypeRequested() const; + void setServiceTypeRequested(unsigned char pX); - unsigned char getNumberOfSupplyTypes() const; + unsigned char getNumberOfSupplyTypes() const; - short getServiceRequestPadding() const; - void setServiceRequestPadding(short pX); + short getServiceRequestPadding() const; + void setServiceRequestPadding(short pX); - std::vector& getSupplies(); - const std::vector& getSupplies() const; - void setSupplies(const std::vector& pX); + std::vector& getSupplies(); + const std::vector& getSupplies() const; + void setSupplies(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const ServiceRequestPdu& rhs) const; + bool operator==(const ServiceRequestPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -89,7 +86,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SetDataPdu.cpp b/src/dis7/SetDataPdu.cpp index df804dc7..5b35ed11 100644 --- a/src/dis7/SetDataPdu.cpp +++ b/src/dis7/SetDataPdu.cpp @@ -2,186 +2,146 @@ using namespace DIS; - -SetDataPdu::SetDataPdu() : SimulationManagementFamilyPdu(), - _requestID(0), - _padding1(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 19 ); +SetDataPdu::SetDataPdu() + : SimulationManagementFamilyPdu(), + _requestID(0), + _padding1(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(19); } -SetDataPdu::~SetDataPdu() -{ - _fixedDatums.clear(); - _variableDatums.clear(); +SetDataPdu::~SetDataPdu() { + _fixedDatums.clear(); + _variableDatums.clear(); } -unsigned int SetDataPdu::getRequestID() const -{ - return _requestID; -} +unsigned int SetDataPdu::getRequestID() const { return _requestID; } -void SetDataPdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void SetDataPdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int SetDataPdu::getPadding1() const -{ - return _padding1; -} +unsigned int SetDataPdu::getPadding1() const { return _padding1; } -void SetDataPdu::setPadding1(unsigned int pX) -{ - _padding1 = pX; -} +void SetDataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } -unsigned int SetDataPdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatums.size(); +unsigned int SetDataPdu::getNumberOfFixedDatumRecords() const { + return _fixedDatums.size(); } -unsigned int SetDataPdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatums.size(); +unsigned int SetDataPdu::getNumberOfVariableDatumRecords() const { + return _variableDatums.size(); } -std::vector& SetDataPdu::getFixedDatums() -{ - return _fixedDatums; -} +std::vector& SetDataPdu::getFixedDatums() { return _fixedDatums; } -const std::vector& SetDataPdu::getFixedDatums() const -{ - return _fixedDatums; +const std::vector& SetDataPdu::getFixedDatums() const { + return _fixedDatums; } -void SetDataPdu::setFixedDatums(const std::vector& pX) -{ - _fixedDatums = pX; +void SetDataPdu::setFixedDatums(const std::vector& pX) { + _fixedDatums = pX; } -std::vector& SetDataPdu::getVariableDatums() -{ - return _variableDatums; +std::vector& SetDataPdu::getVariableDatums() { + return _variableDatums; } -const std::vector& SetDataPdu::getVariableDatums() const -{ - return _variableDatums; +const std::vector& SetDataPdu::getVariableDatums() const { + return _variableDatums; } -void SetDataPdu::setVariableDatums(const std::vector& pX) -{ - _variableDatums = pX; +void SetDataPdu::setVariableDatums(const std::vector& pX) { + _variableDatums = pX; } -void SetDataPdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requestID; - dataStream << _padding1; - dataStream << ( unsigned int )_fixedDatums.size(); - dataStream << ( unsigned int )_variableDatums.size(); - - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - FixedDatum x = _fixedDatums[idx]; - x.marshal(dataStream); - } +void SetDataPdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requestID; + dataStream << _padding1; + dataStream << (unsigned int)_fixedDatums.size(); + dataStream << (unsigned int)_variableDatums.size(); + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum x = _fixedDatums[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - VariableDatum x = _variableDatums[idx]; - x.marshal(dataStream); - } - -} - -void SetDataPdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requestID; - dataStream >> _padding1; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; - - _fixedDatums.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatums.push_back(x); - } - - _variableDatums.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum x = _variableDatums[idx]; + x.marshal(dataStream); + } } +void SetDataPdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requestID; + dataStream >> _padding1; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; -bool SetDataPdu::operator ==(const SetDataPdu& rhs) const - { - bool ivarsEqual = true; + _fixedDatums.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatums.push_back(x); + } - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; + _variableDatums.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } +} - for(size_t idx = 0; idx < _fixedDatums.size(); idx++) - { - if( ! ( _fixedDatums[idx] == rhs._fixedDatums[idx]) ) ivarsEqual = false; - } +bool SetDataPdu::operator==(const SetDataPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - if( ! ( _variableDatums[idx] == rhs._variableDatums[idx]) ) ivarsEqual = false; - } + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { + if (!(_fixedDatums[idx] == rhs._fixedDatums[idx])) ivarsEqual = false; + } - return ivarsEqual; - } + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + if (!(_variableDatums[idx] == rhs._variableDatums[idx])) ivarsEqual = false; + } -int SetDataPdu::getMarshalledSize() const -{ - int marshalSize = 0; + return ivarsEqual; +} - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _padding1 - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords +int SetDataPdu::getMarshalledSize() const { + int marshalSize = 0; - for(unsigned long long idx=0; idx < _fixedDatums.size(); idx++) - { - FixedDatum listElement = _fixedDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _padding1 + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + FixedDatum listElement = _fixedDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - for(unsigned long long idx=0; idx < _variableDatums.size(); idx++) - { - VariableDatum listElement = _variableDatums[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + VariableDatum listElement = _variableDatums[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -194,7 +154,7 @@ int SetDataPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SetDataPdu.h b/src/dis7/SetDataPdu.h index 8854c814..8d27ecef 100644 --- a/src/dis7/SetDataPdu.h +++ b/src/dis7/SetDataPdu.h @@ -1,80 +1,78 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 7.5.10. Change state information with the data contained in this. +// COMPLETE -namespace DIS -{ -// Section 7.5.10. Change state information with the data contained in this. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SetDataPdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT SetDataPdu : public SimulationManagementFamilyPdu { + protected: /** ID of request */ - unsigned int _requestID; + unsigned int _requestID; /** padding */ - unsigned int _padding1; + unsigned int _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** variable length list of fixed datums */ - std::vector _fixedDatums; + std::vector _fixedDatums; /** variable length list of variable length datums */ - std::vector _variableDatums; - + std::vector _variableDatums; public: - SetDataPdu(); - virtual ~SetDataPdu(); + SetDataPdu(); + virtual ~SetDataPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + unsigned int getPadding1() const; + void setPadding1(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatums(); - const std::vector& getFixedDatums() const; - void setFixedDatums(const std::vector& pX); + std::vector& getFixedDatums(); + const std::vector& getFixedDatums() const; + void setFixedDatums(const std::vector& pX); - std::vector& getVariableDatums(); - const std::vector& getVariableDatums() const; - void setVariableDatums(const std::vector& pX); + std::vector& getVariableDatums(); + const std::vector& getVariableDatums() const; + void setVariableDatums(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SetDataPdu& rhs) const; + bool operator==(const SetDataPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +85,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SetDataReliablePdu.cpp b/src/dis7/SetDataReliablePdu.cpp index c691a4cd..8fdc37d3 100644 --- a/src/dis7/SetDataReliablePdu.cpp +++ b/src/dis7/SetDataReliablePdu.cpp @@ -2,216 +2,178 @@ using namespace DIS; - -SetDataReliablePdu::SetDataReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0), - _numberOfFixedDatumRecords(0), - _numberOfVariableDatumRecords(0) -{ - setPduType( 59 ); +SetDataReliablePdu::SetDataReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0), + _numberOfFixedDatumRecords(0), + _numberOfVariableDatumRecords(0) { + setPduType(59); } -SetDataReliablePdu::~SetDataReliablePdu() -{ - _fixedDatumRecords.clear(); - _variableDatumRecords.clear(); +SetDataReliablePdu::~SetDataReliablePdu() { + _fixedDatumRecords.clear(); + _variableDatumRecords.clear(); } -unsigned char SetDataReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char SetDataReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void SetDataReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void SetDataReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short SetDataReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short SetDataReliablePdu::getPad1() const { return _pad1; } -void SetDataReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void SetDataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char SetDataReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char SetDataReliablePdu::getPad2() const { return _pad2; } -void SetDataReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void SetDataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int SetDataReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int SetDataReliablePdu::getRequestID() const { return _requestID; } -void SetDataReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void SetDataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -unsigned int SetDataReliablePdu::getNumberOfFixedDatumRecords() const -{ - return _fixedDatumRecords.size(); +unsigned int SetDataReliablePdu::getNumberOfFixedDatumRecords() const { + return _fixedDatumRecords.size(); } -unsigned int SetDataReliablePdu::getNumberOfVariableDatumRecords() const -{ - return _variableDatumRecords.size(); +unsigned int SetDataReliablePdu::getNumberOfVariableDatumRecords() const { + return _variableDatumRecords.size(); } -std::vector& SetDataReliablePdu::getFixedDatumRecords() -{ - return _fixedDatumRecords; +std::vector& SetDataReliablePdu::getFixedDatumRecords() { + return _fixedDatumRecords; } -const std::vector& SetDataReliablePdu::getFixedDatumRecords() const -{ - return _fixedDatumRecords; +const std::vector& SetDataReliablePdu::getFixedDatumRecords() + const { + return _fixedDatumRecords; } -void SetDataReliablePdu::setFixedDatumRecords(const std::vector& pX) -{ - _fixedDatumRecords = pX; +void SetDataReliablePdu::setFixedDatumRecords( + const std::vector& pX) { + _fixedDatumRecords = pX; } -std::vector& SetDataReliablePdu::getVariableDatumRecords() -{ - return _variableDatumRecords; +std::vector& SetDataReliablePdu::getVariableDatumRecords() { + return _variableDatumRecords; } -const std::vector& SetDataReliablePdu::getVariableDatumRecords() const -{ - return _variableDatumRecords; +const std::vector& SetDataReliablePdu::getVariableDatumRecords() + const { + return _variableDatumRecords; } -void SetDataReliablePdu::setVariableDatumRecords(const std::vector& pX) -{ - _variableDatumRecords = pX; +void SetDataReliablePdu::setVariableDatumRecords( + const std::vector& pX) { + _variableDatumRecords = pX; } -void SetDataReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; - dataStream << ( unsigned int )_fixedDatumRecords.size(); - dataStream << ( unsigned int )_variableDatumRecords.size(); - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum x = _fixedDatumRecords[idx]; - x.marshal(dataStream); - } +void SetDataReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; + dataStream << (unsigned int)_fixedDatumRecords.size(); + dataStream << (unsigned int)_variableDatumRecords.size(); + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum x = _fixedDatumRecords[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum x = _variableDatumRecords[idx]; - x.marshal(dataStream); - } - + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum x = _variableDatumRecords[idx]; + x.marshal(dataStream); + } } -void SetDataReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; - dataStream >> _numberOfFixedDatumRecords; - dataStream >> _numberOfVariableDatumRecords; +void SetDataReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; + dataStream >> _numberOfFixedDatumRecords; + dataStream >> _numberOfVariableDatumRecords; - _fixedDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) - { - FixedDatum x; - x.unmarshal(dataStream); - _fixedDatumRecords.push_back(x); - } + _fixedDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfFixedDatumRecords; idx++) { + FixedDatum x; + x.unmarshal(dataStream); + _fixedDatumRecords.push_back(x); + } - _variableDatumRecords.clear(); - for(size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) - { - VariableDatum x; - x.unmarshal(dataStream); - _variableDatumRecords.push_back(x); - } + _variableDatumRecords.clear(); + for (size_t idx = 0; idx < _numberOfVariableDatumRecords; idx++) { + VariableDatum x; + x.unmarshal(dataStream); + _variableDatumRecords.push_back(x); + } } +bool SetDataReliablePdu::operator==(const SetDataReliablePdu& rhs) const { + bool ivarsEqual = true; -bool SetDataReliablePdu::operator ==(const SetDataReliablePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - for(size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) - { - if( ! ( _fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx]) ) ivarsEqual = false; - } + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - for(size_t idx = 0; idx < _variableDatumRecords.size(); idx++) - { - if( ! ( _variableDatumRecords[idx] == rhs._variableDatumRecords[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { + if (!(_fixedDatumRecords[idx] == rhs._fixedDatumRecords[idx])) + ivarsEqual = false; + } + for (size_t idx = 0; idx < _variableDatumRecords.size(); idx++) { + if (!(_variableDatumRecords[idx] == rhs._variableDatumRecords[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } - -int SetDataReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords - marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords + return ivarsEqual; +} - for(unsigned long long idx=0; idx < _fixedDatumRecords.size(); idx++) - { - FixedDatum listElement = _fixedDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +int SetDataReliablePdu::getMarshalledSize() const { + int marshalSize = 0; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords + marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for(unsigned long long idx=0; idx < _variableDatumRecords.size(); idx++) - { - VariableDatum listElement = _variableDatumRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + FixedDatum listElement = _fixedDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + VariableDatum listElement = _variableDatumRecords[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -224,7 +186,7 @@ int SetDataReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SetDataReliablePdu.h b/src/dis7/SetDataReliablePdu.h index 6ea6b556..23a1b115 100644 --- a/src/dis7/SetDataReliablePdu.h +++ b/src/dis7/SetDataReliablePdu.h @@ -1,92 +1,92 @@ #pragma once -#include -#include #include + +#include #include -#include +#include #include +#include +namespace DIS { +// Section 5.3.12.9: initializing or chaning internal state information, +// reliable. Needs manual intervention to fix padding on variable datums. +// UNFINISHED -namespace DIS -{ -// Section 5.3.12.9: initializing or chaning internal state information, reliable. Needs manual intervention to fix padding on variable datums. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SetDataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT SetDataReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; + unsigned int _requestID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + unsigned int _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + unsigned int _numberOfVariableDatumRecords; /** Fixed datum records */ - std::vector _fixedDatumRecords; + std::vector _fixedDatumRecords; /** Variable datum records */ - std::vector _variableDatumRecords; - + std::vector _variableDatumRecords; public: - SetDataReliablePdu(); - virtual ~SetDataReliablePdu(); + SetDataReliablePdu(); + virtual ~SetDataReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); - unsigned int getNumberOfFixedDatumRecords() const; + unsigned int getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + unsigned int getNumberOfVariableDatumRecords() const; - std::vector& getFixedDatumRecords(); - const std::vector& getFixedDatumRecords() const; - void setFixedDatumRecords(const std::vector& pX); + std::vector& getFixedDatumRecords(); + const std::vector& getFixedDatumRecords() const; + void setFixedDatumRecords(const std::vector& pX); - std::vector& getVariableDatumRecords(); - const std::vector& getVariableDatumRecords() const; - void setVariableDatumRecords(const std::vector& pX); + std::vector& getVariableDatumRecords(); + const std::vector& getVariableDatumRecords() const; + void setVariableDatumRecords(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SetDataReliablePdu& rhs) const; + bool operator==(const SetDataReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -99,7 +99,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationAddress.cpp b/src/dis7/SimulationAddress.cpp index dd4d70f5..9f5911ba 100644 --- a/src/dis7/SimulationAddress.cpp +++ b/src/dis7/SimulationAddress.cpp @@ -2,74 +2,52 @@ using namespace DIS; +SimulationAddress::SimulationAddress() : _site(0), _application(0) {} -SimulationAddress::SimulationAddress(): - _site(0), - _application(0) -{ -} - -SimulationAddress::~SimulationAddress() -{ -} +SimulationAddress::~SimulationAddress() {} -unsigned short SimulationAddress::getSite() const -{ - return _site; -} +unsigned short SimulationAddress::getSite() const { return _site; } -void SimulationAddress::setSite(unsigned short pX) -{ - _site = pX; -} +void SimulationAddress::setSite(unsigned short pX) { _site = pX; } -unsigned short SimulationAddress::getApplication() const -{ - return _application; +unsigned short SimulationAddress::getApplication() const { + return _application; } -void SimulationAddress::setApplication(unsigned short pX) -{ - _application = pX; -} +void SimulationAddress::setApplication(unsigned short pX) { _application = pX; } -void SimulationAddress::marshal(DataStream& dataStream) const -{ - dataStream << _site; - dataStream << _application; +void SimulationAddress::marshal(DataStream& dataStream) const { + dataStream << _site; + dataStream << _application; } -void SimulationAddress::unmarshal(DataStream& dataStream) -{ - dataStream >> _site; - dataStream >> _application; +void SimulationAddress::unmarshal(DataStream& dataStream) { + dataStream >> _site; + dataStream >> _application; } +bool SimulationAddress::operator==(const SimulationAddress& rhs) const { + bool ivarsEqual = true; -bool SimulationAddress::operator ==(const SimulationAddress& rhs) const - { - bool ivarsEqual = true; + if (!(_site == rhs._site)) ivarsEqual = false; + if (!(_application == rhs._application)) ivarsEqual = false; - if( ! (_site == rhs._site) ) ivarsEqual = false; - if( ! (_application == rhs._application) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationAddress::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationAddress::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - return marshalSize; + marshalSize = marshalSize + 2; // _site + marshalSize = marshalSize + 2; // _application + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +60,7 @@ int SimulationAddress::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationAddress.h b/src/dis7/SimulationAddress.h index 516d0205..692dbdcf 100644 --- a/src/dis7/SimulationAddress.h +++ b/src/dis7/SimulationAddress.h @@ -1,52 +1,53 @@ #pragma once -#include #include +#include +namespace DIS { +// A Simulation Address record shall consist of the Site Identification number +// and the Application Identification number. Section 6.2.79 -namespace DIS -{ -// A Simulation Address record shall consist of the Site Identification number and the Application Identification number. Section 6.2.79 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SimulationAddress -{ -protected: - /** A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event. */ - unsigned short _site; - - /** An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data. */ - unsigned short _application; +class OPENDIS7_EXPORT SimulationAddress { + protected: + /** A site is defined as a facility, installation, organizational unit or a + * geographic location that has one or more simulation applications capable of + * participating in a distributed event. */ + unsigned short _site; + /** An application is defined as a software program that is used to generate + * and process distributed simulation data including live, virtual and + * constructive data. */ + unsigned short _application; public: - SimulationAddress(); - virtual ~SimulationAddress(); + SimulationAddress(); + virtual ~SimulationAddress(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + unsigned short getSite() const; + void setSite(unsigned short pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + unsigned short getApplication() const; + void setApplication(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SimulationAddress& rhs) const; + bool operator==(const SimulationAddress& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationIdentifier.cpp b/src/dis7/SimulationIdentifier.cpp index 12c956c6..809c1580 100644 --- a/src/dis7/SimulationIdentifier.cpp +++ b/src/dis7/SimulationIdentifier.cpp @@ -2,79 +2,64 @@ using namespace DIS; +SimulationIdentifier::SimulationIdentifier() + : _simulationAddress(), _referenceNumber(0) {} -SimulationIdentifier::SimulationIdentifier(): - _simulationAddress(), - _referenceNumber(0) -{ -} - -SimulationIdentifier::~SimulationIdentifier() -{ -} +SimulationIdentifier::~SimulationIdentifier() {} -SimulationAddress& SimulationIdentifier::getSimulationAddress() -{ - return _simulationAddress; +SimulationAddress& SimulationIdentifier::getSimulationAddress() { + return _simulationAddress; } -const SimulationAddress& SimulationIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +const SimulationAddress& SimulationIdentifier::getSimulationAddress() const { + return _simulationAddress; } -void SimulationIdentifier::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; +void SimulationIdentifier::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -unsigned short SimulationIdentifier::getReferenceNumber() const -{ - return _referenceNumber; +unsigned short SimulationIdentifier::getReferenceNumber() const { + return _referenceNumber; } -void SimulationIdentifier::setReferenceNumber(unsigned short pX) -{ - _referenceNumber = pX; +void SimulationIdentifier::setReferenceNumber(unsigned short pX) { + _referenceNumber = pX; } -void SimulationIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _referenceNumber; +void SimulationIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _referenceNumber; } -void SimulationIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _referenceNumber; +void SimulationIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _referenceNumber; } +bool SimulationIdentifier::operator==(const SimulationIdentifier& rhs) const { + bool ivarsEqual = true; -bool SimulationIdentifier::operator ==(const SimulationIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_referenceNumber == rhs._referenceNumber)) ivarsEqual = false; - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_referenceNumber == rhs._referenceNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _referenceNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _referenceNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +72,7 @@ int SimulationIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationIdentifier.h b/src/dis7/SimulationIdentifier.h index 3b7b44ff..73f390b1 100644 --- a/src/dis7/SimulationIdentifier.h +++ b/src/dis7/SimulationIdentifier.h @@ -1,54 +1,56 @@ #pragma once #include -#include #include +#include +namespace DIS { +// The unique designation of a simulation when using the 48-bit identifier +// format shall be specified by the Sim- ulation Identifier record. The reason +// that the 48-bit format is required in addition to the 32-bit simulation +// address format that actually identifies a specific simulation is because some +// 48-bit identifier fields in PDUs may contain either an Object Identifier, +// such as an Entity ID, or a Simulation Identifier. Section 6.2.80 -namespace DIS -{ -// The unique designation of a simulation when using the 48-bit identifier format shall be specified by the Sim- ulation Identifier record. The reason that the 48-bit format is required in addition to the 32-bit simulation address format that actually identifies a specific simulation is because some 48-bit identifier fields in PDUs may contain either an Object Identifier, such as an Entity ID, or a Simulation Identifier. Section 6.2.80 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SimulationIdentifier -{ -protected: +class OPENDIS7_EXPORT SimulationIdentifier { + protected: /** Simulation address */ - SimulationAddress _simulationAddress; - - /** This field shall be set to zero as there is no reference number associated with a Simulation Identifier. */ - unsigned short _referenceNumber; + SimulationAddress _simulationAddress; + /** This field shall be set to zero as there is no reference number associated + * with a Simulation Identifier. */ + unsigned short _referenceNumber; public: - SimulationIdentifier(); - virtual ~SimulationIdentifier(); + SimulationIdentifier(); + virtual ~SimulationIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + unsigned short getReferenceNumber() const; + void setReferenceNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SimulationIdentifier& rhs) const; + bool operator==(const SimulationIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationManagementFamilyPdu.cpp b/src/dis7/SimulationManagementFamilyPdu.cpp index ab41debd..3f8c0657 100644 --- a/src/dis7/SimulationManagementFamilyPdu.cpp +++ b/src/dis7/SimulationManagementFamilyPdu.cpp @@ -2,90 +2,78 @@ using namespace DIS; - -SimulationManagementFamilyPdu::SimulationManagementFamilyPdu() : Pdu(), - _originatingEntityID(), - _receivingEntityID() -{ - setProtocolFamily( 5 ); +SimulationManagementFamilyPdu::SimulationManagementFamilyPdu() + : Pdu(), _originatingEntityID(), _receivingEntityID() { + setProtocolFamily(5); } -SimulationManagementFamilyPdu::~SimulationManagementFamilyPdu() -{ -} +SimulationManagementFamilyPdu::~SimulationManagementFamilyPdu() {} -EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() -{ - return _originatingEntityID; +EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() { + return _originatingEntityID; } -const EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() const -{ - return _originatingEntityID; +const EntityID& SimulationManagementFamilyPdu::getOriginatingEntityID() const { + return _originatingEntityID; } -void SimulationManagementFamilyPdu::setOriginatingEntityID(const EntityID &pX) -{ - _originatingEntityID = pX; +void SimulationManagementFamilyPdu::setOriginatingEntityID(const EntityID& pX) { + _originatingEntityID = pX; } -EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& SimulationManagementFamilyPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void SimulationManagementFamilyPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void SimulationManagementFamilyPdu::setReceivingEntityID(const EntityID& pX) { + _receivingEntityID = pX; } -void SimulationManagementFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _originatingEntityID.marshal(dataStream); - _receivingEntityID.marshal(dataStream); +void SimulationManagementFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _originatingEntityID.marshal(dataStream); + _receivingEntityID.marshal(dataStream); } -void SimulationManagementFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingEntityID.unmarshal(dataStream); - _receivingEntityID.unmarshal(dataStream); +void SimulationManagementFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _originatingEntityID.unmarshal(dataStream); + _receivingEntityID.unmarshal(dataStream); } +bool SimulationManagementFamilyPdu::operator==( + const SimulationManagementFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool SimulationManagementFamilyPdu::operator ==(const SimulationManagementFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); + if (!(_originatingEntityID == rhs._originatingEntityID)) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; - if( ! (_originatingEntityID == rhs._originatingEntityID) ) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationManagementFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationManagementFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingEntityID.getMarshalledSize(); // _originatingEntityID - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = + marshalSize + + _originatingEntityID.getMarshalledSize(); // _originatingEntityID + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +86,7 @@ int SimulationManagementFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationManagementFamilyPdu.h b/src/dis7/SimulationManagementFamilyPdu.h index 7bc913e5..ec5d097b 100644 --- a/src/dis7/SimulationManagementFamilyPdu.h +++ b/src/dis7/SimulationManagementFamilyPdu.h @@ -1,57 +1,53 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// Section 7.5 Abstract superclass for PDUs relating to the simulation itself. +// COMPLETE -namespace DIS -{ -// Section 7.5 Abstract superclass for PDUs relating to the simulation itself. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SimulationManagementFamilyPdu : public Pdu -{ -protected: +class OPENDIS7_EXPORT SimulationManagementFamilyPdu : public Pdu { + protected: /** Entity that is sending message */ - EntityID _originatingEntityID; + EntityID _originatingEntityID; /** Entity that is intended to receive message */ - EntityID _receivingEntityID; - + EntityID _receivingEntityID; public: - SimulationManagementFamilyPdu(); - virtual ~SimulationManagementFamilyPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + SimulationManagementFamilyPdu(); + virtual ~SimulationManagementFamilyPdu(); - EntityID& getOriginatingEntityID(); - const EntityID& getOriginatingEntityID() const; - void setOriginatingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getOriginatingEntityID(); + const EntityID& getOriginatingEntityID() const; + void setOriginatingEntityID(const EntityID& pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const SimulationManagementFamilyPdu& rhs) const; + bool operator==(const SimulationManagementFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationManagementPduHeader.cpp b/src/dis7/SimulationManagementPduHeader.cpp index 623e8527..42fd8a5f 100644 --- a/src/dis7/SimulationManagementPduHeader.cpp +++ b/src/dis7/SimulationManagementPduHeader.cpp @@ -2,104 +2,81 @@ using namespace DIS; +SimulationManagementPduHeader::SimulationManagementPduHeader() + : _pduHeader(), _originatingID(), _recevingID() {} -SimulationManagementPduHeader::SimulationManagementPduHeader(): - _pduHeader(), - _originatingID(), - _recevingID() -{ -} +SimulationManagementPduHeader::~SimulationManagementPduHeader() {} -SimulationManagementPduHeader::~SimulationManagementPduHeader() -{ -} +PduHeader& SimulationManagementPduHeader::getPduHeader() { return _pduHeader; } -PduHeader& SimulationManagementPduHeader::getPduHeader() -{ - return _pduHeader; +const PduHeader& SimulationManagementPduHeader::getPduHeader() const { + return _pduHeader; } -const PduHeader& SimulationManagementPduHeader::getPduHeader() const -{ - return _pduHeader; +void SimulationManagementPduHeader::setPduHeader(const PduHeader& pX) { + _pduHeader = pX; } -void SimulationManagementPduHeader::setPduHeader(const PduHeader &pX) -{ - _pduHeader = pX; +EntityID& SimulationManagementPduHeader::getOriginatingID() { + return _originatingID; } -EntityID& SimulationManagementPduHeader::getOriginatingID() -{ - return _originatingID; +const EntityID& SimulationManagementPduHeader::getOriginatingID() const { + return _originatingID; } -const EntityID& SimulationManagementPduHeader::getOriginatingID() const -{ - return _originatingID; +void SimulationManagementPduHeader::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -void SimulationManagementPduHeader::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; -} +EntityID& SimulationManagementPduHeader::getRecevingID() { return _recevingID; } -EntityID& SimulationManagementPduHeader::getRecevingID() -{ - return _recevingID; +const EntityID& SimulationManagementPduHeader::getRecevingID() const { + return _recevingID; } -const EntityID& SimulationManagementPduHeader::getRecevingID() const -{ - return _recevingID; +void SimulationManagementPduHeader::setRecevingID(const EntityID& pX) { + _recevingID = pX; } -void SimulationManagementPduHeader::setRecevingID(const EntityID &pX) -{ - _recevingID = pX; +void SimulationManagementPduHeader::marshal(DataStream& dataStream) const { + _pduHeader.marshal(dataStream); + _originatingID.marshal(dataStream); + _recevingID.marshal(dataStream); } -void SimulationManagementPduHeader::marshal(DataStream& dataStream) const -{ - _pduHeader.marshal(dataStream); - _originatingID.marshal(dataStream); - _recevingID.marshal(dataStream); +void SimulationManagementPduHeader::unmarshal(DataStream& dataStream) { + _pduHeader.unmarshal(dataStream); + _originatingID.unmarshal(dataStream); + _recevingID.unmarshal(dataStream); } -void SimulationManagementPduHeader::unmarshal(DataStream& dataStream) -{ - _pduHeader.unmarshal(dataStream); - _originatingID.unmarshal(dataStream); - _recevingID.unmarshal(dataStream); -} +bool SimulationManagementPduHeader::operator==( + const SimulationManagementPduHeader& rhs) const { + bool ivarsEqual = true; + if (!(_pduHeader == rhs._pduHeader)) ivarsEqual = false; + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_recevingID == rhs._recevingID)) ivarsEqual = false; -bool SimulationManagementPduHeader::operator ==(const SimulationManagementPduHeader& rhs) const - { - bool ivarsEqual = true; - - if( ! (_pduHeader == rhs._pduHeader) ) ivarsEqual = false; - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_recevingID == rhs._recevingID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationManagementPduHeader::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationManagementPduHeader::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _pduHeader.getMarshalledSize(); // _pduHeader - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _recevingID.getMarshalledSize(); // _recevingID - return marshalSize; + marshalSize = marshalSize + _pduHeader.getMarshalledSize(); // _pduHeader + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _recevingID.getMarshalledSize(); // _recevingID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +89,7 @@ int SimulationManagementPduHeader::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationManagementPduHeader.h b/src/dis7/SimulationManagementPduHeader.h index 010aa468..5051dba6 100644 --- a/src/dis7/SimulationManagementPduHeader.h +++ b/src/dis7/SimulationManagementPduHeader.h @@ -1,64 +1,62 @@ #pragma once -#include -#include #include -#include +#include #include +#include +namespace DIS { +// First part of a simulation management (SIMAN) PDU and SIMAN-Reliability +// (SIMAN-R) PDU. Sectionn 6.2.81 -namespace DIS -{ -// First part of a simulation management (SIMAN) PDU and SIMAN-Reliability (SIMAN-R) PDU. Sectionn 6.2.81 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SimulationManagementPduHeader -{ -protected: +class OPENDIS7_EXPORT SimulationManagementPduHeader { + protected: /** Conventional PDU header */ - PduHeader _pduHeader; - - /** IDs the simulation or entity, etiehr a simulation or an entity. Either 6.2.80 or 6.2.28 */ - EntityID _originatingID; + PduHeader _pduHeader; - /** simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4 */ - EntityID _recevingID; + /** IDs the simulation or entity, etiehr a simulation or an entity. + * Either 6.2.80 or 6.2.28 */ + EntityID _originatingID; + /** simulation, all simulations, a special ID, or an entity. See 5.6.5 + * and 5.12.4 */ + EntityID _recevingID; public: - SimulationManagementPduHeader(); - virtual ~SimulationManagementPduHeader(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + SimulationManagementPduHeader(); + virtual ~SimulationManagementPduHeader(); - PduHeader& getPduHeader(); - const PduHeader& getPduHeader() const; - void setPduHeader(const PduHeader &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + PduHeader& getPduHeader(); + const PduHeader& getPduHeader() const; + void setPduHeader(const PduHeader& pX); - EntityID& getRecevingID(); - const EntityID& getRecevingID() const; - void setRecevingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); + EntityID& getRecevingID(); + const EntityID& getRecevingID() const; + void setRecevingID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const SimulationManagementPduHeader& rhs) const; + bool operator==(const SimulationManagementPduHeader& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +69,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp index d1dc95f1..4e9ba79b 100644 --- a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp +++ b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp @@ -2,90 +2,87 @@ using namespace DIS; - -SimulationManagementWithReliabilityFamilyPdu::SimulationManagementWithReliabilityFamilyPdu() : Pdu(), - _originatingEntityID(), - _receivingEntityID() -{ - setProtocolFamily( 10 ); +SimulationManagementWithReliabilityFamilyPdu:: + SimulationManagementWithReliabilityFamilyPdu() + : Pdu(), _originatingEntityID(), _receivingEntityID() { + setProtocolFamily(10); } -SimulationManagementWithReliabilityFamilyPdu::~SimulationManagementWithReliabilityFamilyPdu() -{ -} +SimulationManagementWithReliabilityFamilyPdu:: + ~SimulationManagementWithReliabilityFamilyPdu() {} -EntityID& SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() -{ - return _originatingEntityID; +EntityID& +SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() { + return _originatingEntityID; } -const EntityID& SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() const -{ - return _originatingEntityID; +const EntityID& +SimulationManagementWithReliabilityFamilyPdu::getOriginatingEntityID() const { + return _originatingEntityID; } -void SimulationManagementWithReliabilityFamilyPdu::setOriginatingEntityID(const EntityID &pX) -{ - _originatingEntityID = pX; +void SimulationManagementWithReliabilityFamilyPdu::setOriginatingEntityID( + const EntityID& pX) { + _originatingEntityID = pX; } -EntityID& SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() -{ - return _receivingEntityID; +EntityID& SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() { + return _receivingEntityID; } -const EntityID& SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() const -{ - return _receivingEntityID; +const EntityID& +SimulationManagementWithReliabilityFamilyPdu::getReceivingEntityID() const { + return _receivingEntityID; } -void SimulationManagementWithReliabilityFamilyPdu::setReceivingEntityID(const EntityID &pX) -{ - _receivingEntityID = pX; +void SimulationManagementWithReliabilityFamilyPdu::setReceivingEntityID( + const EntityID& pX) { + _receivingEntityID = pX; } -void SimulationManagementWithReliabilityFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _originatingEntityID.marshal(dataStream); - _receivingEntityID.marshal(dataStream); +void SimulationManagementWithReliabilityFamilyPdu::marshal( + DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _originatingEntityID.marshal(dataStream); + _receivingEntityID.marshal(dataStream); } -void SimulationManagementWithReliabilityFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingEntityID.unmarshal(dataStream); - _receivingEntityID.unmarshal(dataStream); +void SimulationManagementWithReliabilityFamilyPdu::unmarshal( + DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _originatingEntityID.unmarshal(dataStream); + _receivingEntityID.unmarshal(dataStream); } +bool SimulationManagementWithReliabilityFamilyPdu::operator==( + const SimulationManagementWithReliabilityFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool SimulationManagementWithReliabilityFamilyPdu::operator ==(const SimulationManagementWithReliabilityFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); + if (!(_originatingEntityID == rhs._originatingEntityID)) ivarsEqual = false; + if (!(_receivingEntityID == rhs._receivingEntityID)) ivarsEqual = false; - if( ! (_originatingEntityID == rhs._originatingEntityID) ) ivarsEqual = false; - if( ! (_receivingEntityID == rhs._receivingEntityID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingEntityID.getMarshalledSize(); // _originatingEntityID - marshalSize = marshalSize + _receivingEntityID.getMarshalledSize(); // _receivingEntityID - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = + marshalSize + + _originatingEntityID.getMarshalledSize(); // _originatingEntityID + marshalSize = marshalSize + + _receivingEntityID.getMarshalledSize(); // _receivingEntityID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +95,7 @@ int SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h index bccdcd93..fe48fbb5 100644 --- a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h +++ b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h @@ -1,57 +1,54 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12: Abstract superclass for reliable simulation management PDUs -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SimulationManagementWithReliabilityFamilyPdu : public Pdu -{ -protected: +class OPENDIS7_EXPORT SimulationManagementWithReliabilityFamilyPdu + : public Pdu { + protected: /** Object originatig the request */ - EntityID _originatingEntityID; + EntityID _originatingEntityID; /** Object with which this point object is associated */ - EntityID _receivingEntityID; - + EntityID _receivingEntityID; public: - SimulationManagementWithReliabilityFamilyPdu(); - virtual ~SimulationManagementWithReliabilityFamilyPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + SimulationManagementWithReliabilityFamilyPdu(); + virtual ~SimulationManagementWithReliabilityFamilyPdu(); - EntityID& getOriginatingEntityID(); - const EntityID& getOriginatingEntityID() const; - void setOriginatingEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingEntityID(); - const EntityID& getReceivingEntityID() const; - void setReceivingEntityID(const EntityID &pX); + EntityID& getOriginatingEntityID(); + const EntityID& getOriginatingEntityID() const; + void setOriginatingEntityID(const EntityID& pX); + EntityID& getReceivingEntityID(); + const EntityID& getReceivingEntityID() const; + void setReceivingEntityID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const SimulationManagementWithReliabilityFamilyPdu& rhs) const; + bool operator==( + const SimulationManagementWithReliabilityFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StandardVariableSpecification.cpp b/src/dis7/StandardVariableSpecification.cpp index ed91196b..29f6456c 100644 --- a/src/dis7/StandardVariableSpecification.cpp +++ b/src/dis7/StandardVariableSpecification.cpp @@ -2,97 +2,83 @@ using namespace DIS; +StandardVariableSpecification::StandardVariableSpecification() + : _numberOfStandardVariableRecords(0) {} -StandardVariableSpecification::StandardVariableSpecification(): - _numberOfStandardVariableRecords(0) -{ +StandardVariableSpecification::~StandardVariableSpecification() { + _standardVariables.clear(); } -StandardVariableSpecification::~StandardVariableSpecification() -{ - _standardVariables.clear(); +unsigned short +StandardVariableSpecification::getNumberOfStandardVariableRecords() const { + return _standardVariables.size(); } -unsigned short StandardVariableSpecification::getNumberOfStandardVariableRecords() const -{ - return _standardVariables.size(); +std::vector& +StandardVariableSpecification::getStandardVariables() { + return _standardVariables; } -std::vector& StandardVariableSpecification::getStandardVariables() -{ - return _standardVariables; +const std::vector& +StandardVariableSpecification::getStandardVariables() const { + return _standardVariables; } -const std::vector& StandardVariableSpecification::getStandardVariables() const -{ - return _standardVariables; +void StandardVariableSpecification::setStandardVariables( + const std::vector& pX) { + _standardVariables = pX; } -void StandardVariableSpecification::setStandardVariables(const std::vector& pX) -{ - _standardVariables = pX; -} - -void StandardVariableSpecification::marshal(DataStream& dataStream) const -{ - dataStream << ( unsigned short )_standardVariables.size(); - - for(size_t idx = 0; idx < _standardVariables.size(); idx++) - { - SimulationManagementPduHeader x = _standardVariables[idx]; - x.marshal(dataStream); - } - -} +void StandardVariableSpecification::marshal(DataStream& dataStream) const { + dataStream << (unsigned short)_standardVariables.size(); -void StandardVariableSpecification::unmarshal(DataStream& dataStream) -{ - dataStream >> _numberOfStandardVariableRecords; - - _standardVariables.clear(); - for(size_t idx = 0; idx < _numberOfStandardVariableRecords; idx++) - { - SimulationManagementPduHeader x; - x.unmarshal(dataStream); - _standardVariables.push_back(x); - } + for (size_t idx = 0; idx < _standardVariables.size(); idx++) { + SimulationManagementPduHeader x = _standardVariables[idx]; + x.marshal(dataStream); + } } +void StandardVariableSpecification::unmarshal(DataStream& dataStream) { + dataStream >> _numberOfStandardVariableRecords; -bool StandardVariableSpecification::operator ==(const StandardVariableSpecification& rhs) const - { - bool ivarsEqual = true; - + _standardVariables.clear(); + for (size_t idx = 0; idx < _numberOfStandardVariableRecords; idx++) { + SimulationManagementPduHeader x; + x.unmarshal(dataStream); + _standardVariables.push_back(x); + } +} - for(size_t idx = 0; idx < _standardVariables.size(); idx++) - { - if( ! ( _standardVariables[idx] == rhs._standardVariables[idx]) ) ivarsEqual = false; - } +bool StandardVariableSpecification::operator==( + const StandardVariableSpecification& rhs) const { + bool ivarsEqual = true; + for (size_t idx = 0; idx < _standardVariables.size(); idx++) { + if (!(_standardVariables[idx] == rhs._standardVariables[idx])) + ivarsEqual = false; + } - return ivarsEqual; - } + return ivarsEqual; +} -int StandardVariableSpecification::getMarshalledSize() const -{ - int marshalSize = 0; +int StandardVariableSpecification::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _numberOfStandardVariableRecords + marshalSize = marshalSize + 2; // _numberOfStandardVariableRecords - for(unsigned long long idx=0; idx < _standardVariables.size(); idx++) - { - SimulationManagementPduHeader listElement = _standardVariables[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + for (unsigned long long idx = 0; idx < _standardVariables.size(); idx++) { + SimulationManagementPduHeader listElement = _standardVariables[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } - return marshalSize; + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -105,7 +91,7 @@ int StandardVariableSpecification::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StandardVariableSpecification.h b/src/dis7/StandardVariableSpecification.h index f6a898f2..85f62e4b 100644 --- a/src/dis7/StandardVariableSpecification.h +++ b/src/dis7/StandardVariableSpecification.h @@ -1,54 +1,56 @@ #pragma once -#include #include -#include -#include +#include +#include +#include -namespace DIS -{ -// Does not work, and causes failure in anything it is embedded in. Section 6.2.82 +namespace DIS { +// Does not work, and causes failure in anything it is embedded in. +// Section 6.2.82 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT StandardVariableSpecification -{ -protected: +class OPENDIS7_EXPORT StandardVariableSpecification { + protected: /** Number of static variable records */ - unsigned short _numberOfStandardVariableRecords; - - /** variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded. */ - std::vector _standardVariables; + unsigned short _numberOfStandardVariableRecords; + /** variable length list of standard variables, The class type and length here + * are WRONG and will cause the incorrect serialization of any class in whihc + * it is embedded. */ + std::vector _standardVariables; public: - StandardVariableSpecification(); - virtual ~StandardVariableSpecification(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + StandardVariableSpecification(); + virtual ~StandardVariableSpecification(); - unsigned short getNumberOfStandardVariableRecords() const; + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - std::vector& getStandardVariables(); - const std::vector& getStandardVariables() const; - void setStandardVariables(const std::vector& pX); + unsigned short getNumberOfStandardVariableRecords() const; + std::vector& getStandardVariables(); + const std::vector& getStandardVariables() + const; + void setStandardVariables( + const std::vector& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const StandardVariableSpecification& rhs) const; + bool operator==(const StandardVariableSpecification& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +63,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StartResumePdu.cpp b/src/dis7/StartResumePdu.cpp index a02fb954..7d7433af 100644 --- a/src/dis7/StartResumePdu.cpp +++ b/src/dis7/StartResumePdu.cpp @@ -2,145 +2,112 @@ using namespace DIS; - -StartResumePdu::StartResumePdu() : SimulationManagementFamilyPdu(), - _originatingID(), - _receivingID(), - _realWorldTime(), - _simulationTime(), - _requestID(0) -{ - setPduType( 13 ); +StartResumePdu::StartResumePdu() + : SimulationManagementFamilyPdu(), + _originatingID(), + _receivingID(), + _realWorldTime(), + _simulationTime(), + _requestID(0) { + setPduType(13); } -StartResumePdu::~StartResumePdu() -{ -} +StartResumePdu::~StartResumePdu() {} -EntityID& StartResumePdu::getOriginatingID() -{ - return _originatingID; -} +EntityID& StartResumePdu::getOriginatingID() { return _originatingID; } -const EntityID& StartResumePdu::getOriginatingID() const -{ - return _originatingID; +const EntityID& StartResumePdu::getOriginatingID() const { + return _originatingID; } -void StartResumePdu::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; +void StartResumePdu::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -EntityID& StartResumePdu::getReceivingID() -{ - return _receivingID; -} +EntityID& StartResumePdu::getReceivingID() { return _receivingID; } -const EntityID& StartResumePdu::getReceivingID() const -{ - return _receivingID; -} +const EntityID& StartResumePdu::getReceivingID() const { return _receivingID; } -void StartResumePdu::setReceivingID(const EntityID &pX) -{ - _receivingID = pX; -} +void StartResumePdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -ClockTime& StartResumePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StartResumePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StartResumePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StartResumePdu::getRealWorldTime() const { + return _realWorldTime; } -void StartResumePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StartResumePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -ClockTime& StartResumePdu::getSimulationTime() -{ - return _simulationTime; -} +ClockTime& StartResumePdu::getSimulationTime() { return _simulationTime; } -const ClockTime& StartResumePdu::getSimulationTime() const -{ - return _simulationTime; +const ClockTime& StartResumePdu::getSimulationTime() const { + return _simulationTime; } -void StartResumePdu::setSimulationTime(const ClockTime &pX) -{ - _simulationTime = pX; +void StartResumePdu::setSimulationTime(const ClockTime& pX) { + _simulationTime = pX; } -unsigned int StartResumePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StartResumePdu::getRequestID() const { return _requestID; } -void StartResumePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void StartResumePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void StartResumePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingID.marshal(dataStream); - _receivingID.marshal(dataStream); - _realWorldTime.marshal(dataStream); - _simulationTime.marshal(dataStream); - dataStream << _requestID; +void StartResumePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingID.marshal(dataStream); + _receivingID.marshal(dataStream); + _realWorldTime.marshal(dataStream); + _simulationTime.marshal(dataStream); + dataStream << _requestID; } -void StartResumePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - _realWorldTime.unmarshal(dataStream); - _simulationTime.unmarshal(dataStream); - dataStream >> _requestID; +void StartResumePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + _realWorldTime.unmarshal(dataStream); + _simulationTime.unmarshal(dataStream); + dataStream >> _requestID; } +bool StartResumePdu::operator==(const StartResumePdu& rhs) const { + bool ivarsEqual = true; -bool StartResumePdu::operator ==(const StartResumePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_simulationTime == rhs._simulationTime) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_simulationTime == rhs._simulationTime)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int StartResumePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int StartResumePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = + marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -153,7 +120,7 @@ int StartResumePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StartResumePdu.h b/src/dis7/StartResumePdu.h index 0fc7d949..b4ecd490 100644 --- a/src/dis7/StartResumePdu.h +++ b/src/dis7/StartResumePdu.h @@ -1,79 +1,81 @@ #pragma once -#include -#include -#include #include +#include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 7.5.4. Start or resume an exercise. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT StartResumePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT StartResumePdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for originating entity(or simulation) */ - EntityID _originatingID; + EntityID _originatingID; /** Identifier for the receiving entity(or simulation) */ - EntityID _receivingID; - - /** This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16). */ - ClockTime _realWorldTime; - - /** The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16) */ - ClockTime _simulationTime; + EntityID _receivingID; + + /** This field shall specify the real-world time (UTC) at which the entity is + * to start/resume in the exercise. This information shall be used by the + * participating simulation applications to start/resume an exercise + * synchronously. This field shall be represented by a Clock Time record + * (see 6.2.16). */ + ClockTime _realWorldTime; + + /** The reference time within a simulation exercise. This time is established + * ahead of time by simulation management and is common to all participants in + * a particular exercise. Simulation time may be either Absolute Time or + * Relative Time. This field shall be represented by a Clock Time record + * (see 6.2.16) */ + ClockTime _simulationTime; /** Identifier for the specific and unique start/resume request */ - unsigned int _requestID; - + unsigned int _requestID; public: - StartResumePdu(); - virtual ~StartResumePdu(); + StartResumePdu(); + virtual ~StartResumePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); - EntityID& getReceivingID(); - const EntityID& getReceivingID() const; - void setReceivingID(const EntityID &pX); + EntityID& getReceivingID(); + const EntityID& getReceivingID() const; + void setReceivingID(const EntityID& pX); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - ClockTime& getSimulationTime(); - const ClockTime& getSimulationTime() const; - void setSimulationTime(const ClockTime &pX); + ClockTime& getSimulationTime(); + const ClockTime& getSimulationTime() const; + void setSimulationTime(const ClockTime& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const StartResumePdu& rhs) const; + bool operator==(const StartResumePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -86,7 +88,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StartResumeReliablePdu.cpp b/src/dis7/StartResumeReliablePdu.cpp index b9f1d0fb..c37802f0 100644 --- a/src/dis7/StartResumeReliablePdu.cpp +++ b/src/dis7/StartResumeReliablePdu.cpp @@ -2,150 +2,121 @@ using namespace DIS; - -StartResumeReliablePdu::StartResumeReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _realWorldTime(), - _simulationTime(), - _requiredReliabilityService(0), - _pad1(0), - _pad2(0), - _requestID(0) -{ - setPduType( 53 ); +StartResumeReliablePdu::StartResumeReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _realWorldTime(), + _simulationTime(), + _requiredReliabilityService(0), + _pad1(0), + _pad2(0), + _requestID(0) { + setPduType(53); } -StartResumeReliablePdu::~StartResumeReliablePdu() -{ -} +StartResumeReliablePdu::~StartResumeReliablePdu() {} -ClockTime& StartResumeReliablePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StartResumeReliablePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StartResumeReliablePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StartResumeReliablePdu::getRealWorldTime() const { + return _realWorldTime; } -void StartResumeReliablePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StartResumeReliablePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -ClockTime& StartResumeReliablePdu::getSimulationTime() -{ - return _simulationTime; +ClockTime& StartResumeReliablePdu::getSimulationTime() { + return _simulationTime; } -const ClockTime& StartResumeReliablePdu::getSimulationTime() const -{ - return _simulationTime; +const ClockTime& StartResumeReliablePdu::getSimulationTime() const { + return _simulationTime; } -void StartResumeReliablePdu::setSimulationTime(const ClockTime &pX) -{ - _simulationTime = pX; +void StartResumeReliablePdu::setSimulationTime(const ClockTime& pX) { + _simulationTime = pX; } -unsigned char StartResumeReliablePdu::getRequiredReliabilityService() const -{ - return _requiredReliabilityService; +unsigned char StartResumeReliablePdu::getRequiredReliabilityService() const { + return _requiredReliabilityService; } -void StartResumeReliablePdu::setRequiredReliabilityService(unsigned char pX) -{ - _requiredReliabilityService = pX; +void StartResumeReliablePdu::setRequiredReliabilityService(unsigned char pX) { + _requiredReliabilityService = pX; } -unsigned short StartResumeReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned short StartResumeReliablePdu::getPad1() const { return _pad1; } -void StartResumeReliablePdu::setPad1(unsigned short pX) -{ - _pad1 = pX; -} +void StartResumeReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } -unsigned char StartResumeReliablePdu::getPad2() const -{ - return _pad2; -} +unsigned char StartResumeReliablePdu::getPad2() const { return _pad2; } -void StartResumeReliablePdu::setPad2(unsigned char pX) -{ - _pad2 = pX; -} +void StartResumeReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned int StartResumeReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StartResumeReliablePdu::getRequestID() const { return _requestID; } -void StartResumeReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void StartResumeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void StartResumeReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _realWorldTime.marshal(dataStream); - _simulationTime.marshal(dataStream); - dataStream << _requiredReliabilityService; - dataStream << _pad1; - dataStream << _pad2; - dataStream << _requestID; +void StartResumeReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _realWorldTime.marshal(dataStream); + _simulationTime.marshal(dataStream); + dataStream << _requiredReliabilityService; + dataStream << _pad1; + dataStream << _pad2; + dataStream << _requestID; } -void StartResumeReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _realWorldTime.unmarshal(dataStream); - _simulationTime.unmarshal(dataStream); - dataStream >> _requiredReliabilityService; - dataStream >> _pad1; - dataStream >> _pad2; - dataStream >> _requestID; +void StartResumeReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _realWorldTime.unmarshal(dataStream); + _simulationTime.unmarshal(dataStream); + dataStream >> _requiredReliabilityService; + dataStream >> _pad1; + dataStream >> _pad2; + dataStream >> _requestID; } +bool StartResumeReliablePdu::operator==( + const StartResumeReliablePdu& rhs) const { + bool ivarsEqual = true; -bool StartResumeReliablePdu::operator ==(const StartResumeReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_simulationTime == rhs._simulationTime)) ivarsEqual = false; + if (!(_requiredReliabilityService == rhs._requiredReliabilityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_pad2 == rhs._pad2)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_simulationTime == rhs._simulationTime) ) ivarsEqual = false; - if( ! (_requiredReliabilityService == rhs._requiredReliabilityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_pad2 == rhs._pad2) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int StartResumeReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int StartResumeReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime - marshalSize = marshalSize + 1; // _requiredReliabilityService - marshalSize = marshalSize + 2; // _pad1 - marshalSize = marshalSize + 1; // _pad2 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = + marshalSize + _simulationTime.getMarshalledSize(); // _simulationTime + marshalSize = marshalSize + 1; // _requiredReliabilityService + marshalSize = marshalSize + 2; // _pad1 + marshalSize = marshalSize + 1; // _pad2 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -158,7 +129,7 @@ int StartResumeReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StartResumeReliablePdu.h b/src/dis7/StartResumeReliablePdu.h index 7717d011..5e7465da 100644 --- a/src/dis7/StartResumeReliablePdu.h +++ b/src/dis7/StartResumeReliablePdu.h @@ -1,81 +1,77 @@ #pragma once -#include #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.3: Start resume simulation, relaible. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT StartResumeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT StartResumeReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** time in real world for this operation to happen */ - ClockTime _realWorldTime; + ClockTime _realWorldTime; /** time in simulation for the simulation to resume */ - ClockTime _simulationTime; + ClockTime _simulationTime; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + unsigned short _pad1; /** padding */ - unsigned char _pad2; + unsigned char _pad2; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - StartResumeReliablePdu(); - virtual ~StartResumeReliablePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + StartResumeReliablePdu(); + virtual ~StartResumeReliablePdu(); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - ClockTime& getSimulationTime(); - const ClockTime& getSimulationTime() const; - void setSimulationTime(const ClockTime &pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + ClockTime& getSimulationTime(); + const ClockTime& getSimulationTime() const; + void setSimulationTime(const ClockTime& pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + unsigned char getRequiredReliabilityService() const; + void setRequiredReliabilityService(unsigned char pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + unsigned short getPad1() const; + void setPad1(unsigned short pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned char getPad2() const; + void setPad2(unsigned char pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const StartResumeReliablePdu& rhs) const; + bool operator==(const StartResumeReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -88,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StopFreezePdu.cpp b/src/dis7/StopFreezePdu.cpp index 56972215..7b8a9cf6 100644 --- a/src/dis7/StopFreezePdu.cpp +++ b/src/dis7/StopFreezePdu.cpp @@ -2,170 +2,127 @@ using namespace DIS; - -StopFreezePdu::StopFreezePdu() : SimulationManagementFamilyPdu(), - _originatingID(), - _receivingID(), - _realWorldTime(), - _reason(0), - _frozenBehavior(0), - _padding1(0), - _requestID(0) -{ - setPduType( 14 ); +StopFreezePdu::StopFreezePdu() + : SimulationManagementFamilyPdu(), + _originatingID(), + _receivingID(), + _realWorldTime(), + _reason(0), + _frozenBehavior(0), + _padding1(0), + _requestID(0) { + setPduType(14); } -StopFreezePdu::~StopFreezePdu() -{ -} +StopFreezePdu::~StopFreezePdu() {} -EntityID& StopFreezePdu::getOriginatingID() -{ - return _originatingID; -} +EntityID& StopFreezePdu::getOriginatingID() { return _originatingID; } -const EntityID& StopFreezePdu::getOriginatingID() const -{ - return _originatingID; +const EntityID& StopFreezePdu::getOriginatingID() const { + return _originatingID; } -void StopFreezePdu::setOriginatingID(const EntityID &pX) -{ - _originatingID = pX; +void StopFreezePdu::setOriginatingID(const EntityID& pX) { + _originatingID = pX; } -EntityID& StopFreezePdu::getReceivingID() -{ - return _receivingID; -} +EntityID& StopFreezePdu::getReceivingID() { return _receivingID; } -const EntityID& StopFreezePdu::getReceivingID() const -{ - return _receivingID; -} +const EntityID& StopFreezePdu::getReceivingID() const { return _receivingID; } -void StopFreezePdu::setReceivingID(const EntityID &pX) -{ - _receivingID = pX; -} +void StopFreezePdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -ClockTime& StopFreezePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StopFreezePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StopFreezePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StopFreezePdu::getRealWorldTime() const { + return _realWorldTime; } -void StopFreezePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StopFreezePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -unsigned char StopFreezePdu::getReason() const -{ - return _reason; -} +unsigned char StopFreezePdu::getReason() const { return _reason; } -void StopFreezePdu::setReason(unsigned char pX) -{ - _reason = pX; -} +void StopFreezePdu::setReason(unsigned char pX) { _reason = pX; } -unsigned char StopFreezePdu::getFrozenBehavior() const -{ - return _frozenBehavior; +unsigned char StopFreezePdu::getFrozenBehavior() const { + return _frozenBehavior; } -void StopFreezePdu::setFrozenBehavior(unsigned char pX) -{ - _frozenBehavior = pX; +void StopFreezePdu::setFrozenBehavior(unsigned char pX) { + _frozenBehavior = pX; } -short StopFreezePdu::getPadding1() const -{ - return _padding1; -} +short StopFreezePdu::getPadding1() const { return _padding1; } -void StopFreezePdu::setPadding1(short pX) -{ - _padding1 = pX; -} +void StopFreezePdu::setPadding1(short pX) { _padding1 = pX; } -unsigned int StopFreezePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StopFreezePdu::getRequestID() const { return _requestID; } -void StopFreezePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; +void StopFreezePdu::setRequestID(unsigned int pX) { _requestID = pX; } + +void StopFreezePdu::marshal(DataStream& dataStream) const { + SimulationManagementFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _originatingID.marshal(dataStream); + _receivingID.marshal(dataStream); + _realWorldTime.marshal(dataStream); + dataStream << _reason; + dataStream << _frozenBehavior; + dataStream << _padding1; + dataStream << _requestID; } -void StopFreezePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _originatingID.marshal(dataStream); - _receivingID.marshal(dataStream); - _realWorldTime.marshal(dataStream); - dataStream << _reason; - dataStream << _frozenBehavior; - dataStream << _padding1; - dataStream << _requestID; +void StopFreezePdu::unmarshal(DataStream& dataStream) { + SimulationManagementFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _originatingID.unmarshal(dataStream); + _receivingID.unmarshal(dataStream); + _realWorldTime.unmarshal(dataStream); + dataStream >> _reason; + dataStream >> _frozenBehavior; + dataStream >> _padding1; + dataStream >> _requestID; } -void StopFreezePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _originatingID.unmarshal(dataStream); - _receivingID.unmarshal(dataStream); - _realWorldTime.unmarshal(dataStream); - dataStream >> _reason; - dataStream >> _frozenBehavior; - dataStream >> _padding1; - dataStream >> _requestID; +bool StopFreezePdu::operator==(const StopFreezePdu& rhs) const { + bool ivarsEqual = true; + + ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); + + if (!(_originatingID == rhs._originatingID)) ivarsEqual = false; + if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_reason == rhs._reason)) ivarsEqual = false; + if (!(_frozenBehavior == rhs._frozenBehavior)) ivarsEqual = false; + if (!(_padding1 == rhs._padding1)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; + + return ivarsEqual; } +int StopFreezePdu::getMarshalledSize() const { + int marshalSize = 0; -bool StopFreezePdu::operator ==(const StopFreezePdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = SimulationManagementFamilyPdu::operator==(rhs); - - if( ! (_originatingID == rhs._originatingID) ) ivarsEqual = false; - if( ! (_receivingID == rhs._receivingID) ) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_reason == rhs._reason) ) ivarsEqual = false; - if( ! (_frozenBehavior == rhs._frozenBehavior) ) ivarsEqual = false; - if( ! (_padding1 == rhs._padding1) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } - -int StopFreezePdu::getMarshalledSize() const -{ - int marshalSize = 0; - - marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _originatingID.getMarshalledSize(); // _originatingID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + 1; // _reason - marshalSize = marshalSize + 1; // _frozenBehavior - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = SimulationManagementFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _originatingID.getMarshalledSize(); // _originatingID + marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = marshalSize + 1; // _reason + marshalSize = marshalSize + 1; // _frozenBehavior + marshalSize = marshalSize + 2; // _padding1 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -178,7 +135,7 @@ int StopFreezePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StopFreezePdu.h b/src/dis7/StopFreezePdu.h index 9b97c6e0..0d17dd2f 100644 --- a/src/dis7/StopFreezePdu.h +++ b/src/dis7/StopFreezePdu.h @@ -1,89 +1,87 @@ #pragma once -#include -#include #include +#include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 7.5.5. Stop or freeze an enity (or exercise). COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu -{ -protected: +class OPENDIS7_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { + protected: /** Identifier for originating entity(or simulation) */ - EntityID _originatingID; + EntityID _originatingID; /** Identifier for the receiving entity(or simulation) */ - EntityID _receivingID; + EntityID _receivingID; - /** real-world(UTC) time at which the entity shall stop or freeze in the exercise */ - ClockTime _realWorldTime; + /** real-world(UTC) time at which the entity shall stop or freeze in the + * exercise */ + ClockTime _realWorldTime; - /** Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration */ - unsigned char _reason; + /** Reason the simulation was stopped or frozen (see section 7 of + * SISO-REF-010) represented by an 8-bit enumeration */ + unsigned char _reason; - /** Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants */ - unsigned char _frozenBehavior; + /** Internal behavior of the entity(or simulation) and its appearance while + * frozen to the other participants */ + unsigned char _frozenBehavior; /** padding */ - short _padding1; + short _padding1; /** Request ID that is unique */ - unsigned int _requestID; - + unsigned int _requestID; public: - StopFreezePdu(); - virtual ~StopFreezePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + StopFreezePdu(); + virtual ~StopFreezePdu(); - EntityID& getOriginatingID(); - const EntityID& getOriginatingID() const; - void setOriginatingID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getReceivingID(); - const EntityID& getReceivingID() const; - void setReceivingID(const EntityID &pX); + EntityID& getOriginatingID(); + const EntityID& getOriginatingID() const; + void setOriginatingID(const EntityID& pX); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + EntityID& getReceivingID(); + const EntityID& getReceivingID() const; + void setReceivingID(const EntityID& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + unsigned char getReason() const; + void setReason(unsigned char pX); - short getPadding1() const; - void setPadding1(short pX); + unsigned char getFrozenBehavior() const; + void setFrozenBehavior(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + short getPadding1() const; + void setPadding1(short pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const StopFreezePdu& rhs) const; + bool operator==(const StopFreezePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -96,7 +94,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StopFreezeReliablePdu.cpp b/src/dis7/StopFreezeReliablePdu.cpp index dd298eaf..7a3bb8e5 100644 --- a/src/dis7/StopFreezeReliablePdu.cpp +++ b/src/dis7/StopFreezeReliablePdu.cpp @@ -2,145 +2,115 @@ using namespace DIS; - -StopFreezeReliablePdu::StopFreezeReliablePdu() : SimulationManagementWithReliabilityFamilyPdu(), - _realWorldTime(), - _reason(0), - _frozenBehavior(0), - _requiredReliablityService(0), - _pad1(0), - _requestID(0) -{ - setPduType( 54 ); +StopFreezeReliablePdu::StopFreezeReliablePdu() + : SimulationManagementWithReliabilityFamilyPdu(), + _realWorldTime(), + _reason(0), + _frozenBehavior(0), + _requiredReliablityService(0), + _pad1(0), + _requestID(0) { + setPduType(54); } -StopFreezeReliablePdu::~StopFreezeReliablePdu() -{ -} +StopFreezeReliablePdu::~StopFreezeReliablePdu() {} -ClockTime& StopFreezeReliablePdu::getRealWorldTime() -{ - return _realWorldTime; -} +ClockTime& StopFreezeReliablePdu::getRealWorldTime() { return _realWorldTime; } -const ClockTime& StopFreezeReliablePdu::getRealWorldTime() const -{ - return _realWorldTime; +const ClockTime& StopFreezeReliablePdu::getRealWorldTime() const { + return _realWorldTime; } -void StopFreezeReliablePdu::setRealWorldTime(const ClockTime &pX) -{ - _realWorldTime = pX; +void StopFreezeReliablePdu::setRealWorldTime(const ClockTime& pX) { + _realWorldTime = pX; } -unsigned char StopFreezeReliablePdu::getReason() const -{ - return _reason; -} +unsigned char StopFreezeReliablePdu::getReason() const { return _reason; } -void StopFreezeReliablePdu::setReason(unsigned char pX) -{ - _reason = pX; -} +void StopFreezeReliablePdu::setReason(unsigned char pX) { _reason = pX; } -unsigned char StopFreezeReliablePdu::getFrozenBehavior() const -{ - return _frozenBehavior; +unsigned char StopFreezeReliablePdu::getFrozenBehavior() const { + return _frozenBehavior; } -void StopFreezeReliablePdu::setFrozenBehavior(unsigned char pX) -{ - _frozenBehavior = pX; +void StopFreezeReliablePdu::setFrozenBehavior(unsigned char pX) { + _frozenBehavior = pX; } -unsigned char StopFreezeReliablePdu::getRequiredReliablityService() const -{ - return _requiredReliablityService; +unsigned char StopFreezeReliablePdu::getRequiredReliablityService() const { + return _requiredReliablityService; } -void StopFreezeReliablePdu::setRequiredReliablityService(unsigned char pX) -{ - _requiredReliablityService = pX; +void StopFreezeReliablePdu::setRequiredReliablityService(unsigned char pX) { + _requiredReliablityService = pX; } -unsigned char StopFreezeReliablePdu::getPad1() const -{ - return _pad1; -} +unsigned char StopFreezeReliablePdu::getPad1() const { return _pad1; } -void StopFreezeReliablePdu::setPad1(unsigned char pX) -{ - _pad1 = pX; -} +void StopFreezeReliablePdu::setPad1(unsigned char pX) { _pad1 = pX; } -unsigned int StopFreezeReliablePdu::getRequestID() const -{ - return _requestID; -} +unsigned int StopFreezeReliablePdu::getRequestID() const { return _requestID; } -void StopFreezeReliablePdu::setRequestID(unsigned int pX) -{ - _requestID = pX; -} +void StopFreezeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } -void StopFreezeReliablePdu::marshal(DataStream& dataStream) const -{ - SimulationManagementWithReliabilityFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _realWorldTime.marshal(dataStream); - dataStream << _reason; - dataStream << _frozenBehavior; - dataStream << _requiredReliablityService; - dataStream << _pad1; - dataStream << _requestID; +void StopFreezeReliablePdu::marshal(DataStream& dataStream) const { + SimulationManagementWithReliabilityFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _realWorldTime.marshal(dataStream); + dataStream << _reason; + dataStream << _frozenBehavior; + dataStream << _requiredReliablityService; + dataStream << _pad1; + dataStream << _requestID; } -void StopFreezeReliablePdu::unmarshal(DataStream& dataStream) -{ - SimulationManagementWithReliabilityFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _realWorldTime.unmarshal(dataStream); - dataStream >> _reason; - dataStream >> _frozenBehavior; - dataStream >> _requiredReliablityService; - dataStream >> _pad1; - dataStream >> _requestID; +void StopFreezeReliablePdu::unmarshal(DataStream& dataStream) { + SimulationManagementWithReliabilityFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _realWorldTime.unmarshal(dataStream); + dataStream >> _reason; + dataStream >> _frozenBehavior; + dataStream >> _requiredReliablityService; + dataStream >> _pad1; + dataStream >> _requestID; } +bool StopFreezeReliablePdu::operator==(const StopFreezeReliablePdu& rhs) const { + bool ivarsEqual = true; -bool StopFreezeReliablePdu::operator ==(const StopFreezeReliablePdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); - ivarsEqual = SimulationManagementWithReliabilityFamilyPdu::operator==(rhs); + if (!(_realWorldTime == rhs._realWorldTime)) ivarsEqual = false; + if (!(_reason == rhs._reason)) ivarsEqual = false; + if (!(_frozenBehavior == rhs._frozenBehavior)) ivarsEqual = false; + if (!(_requiredReliablityService == rhs._requiredReliablityService)) + ivarsEqual = false; + if (!(_pad1 == rhs._pad1)) ivarsEqual = false; + if (!(_requestID == rhs._requestID)) ivarsEqual = false; - if( ! (_realWorldTime == rhs._realWorldTime) ) ivarsEqual = false; - if( ! (_reason == rhs._reason) ) ivarsEqual = false; - if( ! (_frozenBehavior == rhs._frozenBehavior) ) ivarsEqual = false; - if( ! (_requiredReliablityService == rhs._requiredReliablityService) ) ivarsEqual = false; - if( ! (_pad1 == rhs._pad1) ) ivarsEqual = false; - if( ! (_requestID == rhs._requestID) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int StopFreezeReliablePdu::getMarshalledSize() const -{ - int marshalSize = 0; +int StopFreezeReliablePdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime - marshalSize = marshalSize + 1; // _reason - marshalSize = marshalSize + 1; // _frozenBehavior - marshalSize = marshalSize + 1; // _requiredReliablityService - marshalSize = marshalSize + 1; // _pad1 - marshalSize = marshalSize + 4; // _requestID - return marshalSize; + marshalSize = + SimulationManagementWithReliabilityFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _realWorldTime.getMarshalledSize(); // _realWorldTime + marshalSize = marshalSize + 1; // _reason + marshalSize = marshalSize + 1; // _frozenBehavior + marshalSize = marshalSize + 1; // _requiredReliablityService + marshalSize = marshalSize + 1; // _pad1 + marshalSize = marshalSize + 4; // _requestID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -153,7 +123,7 @@ int StopFreezeReliablePdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StopFreezeReliablePdu.h b/src/dis7/StopFreezeReliablePdu.h index 4905dfbb..99d49823 100644 --- a/src/dis7/StopFreezeReliablePdu.h +++ b/src/dis7/StopFreezeReliablePdu.h @@ -2,78 +2,75 @@ #include #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT StopFreezeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu -{ -protected: +class OPENDIS7_EXPORT StopFreezeReliablePdu + : public SimulationManagementWithReliabilityFamilyPdu { + protected: /** time in real world for this operation to happen */ - ClockTime _realWorldTime; + ClockTime _realWorldTime; /** Reason for stopping/freezing simulation */ - unsigned char _reason; + unsigned char _reason; /** internal behvior of the simulation while frozen */ - unsigned char _frozenBehavior; + unsigned char _frozenBehavior; /** reliablity level */ - unsigned char _requiredReliablityService; + unsigned char _requiredReliablityService; /** padding */ - unsigned char _pad1; + unsigned char _pad1; /** Request ID */ - unsigned int _requestID; - + unsigned int _requestID; public: - StopFreezeReliablePdu(); - virtual ~StopFreezeReliablePdu(); + StopFreezeReliablePdu(); + virtual ~StopFreezeReliablePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - ClockTime& getRealWorldTime(); - const ClockTime& getRealWorldTime() const; - void setRealWorldTime(const ClockTime &pX); + ClockTime& getRealWorldTime(); + const ClockTime& getRealWorldTime() const; + void setRealWorldTime(const ClockTime& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + unsigned char getReason() const; + void setReason(unsigned char pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + unsigned char getFrozenBehavior() const; + void setFrozenBehavior(unsigned char pX); - unsigned char getRequiredReliablityService() const; - void setRequiredReliablityService(unsigned char pX); + unsigned char getRequiredReliablityService() const; + void setRequiredReliablityService(unsigned char pX); - unsigned char getPad1() const; - void setPad1(unsigned char pX); + unsigned char getPad1() const; + void setPad1(unsigned char pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + unsigned int getRequestID() const; + void setRequestID(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const StopFreezeReliablePdu& rhs) const; + bool operator==(const StopFreezeReliablePdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -86,7 +83,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StorageFuel.cpp b/src/dis7/StorageFuel.cpp index 5cf75407..9dbe7cdb 100644 --- a/src/dis7/StorageFuel.cpp +++ b/src/dis7/StorageFuel.cpp @@ -2,119 +2,83 @@ using namespace DIS; +StorageFuel::StorageFuel() + : _fuelQuantity(0), + _fuelMeasurementUnits(0), + _fuelType(0), + _fuelLocation(0), + _padding(0) {} -StorageFuel::StorageFuel(): - _fuelQuantity(0), - _fuelMeasurementUnits(0), - _fuelType(0), - _fuelLocation(0), - _padding(0) -{ -} +StorageFuel::~StorageFuel() {} -StorageFuel::~StorageFuel() -{ -} +unsigned int StorageFuel::getFuelQuantity() const { return _fuelQuantity; } -unsigned int StorageFuel::getFuelQuantity() const -{ - return _fuelQuantity; -} +void StorageFuel::setFuelQuantity(unsigned int pX) { _fuelQuantity = pX; } -void StorageFuel::setFuelQuantity(unsigned int pX) -{ - _fuelQuantity = pX; +unsigned char StorageFuel::getFuelMeasurementUnits() const { + return _fuelMeasurementUnits; } -unsigned char StorageFuel::getFuelMeasurementUnits() const -{ - return _fuelMeasurementUnits; +void StorageFuel::setFuelMeasurementUnits(unsigned char pX) { + _fuelMeasurementUnits = pX; } -void StorageFuel::setFuelMeasurementUnits(unsigned char pX) -{ - _fuelMeasurementUnits = pX; -} +unsigned char StorageFuel::getFuelType() const { return _fuelType; } -unsigned char StorageFuel::getFuelType() const -{ - return _fuelType; -} +void StorageFuel::setFuelType(unsigned char pX) { _fuelType = pX; } -void StorageFuel::setFuelType(unsigned char pX) -{ - _fuelType = pX; -} +unsigned char StorageFuel::getFuelLocation() const { return _fuelLocation; } -unsigned char StorageFuel::getFuelLocation() const -{ - return _fuelLocation; -} +void StorageFuel::setFuelLocation(unsigned char pX) { _fuelLocation = pX; } -void StorageFuel::setFuelLocation(unsigned char pX) -{ - _fuelLocation = pX; -} - -unsigned char StorageFuel::getPadding() const -{ - return _padding; -} +unsigned char StorageFuel::getPadding() const { return _padding; } -void StorageFuel::setPadding(unsigned char pX) -{ - _padding = pX; -} +void StorageFuel::setPadding(unsigned char pX) { _padding = pX; } -void StorageFuel::marshal(DataStream& dataStream) const -{ - dataStream << _fuelQuantity; - dataStream << _fuelMeasurementUnits; - dataStream << _fuelType; - dataStream << _fuelLocation; - dataStream << _padding; +void StorageFuel::marshal(DataStream& dataStream) const { + dataStream << _fuelQuantity; + dataStream << _fuelMeasurementUnits; + dataStream << _fuelType; + dataStream << _fuelLocation; + dataStream << _padding; } -void StorageFuel::unmarshal(DataStream& dataStream) -{ - dataStream >> _fuelQuantity; - dataStream >> _fuelMeasurementUnits; - dataStream >> _fuelType; - dataStream >> _fuelLocation; - dataStream >> _padding; +void StorageFuel::unmarshal(DataStream& dataStream) { + dataStream >> _fuelQuantity; + dataStream >> _fuelMeasurementUnits; + dataStream >> _fuelType; + dataStream >> _fuelLocation; + dataStream >> _padding; } +bool StorageFuel::operator==(const StorageFuel& rhs) const { + bool ivarsEqual = true; -bool StorageFuel::operator ==(const StorageFuel& rhs) const - { - bool ivarsEqual = true; - - if( ! (_fuelQuantity == rhs._fuelQuantity) ) ivarsEqual = false; - if( ! (_fuelMeasurementUnits == rhs._fuelMeasurementUnits) ) ivarsEqual = false; - if( ! (_fuelType == rhs._fuelType) ) ivarsEqual = false; - if( ! (_fuelLocation == rhs._fuelLocation) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; + if (!(_fuelQuantity == rhs._fuelQuantity)) ivarsEqual = false; + if (!(_fuelMeasurementUnits == rhs._fuelMeasurementUnits)) ivarsEqual = false; + if (!(_fuelType == rhs._fuelType)) ivarsEqual = false; + if (!(_fuelLocation == rhs._fuelLocation)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int StorageFuel::getMarshalledSize() const -{ - int marshalSize = 0; +int StorageFuel::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _fuelQuantity - marshalSize = marshalSize + 1; // _fuelMeasurementUnits - marshalSize = marshalSize + 1; // _fuelType - marshalSize = marshalSize + 1; // _fuelLocation - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + 4; // _fuelQuantity + marshalSize = marshalSize + 1; // _fuelMeasurementUnits + marshalSize = marshalSize + 1; // _fuelType + marshalSize = marshalSize + 1; // _fuelLocation + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +91,7 @@ int StorageFuel::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StorageFuel.h b/src/dis7/StorageFuel.h index a530c66f..08418e7c 100644 --- a/src/dis7/StorageFuel.h +++ b/src/dis7/StorageFuel.h @@ -1,70 +1,66 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Information about an entity's engine fuel. Section 6.2.83. -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT StorageFuel -{ -protected: +class OPENDIS7_EXPORT StorageFuel { + protected: /** Fuel quantity, units specified by next field */ - unsigned int _fuelQuantity; + unsigned int _fuelQuantity; /** Units in which the fuel is measured */ - unsigned char _fuelMeasurementUnits; + unsigned char _fuelMeasurementUnits; /** Type of fuel */ - unsigned char _fuelType; + unsigned char _fuelType; /** Location of fuel as related to entity. See section 14 of EBV document */ - unsigned char _fuelLocation; + unsigned char _fuelLocation; /** padding */ - unsigned char _padding; - + unsigned char _padding; public: - StorageFuel(); - virtual ~StorageFuel(); + StorageFuel(); + virtual ~StorageFuel(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getFuelQuantity() const; - void setFuelQuantity(unsigned int pX); + unsigned int getFuelQuantity() const; + void setFuelQuantity(unsigned int pX); - unsigned char getFuelMeasurementUnits() const; - void setFuelMeasurementUnits(unsigned char pX); + unsigned char getFuelMeasurementUnits() const; + void setFuelMeasurementUnits(unsigned char pX); - unsigned char getFuelType() const; - void setFuelType(unsigned char pX); + unsigned char getFuelType() const; + void setFuelType(unsigned char pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + unsigned char getFuelLocation() const; + void setFuelLocation(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const StorageFuel& rhs) const; + bool operator==(const StorageFuel& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +73,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StorageFuelReload.cpp b/src/dis7/StorageFuelReload.cpp index efbe38c2..3bdd101c 100644 --- a/src/dis7/StorageFuelReload.cpp +++ b/src/dis7/StorageFuelReload.cpp @@ -2,164 +2,132 @@ using namespace DIS; +StorageFuelReload::StorageFuelReload() + : _standardQuantity(0), + _maximumQuantity(0), + _standardQuantityReloadTime(0), + _maximumQuantityReloadTime(0), + _fuelMeasurementUnits(0), + _fuelType(0), + _fuelLocation(0), + _padding(0) {} -StorageFuelReload::StorageFuelReload(): - _standardQuantity(0), - _maximumQuantity(0), - _standardQuantityReloadTime(0), - _maximumQuantityReloadTime(0), - _fuelMeasurementUnits(0), - _fuelType(0), - _fuelLocation(0), - _padding(0) -{ -} +StorageFuelReload::~StorageFuelReload() {} -StorageFuelReload::~StorageFuelReload() -{ +unsigned int StorageFuelReload::getStandardQuantity() const { + return _standardQuantity; } -unsigned int StorageFuelReload::getStandardQuantity() const -{ - return _standardQuantity; +void StorageFuelReload::setStandardQuantity(unsigned int pX) { + _standardQuantity = pX; } -void StorageFuelReload::setStandardQuantity(unsigned int pX) -{ - _standardQuantity = pX; +unsigned int StorageFuelReload::getMaximumQuantity() const { + return _maximumQuantity; } -unsigned int StorageFuelReload::getMaximumQuantity() const -{ - return _maximumQuantity; +void StorageFuelReload::setMaximumQuantity(unsigned int pX) { + _maximumQuantity = pX; } -void StorageFuelReload::setMaximumQuantity(unsigned int pX) -{ - _maximumQuantity = pX; +unsigned char StorageFuelReload::getStandardQuantityReloadTime() const { + return _standardQuantityReloadTime; } -unsigned char StorageFuelReload::getStandardQuantityReloadTime() const -{ - return _standardQuantityReloadTime; +void StorageFuelReload::setStandardQuantityReloadTime(unsigned char pX) { + _standardQuantityReloadTime = pX; } -void StorageFuelReload::setStandardQuantityReloadTime(unsigned char pX) -{ - _standardQuantityReloadTime = pX; +unsigned char StorageFuelReload::getMaximumQuantityReloadTime() const { + return _maximumQuantityReloadTime; } -unsigned char StorageFuelReload::getMaximumQuantityReloadTime() const -{ - return _maximumQuantityReloadTime; +void StorageFuelReload::setMaximumQuantityReloadTime(unsigned char pX) { + _maximumQuantityReloadTime = pX; } -void StorageFuelReload::setMaximumQuantityReloadTime(unsigned char pX) -{ - _maximumQuantityReloadTime = pX; +unsigned char StorageFuelReload::getFuelMeasurementUnits() const { + return _fuelMeasurementUnits; } -unsigned char StorageFuelReload::getFuelMeasurementUnits() const -{ - return _fuelMeasurementUnits; +void StorageFuelReload::setFuelMeasurementUnits(unsigned char pX) { + _fuelMeasurementUnits = pX; } -void StorageFuelReload::setFuelMeasurementUnits(unsigned char pX) -{ - _fuelMeasurementUnits = pX; -} +unsigned char StorageFuelReload::getFuelType() const { return _fuelType; } -unsigned char StorageFuelReload::getFuelType() const -{ - return _fuelType; -} +void StorageFuelReload::setFuelType(unsigned char pX) { _fuelType = pX; } -void StorageFuelReload::setFuelType(unsigned char pX) -{ - _fuelType = pX; +unsigned char StorageFuelReload::getFuelLocation() const { + return _fuelLocation; } -unsigned char StorageFuelReload::getFuelLocation() const -{ - return _fuelLocation; +void StorageFuelReload::setFuelLocation(unsigned char pX) { + _fuelLocation = pX; } -void StorageFuelReload::setFuelLocation(unsigned char pX) -{ - _fuelLocation = pX; -} +unsigned char StorageFuelReload::getPadding() const { return _padding; } -unsigned char StorageFuelReload::getPadding() const -{ - return _padding; -} +void StorageFuelReload::setPadding(unsigned char pX) { _padding = pX; } -void StorageFuelReload::setPadding(unsigned char pX) -{ - _padding = pX; +void StorageFuelReload::marshal(DataStream& dataStream) const { + dataStream << _standardQuantity; + dataStream << _maximumQuantity; + dataStream << _standardQuantityReloadTime; + dataStream << _maximumQuantityReloadTime; + dataStream << _fuelMeasurementUnits; + dataStream << _fuelType; + dataStream << _fuelLocation; + dataStream << _padding; } -void StorageFuelReload::marshal(DataStream& dataStream) const -{ - dataStream << _standardQuantity; - dataStream << _maximumQuantity; - dataStream << _standardQuantityReloadTime; - dataStream << _maximumQuantityReloadTime; - dataStream << _fuelMeasurementUnits; - dataStream << _fuelType; - dataStream << _fuelLocation; - dataStream << _padding; -} - -void StorageFuelReload::unmarshal(DataStream& dataStream) -{ - dataStream >> _standardQuantity; - dataStream >> _maximumQuantity; - dataStream >> _standardQuantityReloadTime; - dataStream >> _maximumQuantityReloadTime; - dataStream >> _fuelMeasurementUnits; - dataStream >> _fuelType; - dataStream >> _fuelLocation; - dataStream >> _padding; +void StorageFuelReload::unmarshal(DataStream& dataStream) { + dataStream >> _standardQuantity; + dataStream >> _maximumQuantity; + dataStream >> _standardQuantityReloadTime; + dataStream >> _maximumQuantityReloadTime; + dataStream >> _fuelMeasurementUnits; + dataStream >> _fuelType; + dataStream >> _fuelLocation; + dataStream >> _padding; } +bool StorageFuelReload::operator==(const StorageFuelReload& rhs) const { + bool ivarsEqual = true; -bool StorageFuelReload::operator ==(const StorageFuelReload& rhs) const - { - bool ivarsEqual = true; + if (!(_standardQuantity == rhs._standardQuantity)) ivarsEqual = false; + if (!(_maximumQuantity == rhs._maximumQuantity)) ivarsEqual = false; + if (!(_standardQuantityReloadTime == rhs._standardQuantityReloadTime)) + ivarsEqual = false; + if (!(_maximumQuantityReloadTime == rhs._maximumQuantityReloadTime)) + ivarsEqual = false; + if (!(_fuelMeasurementUnits == rhs._fuelMeasurementUnits)) ivarsEqual = false; + if (!(_fuelType == rhs._fuelType)) ivarsEqual = false; + if (!(_fuelLocation == rhs._fuelLocation)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - if( ! (_standardQuantity == rhs._standardQuantity) ) ivarsEqual = false; - if( ! (_maximumQuantity == rhs._maximumQuantity) ) ivarsEqual = false; - if( ! (_standardQuantityReloadTime == rhs._standardQuantityReloadTime) ) ivarsEqual = false; - if( ! (_maximumQuantityReloadTime == rhs._maximumQuantityReloadTime) ) ivarsEqual = false; - if( ! (_fuelMeasurementUnits == rhs._fuelMeasurementUnits) ) ivarsEqual = false; - if( ! (_fuelType == rhs._fuelType) ) ivarsEqual = false; - if( ! (_fuelLocation == rhs._fuelLocation) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int StorageFuelReload::getMarshalledSize() const -{ - int marshalSize = 0; +int StorageFuelReload::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _standardQuantity - marshalSize = marshalSize + 4; // _maximumQuantity - marshalSize = marshalSize + 1; // _standardQuantityReloadTime - marshalSize = marshalSize + 1; // _maximumQuantityReloadTime - marshalSize = marshalSize + 1; // _fuelMeasurementUnits - marshalSize = marshalSize + 1; // _fuelType - marshalSize = marshalSize + 1; // _fuelLocation - marshalSize = marshalSize + 1; // _padding - return marshalSize; + marshalSize = marshalSize + 4; // _standardQuantity + marshalSize = marshalSize + 4; // _maximumQuantity + marshalSize = marshalSize + 1; // _standardQuantityReloadTime + marshalSize = marshalSize + 1; // _maximumQuantityReloadTime + marshalSize = marshalSize + 1; // _fuelMeasurementUnits + marshalSize = marshalSize + 1; // _fuelType + marshalSize = marshalSize + 1; // _fuelLocation + marshalSize = marshalSize + 1; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -172,7 +140,7 @@ int StorageFuelReload::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/StorageFuelReload.h b/src/dis7/StorageFuelReload.h index 9d96c84b..f7bfe559 100644 --- a/src/dis7/StorageFuelReload.h +++ b/src/dis7/StorageFuelReload.h @@ -1,88 +1,104 @@ #pragma once -#include #include +#include +namespace DIS { +// For each type or location of Storage Fuel, this record shall specify the +// type, location, fuel measure- ment units, reload quantity and maximum +// quantity for storage fuel either for the whole entity or a specific storage +// fuel location (tank). Section 6.2.84. -namespace DIS -{ -// For each type or location of Storage Fuel, this record shall specify the type, location, fuel measure- ment units, reload quantity and maximum quantity for storage fuel either for the whole entity or a specific storage fuel location (tank). Section 6.2.84. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT StorageFuelReload -{ -protected: - /** the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity. */ - unsigned int _standardQuantity; - - /** the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type. */ - unsigned int _maximumQuantity; - - /** the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity. */ - unsigned char _standardQuantityReloadTime; - - /** the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity. */ - unsigned char _maximumQuantityReloadTime; +class OPENDIS7_EXPORT StorageFuelReload { + protected: + /** the standard quantity of this fuel type normally loaded at this + * station/launcher if a station/launcher is specified. If the + * Station/Launcher field is set to zero, then this is the total quantity of + * this fuel type that would be present in a standard reload of all appli- + * cable stations/launchers associated with this entity. */ + unsigned int _standardQuantity; + + /** the maximum quantity of this fuel type that this sta- tion/launcher is + * capable of holding when a station/launcher is specified. This would be the + * value used when a maximum reload was desired to be set for this + * station/launcher. If the Station/launcher field is set to zero, then this + * is the maximum quantity of this fuel type that would be present on this + * entity at all stations/launchers that can accept this fuel type. */ + unsigned int _maximumQuantity; + + /** the seconds normally required to reload the standard quantity of this fuel + * type at this specific station/launcher. When the Station/Launcher field is + * set to zero, this shall be the time it takes to perform a standard quantity + * reload of this fuel type at all applicable stations/launchers for this + * entity. */ + unsigned char _standardQuantityReloadTime; + + /** the seconds normally required to reload the maximum possible quantity of + * this fuel type at this station/launcher. When the Station/Launcher field is + * set to zero, this shall be the time it takes to perform a maximum quantity + * load/reload of this fuel type at all applicable stations/launchers for this + * entity. */ + unsigned char _maximumQuantityReloadTime; /** the fuel measurement units. Enumeration */ - unsigned char _fuelMeasurementUnits; + unsigned char _fuelMeasurementUnits; /** Fuel type. Enumeration */ - unsigned char _fuelType; + unsigned char _fuelType; /** Location of fuel as related to entity. See section 14 of EBV document */ - unsigned char _fuelLocation; + unsigned char _fuelLocation; /** padding */ - unsigned char _padding; - + unsigned char _padding; public: - StorageFuelReload(); - virtual ~StorageFuelReload(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + StorageFuelReload(); + virtual ~StorageFuelReload(); - unsigned int getStandardQuantity() const; - void setStandardQuantity(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getMaximumQuantity() const; - void setMaximumQuantity(unsigned int pX); + unsigned int getStandardQuantity() const; + void setStandardQuantity(unsigned int pX); - unsigned char getStandardQuantityReloadTime() const; - void setStandardQuantityReloadTime(unsigned char pX); + unsigned int getMaximumQuantity() const; + void setMaximumQuantity(unsigned int pX); - unsigned char getMaximumQuantityReloadTime() const; - void setMaximumQuantityReloadTime(unsigned char pX); + unsigned char getStandardQuantityReloadTime() const; + void setStandardQuantityReloadTime(unsigned char pX); - unsigned char getFuelMeasurementUnits() const; - void setFuelMeasurementUnits(unsigned char pX); + unsigned char getMaximumQuantityReloadTime() const; + void setMaximumQuantityReloadTime(unsigned char pX); - unsigned char getFuelType() const; - void setFuelType(unsigned char pX); + unsigned char getFuelMeasurementUnits() const; + void setFuelMeasurementUnits(unsigned char pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + unsigned char getFuelType() const; + void setFuelType(unsigned char pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + unsigned char getFuelLocation() const; + void setFuelLocation(unsigned char pX); + unsigned char getPadding() const; + void setPadding(unsigned char pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const StorageFuelReload& rhs) const; + bool operator==(const StorageFuelReload& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +111,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SupplyQuantity.cpp b/src/dis7/SupplyQuantity.cpp index f39a151d..43a624a8 100644 --- a/src/dis7/SupplyQuantity.cpp +++ b/src/dis7/SupplyQuantity.cpp @@ -2,79 +2,52 @@ using namespace DIS; +SupplyQuantity::SupplyQuantity() : _supplyType(), _quantity(0.0) {} -SupplyQuantity::SupplyQuantity(): - _supplyType(), - _quantity(0.0) -{ -} +SupplyQuantity::~SupplyQuantity() {} -SupplyQuantity::~SupplyQuantity() -{ -} +EntityType& SupplyQuantity::getSupplyType() { return _supplyType; } -EntityType& SupplyQuantity::getSupplyType() -{ - return _supplyType; -} - -const EntityType& SupplyQuantity::getSupplyType() const -{ - return _supplyType; -} +const EntityType& SupplyQuantity::getSupplyType() const { return _supplyType; } -void SupplyQuantity::setSupplyType(const EntityType &pX) -{ - _supplyType = pX; -} +void SupplyQuantity::setSupplyType(const EntityType& pX) { _supplyType = pX; } -float SupplyQuantity::getQuantity() const -{ - return _quantity; -} +float SupplyQuantity::getQuantity() const { return _quantity; } -void SupplyQuantity::setQuantity(float pX) -{ - _quantity = pX; -} +void SupplyQuantity::setQuantity(float pX) { _quantity = pX; } -void SupplyQuantity::marshal(DataStream& dataStream) const -{ - _supplyType.marshal(dataStream); - dataStream << _quantity; +void SupplyQuantity::marshal(DataStream& dataStream) const { + _supplyType.marshal(dataStream); + dataStream << _quantity; } -void SupplyQuantity::unmarshal(DataStream& dataStream) -{ - _supplyType.unmarshal(dataStream); - dataStream >> _quantity; +void SupplyQuantity::unmarshal(DataStream& dataStream) { + _supplyType.unmarshal(dataStream); + dataStream >> _quantity; } +bool SupplyQuantity::operator==(const SupplyQuantity& rhs) const { + bool ivarsEqual = true; -bool SupplyQuantity::operator ==(const SupplyQuantity& rhs) const - { - bool ivarsEqual = true; + if (!(_supplyType == rhs._supplyType)) ivarsEqual = false; + if (!(_quantity == rhs._quantity)) ivarsEqual = false; - if( ! (_supplyType == rhs._supplyType) ) ivarsEqual = false; - if( ! (_quantity == rhs._quantity) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SupplyQuantity::getMarshalledSize() const -{ - int marshalSize = 0; +int SupplyQuantity::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _supplyType.getMarshalledSize(); // _supplyType - marshalSize = marshalSize + 4; // _quantity - return marshalSize; + marshalSize = marshalSize + _supplyType.getMarshalledSize(); // _supplyType + marshalSize = marshalSize + 4; // _quantity + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +60,7 @@ int SupplyQuantity::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SupplyQuantity.h b/src/dis7/SupplyQuantity.h index 01e7fc3c..4bc1f31a 100644 --- a/src/dis7/SupplyQuantity.h +++ b/src/dis7/SupplyQuantity.h @@ -1,54 +1,50 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // A supply, and the amount of that supply. Section 6.2.85 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SupplyQuantity -{ -protected: +class OPENDIS7_EXPORT SupplyQuantity { + protected: /** Type of supply */ - EntityType _supplyType; + EntityType _supplyType; /** the number of units of a supply type. */ - float _quantity; - + float _quantity; public: - SupplyQuantity(); - virtual ~SupplyQuantity(); + SupplyQuantity(); + virtual ~SupplyQuantity(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityType& getSupplyType(); - const EntityType& getSupplyType() const; - void setSupplyType(const EntityType &pX); + EntityType& getSupplyType(); + const EntityType& getSupplyType() const; + void setSupplyType(const EntityType& pX); - float getQuantity() const; - void setQuantity(float pX); + float getQuantity() const; + void setQuantity(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SupplyQuantity& rhs) const; + bool operator==(const SupplyQuantity& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +57,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SyntheticEnvironmentFamilyPdu.cpp b/src/dis7/SyntheticEnvironmentFamilyPdu.cpp index 9fff6ace..2b9c6590 100644 --- a/src/dis7/SyntheticEnvironmentFamilyPdu.cpp +++ b/src/dis7/SyntheticEnvironmentFamilyPdu.cpp @@ -2,51 +2,44 @@ using namespace DIS; - -SyntheticEnvironmentFamilyPdu::SyntheticEnvironmentFamilyPdu() : Pdu() +SyntheticEnvironmentFamilyPdu::SyntheticEnvironmentFamilyPdu() + : Pdu() { - setProtocolFamily( 9 ); + setProtocolFamily(9); } -SyntheticEnvironmentFamilyPdu::~SyntheticEnvironmentFamilyPdu() -{ -} +SyntheticEnvironmentFamilyPdu::~SyntheticEnvironmentFamilyPdu() {} -void SyntheticEnvironmentFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first +void SyntheticEnvironmentFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first } -void SyntheticEnvironmentFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +void SyntheticEnvironmentFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first } +bool SyntheticEnvironmentFamilyPdu::operator==( + const SyntheticEnvironmentFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool SyntheticEnvironmentFamilyPdu::operator ==(const SyntheticEnvironmentFamilyPdu& rhs) const - { - bool ivarsEqual = true; + ivarsEqual = Pdu::operator==(rhs); - ivarsEqual = Pdu::operator==(rhs); - - - return ivarsEqual; - } + return ivarsEqual; +} -int SyntheticEnvironmentFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int SyntheticEnvironmentFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +52,7 @@ int SyntheticEnvironmentFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SyntheticEnvironmentFamilyPdu.h b/src/dis7/SyntheticEnvironmentFamilyPdu.h index 184320a6..5147ddf1 100644 --- a/src/dis7/SyntheticEnvironmentFamilyPdu.h +++ b/src/dis7/SyntheticEnvironmentFamilyPdu.h @@ -1,41 +1,37 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Section 5.3.11: Abstract superclass for synthetic environment PDUs -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SyntheticEnvironmentFamilyPdu : public Pdu -{ -protected: - +class OPENDIS7_EXPORT SyntheticEnvironmentFamilyPdu : public Pdu { + protected: public: - SyntheticEnvironmentFamilyPdu(); - virtual ~SyntheticEnvironmentFamilyPdu(); + SyntheticEnvironmentFamilyPdu(); + virtual ~SyntheticEnvironmentFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SyntheticEnvironmentFamilyPdu& rhs) const; + bool operator==(const SyntheticEnvironmentFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -48,7 +44,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SystemIdentifier.cpp b/src/dis7/SystemIdentifier.cpp index 1291cf93..2a83ed02 100644 --- a/src/dis7/SystemIdentifier.cpp +++ b/src/dis7/SystemIdentifier.cpp @@ -2,104 +2,71 @@ using namespace DIS; +SystemIdentifier::SystemIdentifier() + : _systemType(0), _systemName(0), _systemMode(0), _changeOptions(0) {} -SystemIdentifier::SystemIdentifier(): - _systemType(0), - _systemName(0), - _systemMode(0), - _changeOptions(0) -{ -} +SystemIdentifier::~SystemIdentifier() {} -SystemIdentifier::~SystemIdentifier() -{ -} +unsigned short SystemIdentifier::getSystemType() const { return _systemType; } -unsigned short SystemIdentifier::getSystemType() const -{ - return _systemType; -} +void SystemIdentifier::setSystemType(unsigned short pX) { _systemType = pX; } -void SystemIdentifier::setSystemType(unsigned short pX) -{ - _systemType = pX; -} +unsigned short SystemIdentifier::getSystemName() const { return _systemName; } -unsigned short SystemIdentifier::getSystemName() const -{ - return _systemName; -} +void SystemIdentifier::setSystemName(unsigned short pX) { _systemName = pX; } -void SystemIdentifier::setSystemName(unsigned short pX) -{ - _systemName = pX; -} +unsigned char SystemIdentifier::getSystemMode() const { return _systemMode; } -unsigned char SystemIdentifier::getSystemMode() const -{ - return _systemMode; -} - -void SystemIdentifier::setSystemMode(unsigned char pX) -{ - _systemMode = pX; -} +void SystemIdentifier::setSystemMode(unsigned char pX) { _systemMode = pX; } -unsigned char SystemIdentifier::getChangeOptions() const -{ - return _changeOptions; +unsigned char SystemIdentifier::getChangeOptions() const { + return _changeOptions; } -void SystemIdentifier::setChangeOptions(unsigned char pX) -{ - _changeOptions = pX; +void SystemIdentifier::setChangeOptions(unsigned char pX) { + _changeOptions = pX; } -void SystemIdentifier::marshal(DataStream& dataStream) const -{ - dataStream << _systemType; - dataStream << _systemName; - dataStream << _systemMode; - dataStream << _changeOptions; +void SystemIdentifier::marshal(DataStream& dataStream) const { + dataStream << _systemType; + dataStream << _systemName; + dataStream << _systemMode; + dataStream << _changeOptions; } -void SystemIdentifier::unmarshal(DataStream& dataStream) -{ - dataStream >> _systemType; - dataStream >> _systemName; - dataStream >> _systemMode; - dataStream >> _changeOptions; +void SystemIdentifier::unmarshal(DataStream& dataStream) { + dataStream >> _systemType; + dataStream >> _systemName; + dataStream >> _systemMode; + dataStream >> _changeOptions; } +bool SystemIdentifier::operator==(const SystemIdentifier& rhs) const { + bool ivarsEqual = true; -bool SystemIdentifier::operator ==(const SystemIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_systemType == rhs._systemType)) ivarsEqual = false; + if (!(_systemName == rhs._systemName)) ivarsEqual = false; + if (!(_systemMode == rhs._systemMode)) ivarsEqual = false; + if (!(_changeOptions == rhs._changeOptions)) ivarsEqual = false; - if( ! (_systemType == rhs._systemType) ) ivarsEqual = false; - if( ! (_systemName == rhs._systemName) ) ivarsEqual = false; - if( ! (_systemMode == rhs._systemMode) ) ivarsEqual = false; - if( ! (_changeOptions == rhs._changeOptions) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int SystemIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int SystemIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _systemType - marshalSize = marshalSize + 2; // _systemName - marshalSize = marshalSize + 1; // _systemMode - marshalSize = marshalSize + 1; // _changeOptions - return marshalSize; + marshalSize = marshalSize + 2; // _systemType + marshalSize = marshalSize + 2; // _systemName + marshalSize = marshalSize + 1; // _systemMode + marshalSize = marshalSize + 1; // _changeOptions + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -112,7 +79,7 @@ int SystemIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/SystemIdentifier.h b/src/dis7/SystemIdentifier.h index 613a763f..14824134 100644 --- a/src/dis7/SystemIdentifier.h +++ b/src/dis7/SystemIdentifier.h @@ -1,64 +1,60 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // The ID of the IFF emitting system. NOT COMPLETE. Section 6.2.86 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT SystemIdentifier -{ -protected: +class OPENDIS7_EXPORT SystemIdentifier { + protected: /** general type of emitting system, an enumeration */ - unsigned short _systemType; + unsigned short _systemType; /** named type of system, an enumeration */ - unsigned short _systemName; + unsigned short _systemName; /** mode of operation for the system, an enumeration */ - unsigned char _systemMode; + unsigned char _systemMode; /** status of this PDU, see section 6.2.15 */ unsigned char _changeOptions; - public: - SystemIdentifier(); - virtual ~SystemIdentifier(); + SystemIdentifier(); + virtual ~SystemIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getSystemType() const; - void setSystemType(unsigned short pX); + unsigned short getSystemType() const; + void setSystemType(unsigned short pX); - unsigned short getSystemName() const; - void setSystemName(unsigned short pX); + unsigned short getSystemName() const; + void setSystemName(unsigned short pX); - unsigned char getSystemMode() const; - void setSystemMode(unsigned char pX); + unsigned char getSystemMode() const; + void setSystemMode(unsigned char pX); - unsigned char getChangeOptions() const; - void setChangeOptions(unsigned char pX); + unsigned char getChangeOptions() const; + void setChangeOptions(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const SystemIdentifier& rhs) const; + bool operator==(const SystemIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -71,7 +67,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/TotalRecordSets.cpp b/src/dis7/TotalRecordSets.cpp index 10aef8fa..56445417 100644 --- a/src/dis7/TotalRecordSets.cpp +++ b/src/dis7/TotalRecordSets.cpp @@ -2,74 +2,54 @@ using namespace DIS; +TotalRecordSets::TotalRecordSets() : _totalRecordSets(0), _padding(0) {} -TotalRecordSets::TotalRecordSets(): - _totalRecordSets(0), - _padding(0) -{ -} +TotalRecordSets::~TotalRecordSets() {} -TotalRecordSets::~TotalRecordSets() -{ +unsigned short TotalRecordSets::getTotalRecordSets() const { + return _totalRecordSets; } -unsigned short TotalRecordSets::getTotalRecordSets() const -{ - return _totalRecordSets; +void TotalRecordSets::setTotalRecordSets(unsigned short pX) { + _totalRecordSets = pX; } -void TotalRecordSets::setTotalRecordSets(unsigned short pX) -{ - _totalRecordSets = pX; -} +unsigned short TotalRecordSets::getPadding() const { return _padding; } -unsigned short TotalRecordSets::getPadding() const -{ - return _padding; -} +void TotalRecordSets::setPadding(unsigned short pX) { _padding = pX; } -void TotalRecordSets::setPadding(unsigned short pX) -{ - _padding = pX; +void TotalRecordSets::marshal(DataStream& dataStream) const { + dataStream << _totalRecordSets; + dataStream << _padding; } -void TotalRecordSets::marshal(DataStream& dataStream) const -{ - dataStream << _totalRecordSets; - dataStream << _padding; +void TotalRecordSets::unmarshal(DataStream& dataStream) { + dataStream >> _totalRecordSets; + dataStream >> _padding; } -void TotalRecordSets::unmarshal(DataStream& dataStream) -{ - dataStream >> _totalRecordSets; - dataStream >> _padding; -} +bool TotalRecordSets::operator==(const TotalRecordSets& rhs) const { + bool ivarsEqual = true; + if (!(_totalRecordSets == rhs._totalRecordSets)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; -bool TotalRecordSets::operator ==(const TotalRecordSets& rhs) const - { - bool ivarsEqual = true; - - if( ! (_totalRecordSets == rhs._totalRecordSets) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int TotalRecordSets::getMarshalledSize() const -{ - int marshalSize = 0; +int TotalRecordSets::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _totalRecordSets - marshalSize = marshalSize + 2; // _padding - return marshalSize; + marshalSize = marshalSize + 2; // _totalRecordSets + marshalSize = marshalSize + 2; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +62,7 @@ int TotalRecordSets::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/TotalRecordSets.h b/src/dis7/TotalRecordSets.h index 16994c32..3332912d 100644 --- a/src/dis7/TotalRecordSets.h +++ b/src/dis7/TotalRecordSets.h @@ -1,52 +1,49 @@ #pragma once -#include #include +#include +namespace DIS { +// Total number of record sets contained in a logical set of one or more PDUs. +// Used to transfer ownership, etc Section 6.2.88 -namespace DIS -{ -// Total number of record sets contained in a logical set of one or more PDUs. Used to transfer ownership, etc Section 6.2.88 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT TotalRecordSets -{ -protected: +class OPENDIS7_EXPORT TotalRecordSets { + protected: /** Total number of record sets */ - unsigned short _totalRecordSets; + unsigned short _totalRecordSets; /** padding */ - unsigned short _padding; - + unsigned short _padding; public: - TotalRecordSets(); - virtual ~TotalRecordSets(); + TotalRecordSets(); + virtual ~TotalRecordSets(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getTotalRecordSets() const; - void setTotalRecordSets(unsigned short pX); + unsigned short getTotalRecordSets() const; + void setTotalRecordSets(unsigned short pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + unsigned short getPadding() const; + void setPadding(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const TotalRecordSets& rhs) const; + bool operator==(const TotalRecordSets& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +56,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/TrackJamData.cpp b/src/dis7/TrackJamData.cpp index caf1a708..14c23831 100644 --- a/src/dis7/TrackJamData.cpp +++ b/src/dis7/TrackJamData.cpp @@ -2,94 +2,60 @@ using namespace DIS; +TrackJamData::TrackJamData() : _entityID(), _emitterNumber(0), _beamNumber(0) {} -TrackJamData::TrackJamData(): - _entityID(), - _emitterNumber(0), - _beamNumber(0) -{ -} - -TrackJamData::~TrackJamData() -{ -} +TrackJamData::~TrackJamData() {} -EntityID& TrackJamData::getEntityID() -{ - return _entityID; -} +EntityID& TrackJamData::getEntityID() { return _entityID; } -const EntityID& TrackJamData::getEntityID() const -{ - return _entityID; -} +const EntityID& TrackJamData::getEntityID() const { return _entityID; } -void TrackJamData::setEntityID(const EntityID &pX) -{ - _entityID = pX; -} +void TrackJamData::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned char TrackJamData::getEmitterNumber() const -{ - return _emitterNumber; -} +unsigned char TrackJamData::getEmitterNumber() const { return _emitterNumber; } -void TrackJamData::setEmitterNumber(unsigned char pX) -{ - _emitterNumber = pX; -} +void TrackJamData::setEmitterNumber(unsigned char pX) { _emitterNumber = pX; } -unsigned char TrackJamData::getBeamNumber() const -{ - return _beamNumber; -} +unsigned char TrackJamData::getBeamNumber() const { return _beamNumber; } -void TrackJamData::setBeamNumber(unsigned char pX) -{ - _beamNumber = pX; -} +void TrackJamData::setBeamNumber(unsigned char pX) { _beamNumber = pX; } -void TrackJamData::marshal(DataStream& dataStream) const -{ - _entityID.marshal(dataStream); - dataStream << _emitterNumber; - dataStream << _beamNumber; +void TrackJamData::marshal(DataStream& dataStream) const { + _entityID.marshal(dataStream); + dataStream << _emitterNumber; + dataStream << _beamNumber; } -void TrackJamData::unmarshal(DataStream& dataStream) -{ - _entityID.unmarshal(dataStream); - dataStream >> _emitterNumber; - dataStream >> _beamNumber; +void TrackJamData::unmarshal(DataStream& dataStream) { + _entityID.unmarshal(dataStream); + dataStream >> _emitterNumber; + dataStream >> _beamNumber; } +bool TrackJamData::operator==(const TrackJamData& rhs) const { + bool ivarsEqual = true; -bool TrackJamData::operator ==(const TrackJamData& rhs) const - { - bool ivarsEqual = true; - - if( ! (_entityID == rhs._entityID) ) ivarsEqual = false; - if( ! (_emitterNumber == rhs._emitterNumber) ) ivarsEqual = false; - if( ! (_beamNumber == rhs._beamNumber) ) ivarsEqual = false; + if (!(_entityID == rhs._entityID)) ivarsEqual = false; + if (!(_emitterNumber == rhs._emitterNumber)) ivarsEqual = false; + if (!(_beamNumber == rhs._beamNumber)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int TrackJamData::getMarshalledSize() const -{ - int marshalSize = 0; +int TrackJamData::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID - marshalSize = marshalSize + 1; // _emitterNumber - marshalSize = marshalSize + 1; // _beamNumber - return marshalSize; + marshalSize = marshalSize + _entityID.getMarshalledSize(); // _entityID + marshalSize = marshalSize + 1; // _emitterNumber + marshalSize = marshalSize + 1; // _beamNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -102,7 +68,7 @@ int TrackJamData::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/TrackJamData.h b/src/dis7/TrackJamData.h index e9b07676..03fcd0a2 100644 --- a/src/dis7/TrackJamData.h +++ b/src/dis7/TrackJamData.h @@ -1,60 +1,57 @@ #pragma once #include -#include #include +#include - -namespace DIS -{ +namespace DIS { // Track-Jam data Section 6.2.89 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT TrackJamData -{ -protected: - /** the entity tracked or illumated, or an emitter beam targeted with jamming */ - EntityID _entityID; +class OPENDIS7_EXPORT TrackJamData { + protected: + /** the entity tracked or illumated, or an emitter beam targeted with jamming + */ + EntityID _entityID; /** Emitter system associated with the entity */ - unsigned char _emitterNumber; + unsigned char _emitterNumber; /** Beam associated with the entity */ - unsigned char _beamNumber; - + unsigned char _beamNumber; public: - TrackJamData(); - virtual ~TrackJamData(); + TrackJamData(); + virtual ~TrackJamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEntityID(); - const EntityID& getEntityID() const; - void setEntityID(const EntityID &pX); + EntityID& getEntityID(); + const EntityID& getEntityID() const; + void setEntityID(const EntityID& pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + unsigned char getEmitterNumber() const; + void setEmitterNumber(unsigned char pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + unsigned char getBeamNumber() const; + void setBeamNumber(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const TrackJamData& rhs) const; + bool operator==(const TrackJamData& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +64,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/TwoByteChunk.cpp b/src/dis7/TwoByteChunk.cpp index 67177bb0..c3d829ac 100644 --- a/src/dis7/TwoByteChunk.cpp +++ b/src/dis7/TwoByteChunk.cpp @@ -2,87 +2,63 @@ using namespace DIS; - -TwoByteChunk::TwoByteChunk() -{ - // Initialize fixed length array - for(int lengthotherParameters= 0; lengthotherParameters < 2; lengthotherParameters++) - { - _otherParameters[lengthotherParameters] = 0; - } - +TwoByteChunk::TwoByteChunk() { + // Initialize fixed length array + for (int lengthotherParameters = 0; lengthotherParameters < 2; + lengthotherParameters++) { + _otherParameters[lengthotherParameters] = 0; + } } -TwoByteChunk::~TwoByteChunk() -{ -} +TwoByteChunk::~TwoByteChunk() {} -char* TwoByteChunk::getOtherParameters() -{ - return _otherParameters; -} +char* TwoByteChunk::getOtherParameters() { return _otherParameters; } -const char* TwoByteChunk::getOtherParameters() const -{ - return _otherParameters; +const char* TwoByteChunk::getOtherParameters() const { + return _otherParameters; } -void TwoByteChunk::setOtherParameters(const char* x) -{ - for(int i = 0; i < 2; i++) - { - _otherParameters[i] = x[i]; - } +void TwoByteChunk::setOtherParameters(const char* x) { + for (int i = 0; i < 2; i++) { + _otherParameters[i] = x[i]; + } } -void TwoByteChunk::marshal(DataStream& dataStream) const -{ - - for(size_t idx = 0; idx < 2; idx++) - { - dataStream << _otherParameters[idx]; - } - +void TwoByteChunk::marshal(DataStream& dataStream) const { + for (size_t idx = 0; idx < 2; idx++) { + dataStream << _otherParameters[idx]; + } } -void TwoByteChunk::unmarshal(DataStream& dataStream) -{ - - for(size_t idx = 0; idx < 2; idx++) - { - dataStream >> _otherParameters[idx]; - } - +void TwoByteChunk::unmarshal(DataStream& dataStream) { + for (size_t idx = 0; idx < 2; idx++) { + dataStream >> _otherParameters[idx]; + } } +bool TwoByteChunk::operator==(const TwoByteChunk& rhs) const { + bool ivarsEqual = true; -bool TwoByteChunk::operator ==(const TwoByteChunk& rhs) const - { - bool ivarsEqual = true; - + for (unsigned char idx = 0; idx < 2; idx++) { + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) + ivarsEqual = false; + } - for(unsigned char idx = 0; idx < 2; idx++) - { - if(!(_otherParameters[idx] == rhs._otherParameters[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } + return ivarsEqual; +} -int TwoByteChunk::getMarshalledSize() const -{ - int marshalSize = 0; +int TwoByteChunk::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2 * 1; // _otherParameters - return marshalSize; + marshalSize = marshalSize + 2 * 1; // _otherParameters + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -95,7 +71,7 @@ int TwoByteChunk::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/TwoByteChunk.h b/src/dis7/TwoByteChunk.h index ab339084..ce42a096 100644 --- a/src/dis7/TwoByteChunk.h +++ b/src/dis7/TwoByteChunk.h @@ -1,47 +1,43 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // 16 bit piece of data -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT TwoByteChunk -{ -protected: +class OPENDIS7_EXPORT TwoByteChunk { + protected: /** two bytes of arbitrary data */ - char _otherParameters[2]; - + char _otherParameters[2]; public: - TwoByteChunk(); - virtual ~TwoByteChunk(); + TwoByteChunk(); + virtual ~TwoByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters( const char* pX); + char* getOtherParameters(); + const char* getOtherParameters() const; + void setOtherParameters(const char* pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const TwoByteChunk& rhs) const; + bool operator==(const TwoByteChunk& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -54,7 +50,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UAFundamentalParameter.cpp b/src/dis7/UAFundamentalParameter.cpp index 7fe09a4b..2b9f99a0 100644 --- a/src/dis7/UAFundamentalParameter.cpp +++ b/src/dis7/UAFundamentalParameter.cpp @@ -2,134 +2,119 @@ using namespace DIS; +UAFundamentalParameter::UAFundamentalParameter() + : _activeEmissionParameterIndex(0), + _scanPattern(0), + _beamCenterAzimuthHorizontal(0.0), + _azimuthalBeamwidthHorizontal(0.0), + _beamCenterDepressionElevation(0.0), + _beamwidthDownElevation(0.0) {} -UAFundamentalParameter::UAFundamentalParameter(): - _activeEmissionParameterIndex(0), - _scanPattern(0), - _beamCenterAzimuthHorizontal(0.0), - _azimuthalBeamwidthHorizontal(0.0), - _beamCenterDepressionElevation(0.0), - _beamwidthDownElevation(0.0) -{ -} - -UAFundamentalParameter::~UAFundamentalParameter() -{ -} +UAFundamentalParameter::~UAFundamentalParameter() {} -unsigned short UAFundamentalParameter::getActiveEmissionParameterIndex() const -{ - return _activeEmissionParameterIndex; +unsigned short UAFundamentalParameter::getActiveEmissionParameterIndex() const { + return _activeEmissionParameterIndex; } -void UAFundamentalParameter::setActiveEmissionParameterIndex(unsigned short pX) -{ - _activeEmissionParameterIndex = pX; +void UAFundamentalParameter::setActiveEmissionParameterIndex( + unsigned short pX) { + _activeEmissionParameterIndex = pX; } -unsigned short UAFundamentalParameter::getScanPattern() const -{ - return _scanPattern; +unsigned short UAFundamentalParameter::getScanPattern() const { + return _scanPattern; } -void UAFundamentalParameter::setScanPattern(unsigned short pX) -{ - _scanPattern = pX; +void UAFundamentalParameter::setScanPattern(unsigned short pX) { + _scanPattern = pX; } -float UAFundamentalParameter::getBeamCenterAzimuthHorizontal() const -{ - return _beamCenterAzimuthHorizontal; +float UAFundamentalParameter::getBeamCenterAzimuthHorizontal() const { + return _beamCenterAzimuthHorizontal; } -void UAFundamentalParameter::setBeamCenterAzimuthHorizontal(float pX) -{ - _beamCenterAzimuthHorizontal = pX; +void UAFundamentalParameter::setBeamCenterAzimuthHorizontal(float pX) { + _beamCenterAzimuthHorizontal = pX; } -float UAFundamentalParameter::getAzimuthalBeamwidthHorizontal() const -{ - return _azimuthalBeamwidthHorizontal; +float UAFundamentalParameter::getAzimuthalBeamwidthHorizontal() const { + return _azimuthalBeamwidthHorizontal; } -void UAFundamentalParameter::setAzimuthalBeamwidthHorizontal(float pX) -{ - _azimuthalBeamwidthHorizontal = pX; +void UAFundamentalParameter::setAzimuthalBeamwidthHorizontal(float pX) { + _azimuthalBeamwidthHorizontal = pX; } -float UAFundamentalParameter::getBeamCenterDepressionElevation() const -{ - return _beamCenterDepressionElevation; +float UAFundamentalParameter::getBeamCenterDepressionElevation() const { + return _beamCenterDepressionElevation; } -void UAFundamentalParameter::setBeamCenterDepressionElevation(float pX) -{ - _beamCenterDepressionElevation = pX; +void UAFundamentalParameter::setBeamCenterDepressionElevation(float pX) { + _beamCenterDepressionElevation = pX; } -float UAFundamentalParameter::getBeamwidthDownElevation() const -{ - return _beamwidthDownElevation; +float UAFundamentalParameter::getBeamwidthDownElevation() const { + return _beamwidthDownElevation; } -void UAFundamentalParameter::setBeamwidthDownElevation(float pX) -{ - _beamwidthDownElevation = pX; +void UAFundamentalParameter::setBeamwidthDownElevation(float pX) { + _beamwidthDownElevation = pX; } -void UAFundamentalParameter::marshal(DataStream& dataStream) const -{ - dataStream << _activeEmissionParameterIndex; - dataStream << _scanPattern; - dataStream << _beamCenterAzimuthHorizontal; - dataStream << _azimuthalBeamwidthHorizontal; - dataStream << _beamCenterDepressionElevation; - dataStream << _beamwidthDownElevation; +void UAFundamentalParameter::marshal(DataStream& dataStream) const { + dataStream << _activeEmissionParameterIndex; + dataStream << _scanPattern; + dataStream << _beamCenterAzimuthHorizontal; + dataStream << _azimuthalBeamwidthHorizontal; + dataStream << _beamCenterDepressionElevation; + dataStream << _beamwidthDownElevation; } -void UAFundamentalParameter::unmarshal(DataStream& dataStream) -{ - dataStream >> _activeEmissionParameterIndex; - dataStream >> _scanPattern; - dataStream >> _beamCenterAzimuthHorizontal; - dataStream >> _azimuthalBeamwidthHorizontal; - dataStream >> _beamCenterDepressionElevation; - dataStream >> _beamwidthDownElevation; +void UAFundamentalParameter::unmarshal(DataStream& dataStream) { + dataStream >> _activeEmissionParameterIndex; + dataStream >> _scanPattern; + dataStream >> _beamCenterAzimuthHorizontal; + dataStream >> _azimuthalBeamwidthHorizontal; + dataStream >> _beamCenterDepressionElevation; + dataStream >> _beamwidthDownElevation; } +bool UAFundamentalParameter::operator==( + const UAFundamentalParameter& rhs) const { + bool ivarsEqual = true; -bool UAFundamentalParameter::operator ==(const UAFundamentalParameter& rhs) const - { - bool ivarsEqual = true; + if (!(_activeEmissionParameterIndex == rhs._activeEmissionParameterIndex)) + ivarsEqual = false; + if (!(_scanPattern == rhs._scanPattern)) ivarsEqual = false; + if (!(_beamCenterAzimuthHorizontal == rhs._beamCenterAzimuthHorizontal)) + ivarsEqual = false; + if (!(_azimuthalBeamwidthHorizontal == rhs._azimuthalBeamwidthHorizontal)) + ivarsEqual = false; + if (!(_beamCenterDepressionElevation == rhs._beamCenterDepressionElevation)) + ivarsEqual = false; + if (!(_beamwidthDownElevation == rhs._beamwidthDownElevation)) + ivarsEqual = false; - if( ! (_activeEmissionParameterIndex == rhs._activeEmissionParameterIndex) ) ivarsEqual = false; - if( ! (_scanPattern == rhs._scanPattern) ) ivarsEqual = false; - if( ! (_beamCenterAzimuthHorizontal == rhs._beamCenterAzimuthHorizontal) ) ivarsEqual = false; - if( ! (_azimuthalBeamwidthHorizontal == rhs._azimuthalBeamwidthHorizontal) ) ivarsEqual = false; - if( ! (_beamCenterDepressionElevation == rhs._beamCenterDepressionElevation) ) ivarsEqual = false; - if( ! (_beamwidthDownElevation == rhs._beamwidthDownElevation) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int UAFundamentalParameter::getMarshalledSize() const -{ - int marshalSize = 0; +int UAFundamentalParameter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 2; // _activeEmissionParameterIndex - marshalSize = marshalSize + 2; // _scanPattern - marshalSize = marshalSize + 4; // _beamCenterAzimuthHorizontal - marshalSize = marshalSize + 4; // _azimuthalBeamwidthHorizontal - marshalSize = marshalSize + 4; // _beamCenterDepressionElevation - marshalSize = marshalSize + 4; // _beamwidthDownElevation - return marshalSize; + marshalSize = marshalSize + 2; // _activeEmissionParameterIndex + marshalSize = marshalSize + 2; // _scanPattern + marshalSize = marshalSize + 4; // _beamCenterAzimuthHorizontal + marshalSize = marshalSize + 4; // _azimuthalBeamwidthHorizontal + marshalSize = marshalSize + 4; // _beamCenterDepressionElevation + marshalSize = marshalSize + 4; // _beamwidthDownElevation + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -142,7 +127,7 @@ int UAFundamentalParameter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UAFundamentalParameter.h b/src/dis7/UAFundamentalParameter.h index 46ba0731..f6b4c10d 100644 --- a/src/dis7/UAFundamentalParameter.h +++ b/src/dis7/UAFundamentalParameter.h @@ -1,76 +1,77 @@ #pragma once -#include #include +#include +namespace DIS { +// Regeneration parameters for active emission systems that are variable +// throughout a scenario. Section 6.2.90 -namespace DIS -{ -// Regeneration parameters for active emission systems that are variable throughout a scenario. Section 6.2.90 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT UAFundamentalParameter -{ -protected: +class OPENDIS7_EXPORT UAFundamentalParameter { + protected: /** Which database record shall be used. An enumeration from EBV document */ - unsigned short _activeEmissionParameterIndex; + unsigned short _activeEmissionParameterIndex; - /** The type of scan pattern, If not used, zero. An enumeration from EBV document */ - unsigned short _scanPattern; + /** The type of scan pattern, If not used, zero. An enumeration from EBV + * document */ + unsigned short _scanPattern; /** center azimuth bearing of th emain beam. In radians. */ - float _beamCenterAzimuthHorizontal; - - /** Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians. */ - float _azimuthalBeamwidthHorizontal; + float _beamCenterAzimuthHorizontal; - /** center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians. */ - float _beamCenterDepressionElevation; + /** Horizontal beamwidth of th emain beam Meastued at the 3dB down point of + * peak radiated power. In radians. */ + float _azimuthalBeamwidthHorizontal; - /** vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians. */ - float _beamwidthDownElevation; + /** center of the d/e angle of th emain beam relative to the stablised de + * angle of the target. In radians. */ + float _beamCenterDepressionElevation; + /** vertical beamwidth of the main beam. Meastured at the 3dB down point of + * peak radiated power. In radians. */ + float _beamwidthDownElevation; public: - UAFundamentalParameter(); - virtual ~UAFundamentalParameter(); + UAFundamentalParameter(); + virtual ~UAFundamentalParameter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned short getActiveEmissionParameterIndex() const; - void setActiveEmissionParameterIndex(unsigned short pX); + unsigned short getActiveEmissionParameterIndex() const; + void setActiveEmissionParameterIndex(unsigned short pX); - unsigned short getScanPattern() const; - void setScanPattern(unsigned short pX); + unsigned short getScanPattern() const; + void setScanPattern(unsigned short pX); - float getBeamCenterAzimuthHorizontal() const; - void setBeamCenterAzimuthHorizontal(float pX); + float getBeamCenterAzimuthHorizontal() const; + void setBeamCenterAzimuthHorizontal(float pX); - float getAzimuthalBeamwidthHorizontal() const; - void setAzimuthalBeamwidthHorizontal(float pX); + float getAzimuthalBeamwidthHorizontal() const; + void setAzimuthalBeamwidthHorizontal(float pX); - float getBeamCenterDepressionElevation() const; - void setBeamCenterDepressionElevation(float pX); + float getBeamCenterDepressionElevation() const; + void setBeamCenterDepressionElevation(float pX); - float getBeamwidthDownElevation() const; - void setBeamwidthDownElevation(float pX); + float getBeamwidthDownElevation() const; + void setBeamwidthDownElevation(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const UAFundamentalParameter& rhs) const; + bool operator==(const UAFundamentalParameter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -83,7 +84,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UaPdu.cpp b/src/dis7/UaPdu.cpp index 37fb4c3b..dd121a7c 100644 --- a/src/dis7/UaPdu.cpp +++ b/src/dis7/UaPdu.cpp @@ -2,309 +2,229 @@ using namespace DIS; - -UaPdu::UaPdu() : DistributedEmissionsFamilyPdu(), - _emittingEntityID(), - _eventID(), - _stateChangeIndicator(0), - _pad(0), - _passiveParameterIndex(0), - _propulsionPlantConfiguration(0), - _numberOfShafts(0), - _numberOfAPAs(0), - _numberOfUAEmitterSystems(0) -{ - setPduType( 29 ); +UaPdu::UaPdu() + : DistributedEmissionsFamilyPdu(), + _emittingEntityID(), + _eventID(), + _stateChangeIndicator(0), + _pad(0), + _passiveParameterIndex(0), + _propulsionPlantConfiguration(0), + _numberOfShafts(0), + _numberOfAPAs(0), + _numberOfUAEmitterSystems(0) { + setPduType(29); } -UaPdu::~UaPdu() -{ - _shaftRPMs.clear(); - _apaData.clear(); - _emitterSystems.clear(); +UaPdu::~UaPdu() { + _shaftRPMs.clear(); + _apaData.clear(); + _emitterSystems.clear(); } -EntityID& UaPdu::getEmittingEntityID() -{ - return _emittingEntityID; -} +EntityID& UaPdu::getEmittingEntityID() { return _emittingEntityID; } -const EntityID& UaPdu::getEmittingEntityID() const -{ - return _emittingEntityID; -} +const EntityID& UaPdu::getEmittingEntityID() const { return _emittingEntityID; } -void UaPdu::setEmittingEntityID(const EntityID &pX) -{ - _emittingEntityID = pX; -} +void UaPdu::setEmittingEntityID(const EntityID& pX) { _emittingEntityID = pX; } -EventIdentifier& UaPdu::getEventID() -{ - return _eventID; -} +EventIdentifier& UaPdu::getEventID() { return _eventID; } -const EventIdentifier& UaPdu::getEventID() const -{ - return _eventID; -} +const EventIdentifier& UaPdu::getEventID() const { return _eventID; } -void UaPdu::setEventID(const EventIdentifier &pX) -{ - _eventID = pX; -} +void UaPdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -char UaPdu::getStateChangeIndicator() const -{ - return _stateChangeIndicator; -} +char UaPdu::getStateChangeIndicator() const { return _stateChangeIndicator; } -void UaPdu::setStateChangeIndicator(char pX) -{ - _stateChangeIndicator = pX; -} +void UaPdu::setStateChangeIndicator(char pX) { _stateChangeIndicator = pX; } -char UaPdu::getPad() const -{ - return _pad; -} +char UaPdu::getPad() const { return _pad; } -void UaPdu::setPad(char pX) -{ - _pad = pX; -} +void UaPdu::setPad(char pX) { _pad = pX; } -unsigned short UaPdu::getPassiveParameterIndex() const -{ - return _passiveParameterIndex; +unsigned short UaPdu::getPassiveParameterIndex() const { + return _passiveParameterIndex; } -void UaPdu::setPassiveParameterIndex(unsigned short pX) -{ - _passiveParameterIndex = pX; +void UaPdu::setPassiveParameterIndex(unsigned short pX) { + _passiveParameterIndex = pX; } -unsigned char UaPdu::getPropulsionPlantConfiguration() const -{ - return _propulsionPlantConfiguration; +unsigned char UaPdu::getPropulsionPlantConfiguration() const { + return _propulsionPlantConfiguration; } -void UaPdu::setPropulsionPlantConfiguration(unsigned char pX) -{ - _propulsionPlantConfiguration = pX; +void UaPdu::setPropulsionPlantConfiguration(unsigned char pX) { + _propulsionPlantConfiguration = pX; } -unsigned char UaPdu::getNumberOfShafts() const -{ - return _shaftRPMs.size(); -} +unsigned char UaPdu::getNumberOfShafts() const { return _shaftRPMs.size(); } -unsigned char UaPdu::getNumberOfAPAs() const -{ - return _apaData.size(); -} +unsigned char UaPdu::getNumberOfAPAs() const { return _apaData.size(); } -unsigned char UaPdu::getNumberOfUAEmitterSystems() const -{ - return _emitterSystems.size(); +unsigned char UaPdu::getNumberOfUAEmitterSystems() const { + return _emitterSystems.size(); } -std::vector& UaPdu::getShaftRPMs() -{ - return _shaftRPMs; -} +std::vector& UaPdu::getShaftRPMs() { return _shaftRPMs; } -const std::vector& UaPdu::getShaftRPMs() const -{ - return _shaftRPMs; +const std::vector& UaPdu::getShaftRPMs() const { + return _shaftRPMs; } -void UaPdu::setShaftRPMs(const std::vector& pX) -{ - _shaftRPMs = pX; +void UaPdu::setShaftRPMs(const std::vector& pX) { + _shaftRPMs = pX; } -std::vector& UaPdu::getApaData() -{ - return _apaData; -} +std::vector& UaPdu::getApaData() { return _apaData; } -const std::vector& UaPdu::getApaData() const -{ - return _apaData; -} +const std::vector& UaPdu::getApaData() const { return _apaData; } -void UaPdu::setApaData(const std::vector& pX) -{ - _apaData = pX; -} - -std::vector& UaPdu::getEmitterSystems() -{ - return _emitterSystems; -} - -const std::vector& UaPdu::getEmitterSystems() const -{ - return _emitterSystems; -} +void UaPdu::setApaData(const std::vector& pX) { _apaData = pX; } -void UaPdu::setEmitterSystems(const std::vector& pX) -{ - _emitterSystems = pX; +std::vector& UaPdu::getEmitterSystems() { + return _emitterSystems; } -void UaPdu::marshal(DataStream& dataStream) const -{ - DistributedEmissionsFamilyPdu::marshal(dataStream); // Marshal information in superclass first - _emittingEntityID.marshal(dataStream); - _eventID.marshal(dataStream); - dataStream << _stateChangeIndicator; - dataStream << _pad; - dataStream << _passiveParameterIndex; - dataStream << _propulsionPlantConfiguration; - dataStream << ( unsigned char )_shaftRPMs.size(); - dataStream << ( unsigned char )_apaData.size(); - dataStream << ( unsigned char )_emitterSystems.size(); - - for(size_t idx = 0; idx < _shaftRPMs.size(); idx++) - { - Vector3Float x = _shaftRPMs[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _apaData.size(); idx++) - { - Vector3Float x = _apaData[idx]; - x.marshal(dataStream); - } - - - for(size_t idx = 0; idx < _emitterSystems.size(); idx++) - { - Vector3Float x = _emitterSystems[idx]; - x.marshal(dataStream); - } - +const std::vector& UaPdu::getEmitterSystems() const { + return _emitterSystems; } -void UaPdu::unmarshal(DataStream& dataStream) -{ - DistributedEmissionsFamilyPdu::unmarshal(dataStream); // unmarshal information in superclass first - _emittingEntityID.unmarshal(dataStream); - _eventID.unmarshal(dataStream); - dataStream >> _stateChangeIndicator; - dataStream >> _pad; - dataStream >> _passiveParameterIndex; - dataStream >> _propulsionPlantConfiguration; - dataStream >> _numberOfShafts; - dataStream >> _numberOfAPAs; - dataStream >> _numberOfUAEmitterSystems; - - _shaftRPMs.clear(); - for(size_t idx = 0; idx < _numberOfShafts; idx++) - { - Vector3Float x; - x.unmarshal(dataStream); - _shaftRPMs.push_back(x); - } - - _apaData.clear(); - for(size_t idx = 0; idx < _numberOfAPAs; idx++) - { - Vector3Float x; - x.unmarshal(dataStream); - _apaData.push_back(x); - } - - _emitterSystems.clear(); - for(size_t idx = 0; idx < _numberOfUAEmitterSystems; idx++) - { - Vector3Float x; - x.unmarshal(dataStream); - _emitterSystems.push_back(x); - } +void UaPdu::setEmitterSystems(const std::vector& pX) { + _emitterSystems = pX; } +void UaPdu::marshal(DataStream& dataStream) const { + DistributedEmissionsFamilyPdu::marshal( + dataStream); // Marshal information in superclass first + _emittingEntityID.marshal(dataStream); + _eventID.marshal(dataStream); + dataStream << _stateChangeIndicator; + dataStream << _pad; + dataStream << _passiveParameterIndex; + dataStream << _propulsionPlantConfiguration; + dataStream << (unsigned char)_shaftRPMs.size(); + dataStream << (unsigned char)_apaData.size(); + dataStream << (unsigned char)_emitterSystems.size(); -bool UaPdu::operator ==(const UaPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - - if( ! (_emittingEntityID == rhs._emittingEntityID) ) ivarsEqual = false; - if( ! (_eventID == rhs._eventID) ) ivarsEqual = false; - if( ! (_stateChangeIndicator == rhs._stateChangeIndicator) ) ivarsEqual = false; - if( ! (_pad == rhs._pad) ) ivarsEqual = false; - if( ! (_passiveParameterIndex == rhs._passiveParameterIndex) ) ivarsEqual = false; - if( ! (_propulsionPlantConfiguration == rhs._propulsionPlantConfiguration) ) ivarsEqual = false; + for (size_t idx = 0; idx < _shaftRPMs.size(); idx++) { + Vector3Float x = _shaftRPMs[idx]; + x.marshal(dataStream); + } - for(size_t idx = 0; idx < _shaftRPMs.size(); idx++) - { - if( ! ( _shaftRPMs[idx] == rhs._shaftRPMs[idx]) ) ivarsEqual = false; - } + for (size_t idx = 0; idx < _apaData.size(); idx++) { + Vector3Float x = _apaData[idx]; + x.marshal(dataStream); + } + for (size_t idx = 0; idx < _emitterSystems.size(); idx++) { + Vector3Float x = _emitterSystems[idx]; + x.marshal(dataStream); + } +} - for(size_t idx = 0; idx < _apaData.size(); idx++) - { - if( ! ( _apaData[idx] == rhs._apaData[idx]) ) ivarsEqual = false; - } - - - for(size_t idx = 0; idx < _emitterSystems.size(); idx++) - { - if( ! ( _emitterSystems[idx] == rhs._emitterSystems[idx]) ) ivarsEqual = false; - } - - - return ivarsEqual; - } - -int UaPdu::getMarshalledSize() const -{ - int marshalSize = 0; +void UaPdu::unmarshal(DataStream& dataStream) { + DistributedEmissionsFamilyPdu::unmarshal( + dataStream); // unmarshal information in superclass first + _emittingEntityID.unmarshal(dataStream); + _eventID.unmarshal(dataStream); + dataStream >> _stateChangeIndicator; + dataStream >> _pad; + dataStream >> _passiveParameterIndex; + dataStream >> _propulsionPlantConfiguration; + dataStream >> _numberOfShafts; + dataStream >> _numberOfAPAs; + dataStream >> _numberOfUAEmitterSystems; - marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID - marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 1; // _stateChangeIndicator - marshalSize = marshalSize + 1; // _pad - marshalSize = marshalSize + 2; // _passiveParameterIndex - marshalSize = marshalSize + 1; // _propulsionPlantConfiguration - marshalSize = marshalSize + 1; // _numberOfShafts - marshalSize = marshalSize + 1; // _numberOfAPAs - marshalSize = marshalSize + 1; // _numberOfUAEmitterSystems + _shaftRPMs.clear(); + for (size_t idx = 0; idx < _numberOfShafts; idx++) { + Vector3Float x; + x.unmarshal(dataStream); + _shaftRPMs.push_back(x); + } - for(unsigned long long idx=0; idx < _shaftRPMs.size(); idx++) - { - Vector3Float listElement = _shaftRPMs[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + _apaData.clear(); + for (size_t idx = 0; idx < _numberOfAPAs; idx++) { + Vector3Float x; + x.unmarshal(dataStream); + _apaData.push_back(x); + } + _emitterSystems.clear(); + for (size_t idx = 0; idx < _numberOfUAEmitterSystems; idx++) { + Vector3Float x; + x.unmarshal(dataStream); + _emitterSystems.push_back(x); + } +} - for(unsigned long long idx=0; idx < _apaData.size(); idx++) - { - Vector3Float listElement = _apaData[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } +bool UaPdu::operator==(const UaPdu& rhs) const { + bool ivarsEqual = true; + ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - for(unsigned long long idx=0; idx < _emitterSystems.size(); idx++) - { - Vector3Float listElement = _emitterSystems[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } + if (!(_emittingEntityID == rhs._emittingEntityID)) ivarsEqual = false; + if (!(_eventID == rhs._eventID)) ivarsEqual = false; + if (!(_stateChangeIndicator == rhs._stateChangeIndicator)) ivarsEqual = false; + if (!(_pad == rhs._pad)) ivarsEqual = false; + if (!(_passiveParameterIndex == rhs._passiveParameterIndex)) + ivarsEqual = false; + if (!(_propulsionPlantConfiguration == rhs._propulsionPlantConfiguration)) + ivarsEqual = false; - return marshalSize; + for (size_t idx = 0; idx < _shaftRPMs.size(); idx++) { + if (!(_shaftRPMs[idx] == rhs._shaftRPMs[idx])) ivarsEqual = false; + } + + for (size_t idx = 0; idx < _apaData.size(); idx++) { + if (!(_apaData[idx] == rhs._apaData[idx])) ivarsEqual = false; + } + + for (size_t idx = 0; idx < _emitterSystems.size(); idx++) { + if (!(_emitterSystems[idx] == rhs._emitterSystems[idx])) ivarsEqual = false; + } + + return ivarsEqual; +} + +int UaPdu::getMarshalledSize() const { + int marshalSize = 0; + + marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); + marshalSize = + marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID + marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID + marshalSize = marshalSize + 1; // _stateChangeIndicator + marshalSize = marshalSize + 1; // _pad + marshalSize = marshalSize + 2; // _passiveParameterIndex + marshalSize = marshalSize + 1; // _propulsionPlantConfiguration + marshalSize = marshalSize + 1; // _numberOfShafts + marshalSize = marshalSize + 1; // _numberOfAPAs + marshalSize = marshalSize + 1; // _numberOfUAEmitterSystems + + for (unsigned long long idx = 0; idx < _shaftRPMs.size(); idx++) { + Vector3Float listElement = _shaftRPMs[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _apaData.size(); idx++) { + Vector3Float listElement = _apaData[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + for (unsigned long long idx = 0; idx < _emitterSystems.size(); idx++) { + Vector3Float listElement = _emitterSystems[idx]; + marshalSize = marshalSize + listElement.getMarshalledSize(); + } + + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -317,7 +237,7 @@ int UaPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UaPdu.h b/src/dis7/UaPdu.h index b290a158..f3e0f5e5 100644 --- a/src/dis7/UaPdu.h +++ b/src/dis7/UaPdu.h @@ -1,121 +1,128 @@ #pragma once +#include + +#include #include #include #include -#include -#include -#include -#include -#include #include +#include +namespace DIS { +// Information about underwater acoustic emmissions. This requires manual +// cleanup. The beam data records should ALL be a the finish, rather than +// attached to each emitter system. Section 7.6.4. UNFINISHED -namespace DIS -{ -// Information about underwater acoustic emmissions. This requires manual cleanup. The beam data records should ALL be a the finish, rather than attached to each emitter system. Section 7.6.4. UNFINISHED - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT UaPdu : public DistributedEmissionsFamilyPdu -{ -protected: +class OPENDIS7_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { + protected: /** ID of the entity that is the source of the emission */ - EntityID _emittingEntityID; + EntityID _emittingEntityID; /** ID of event */ - EventIdentifier _eventID; + EventIdentifier _eventID; - /** This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU */ - char _stateChangeIndicator; + /** This field shall be used to indicate whether the data in the UA PDU + * represent a state update or data that have changed since issuance of the + * last UA PDU */ + char _stateChangeIndicator; /** padding */ - char _pad; + char _pad; - /** This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or file) shall define all noise generated as a function of propulsion plant configurations and associated auxiliaries. */ - unsigned short _passiveParameterIndex; + /** This field indicates which database record (or file) shall be used in the + * definition of passive signature (unintentional) emissions of the entity. + * The indicated database record (or file) shall define all noise generated + * as a function of propulsion plant configurations and associated + * auxiliaries. */ + unsigned short _passiveParameterIndex; - /** This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity. */ - unsigned char _propulsionPlantConfiguration; + /** This field shall specify the entity propulsion plant configuration. This + * field is used to determine the passive signature characteristics of an + * entity. */ + unsigned char _propulsionPlantConfiguration; /** This field shall represent the number of shafts on a platform */ - unsigned char _numberOfShafts; + unsigned char _numberOfShafts; - /** This field shall indicate the number of APAs described in the current UA PDU */ - unsigned char _numberOfAPAs; + /** This field shall indicate the number of APAs described in the current UA + * PDU */ + unsigned char _numberOfAPAs; - /** This field shall specify the number of UA emitter systems being described in the current UA PDU */ - unsigned char _numberOfUAEmitterSystems; + /** This field shall specify the number of UA emitter systems being described + * in the current UA PDU */ + unsigned char _numberOfUAEmitterSystems; /** shaft RPM values. THIS IS WRONG. It has the wrong class in the list. */ - std::vector _shaftRPMs; + std::vector _shaftRPMs; /** apaData. THIS IS WRONG. It has the worng class in the list. */ - std::vector _apaData; + std::vector _apaData; /** THIS IS WRONG. It has the wrong class in the list. */ - std::vector _emitterSystems; - + std::vector _emitterSystems; public: - UaPdu(); - virtual ~UaPdu(); + UaPdu(); + virtual ~UaPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getEmittingEntityID(); - const EntityID& getEmittingEntityID() const; - void setEmittingEntityID(const EntityID &pX); + EntityID& getEmittingEntityID(); + const EntityID& getEmittingEntityID() const; + void setEmittingEntityID(const EntityID& pX); - EventIdentifier& getEventID(); - const EventIdentifier& getEventID() const; - void setEventID(const EventIdentifier &pX); + EventIdentifier& getEventID(); + const EventIdentifier& getEventID() const; + void setEventID(const EventIdentifier& pX); - char getStateChangeIndicator() const; - void setStateChangeIndicator(char pX); + char getStateChangeIndicator() const; + void setStateChangeIndicator(char pX); - char getPad() const; - void setPad(char pX); + char getPad() const; + void setPad(char pX); - unsigned short getPassiveParameterIndex() const; - void setPassiveParameterIndex(unsigned short pX); + unsigned short getPassiveParameterIndex() const; + void setPassiveParameterIndex(unsigned short pX); - unsigned char getPropulsionPlantConfiguration() const; - void setPropulsionPlantConfiguration(unsigned char pX); + unsigned char getPropulsionPlantConfiguration() const; + void setPropulsionPlantConfiguration(unsigned char pX); - unsigned char getNumberOfShafts() const; + unsigned char getNumberOfShafts() const; - unsigned char getNumberOfAPAs() const; + unsigned char getNumberOfAPAs() const; - unsigned char getNumberOfUAEmitterSystems() const; + unsigned char getNumberOfUAEmitterSystems() const; - std::vector& getShaftRPMs(); - const std::vector& getShaftRPMs() const; - void setShaftRPMs(const std::vector& pX); + std::vector& getShaftRPMs(); + const std::vector& getShaftRPMs() const; + void setShaftRPMs(const std::vector& pX); - std::vector& getApaData(); - const std::vector& getApaData() const; - void setApaData(const std::vector& pX); + std::vector& getApaData(); + const std::vector& getApaData() const; + void setApaData(const std::vector& pX); - std::vector& getEmitterSystems(); - const std::vector& getEmitterSystems() const; - void setEmitterSystems(const std::vector& pX); + std::vector& getEmitterSystems(); + const std::vector& getEmitterSystems() const; + void setEmitterSystems(const std::vector& pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const UaPdu& rhs) const; + bool operator==(const UaPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -128,7 +135,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UnattachedIdentifier.cpp b/src/dis7/UnattachedIdentifier.cpp index 7410797a..fc93b903 100644 --- a/src/dis7/UnattachedIdentifier.cpp +++ b/src/dis7/UnattachedIdentifier.cpp @@ -2,79 +2,64 @@ using namespace DIS; +UnattachedIdentifier::UnattachedIdentifier() + : _simulationAddress(), _referenceNumber(0) {} -UnattachedIdentifier::UnattachedIdentifier(): - _simulationAddress(), - _referenceNumber(0) -{ -} - -UnattachedIdentifier::~UnattachedIdentifier() -{ -} +UnattachedIdentifier::~UnattachedIdentifier() {} -SimulationAddress& UnattachedIdentifier::getSimulationAddress() -{ - return _simulationAddress; +SimulationAddress& UnattachedIdentifier::getSimulationAddress() { + return _simulationAddress; } -const SimulationAddress& UnattachedIdentifier::getSimulationAddress() const -{ - return _simulationAddress; +const SimulationAddress& UnattachedIdentifier::getSimulationAddress() const { + return _simulationAddress; } -void UnattachedIdentifier::setSimulationAddress(const SimulationAddress &pX) -{ - _simulationAddress = pX; +void UnattachedIdentifier::setSimulationAddress(const SimulationAddress& pX) { + _simulationAddress = pX; } -unsigned short UnattachedIdentifier::getReferenceNumber() const -{ - return _referenceNumber; +unsigned short UnattachedIdentifier::getReferenceNumber() const { + return _referenceNumber; } -void UnattachedIdentifier::setReferenceNumber(unsigned short pX) -{ - _referenceNumber = pX; +void UnattachedIdentifier::setReferenceNumber(unsigned short pX) { + _referenceNumber = pX; } -void UnattachedIdentifier::marshal(DataStream& dataStream) const -{ - _simulationAddress.marshal(dataStream); - dataStream << _referenceNumber; +void UnattachedIdentifier::marshal(DataStream& dataStream) const { + _simulationAddress.marshal(dataStream); + dataStream << _referenceNumber; } -void UnattachedIdentifier::unmarshal(DataStream& dataStream) -{ - _simulationAddress.unmarshal(dataStream); - dataStream >> _referenceNumber; +void UnattachedIdentifier::unmarshal(DataStream& dataStream) { + _simulationAddress.unmarshal(dataStream); + dataStream >> _referenceNumber; } +bool UnattachedIdentifier::operator==(const UnattachedIdentifier& rhs) const { + bool ivarsEqual = true; -bool UnattachedIdentifier::operator ==(const UnattachedIdentifier& rhs) const - { - bool ivarsEqual = true; + if (!(_simulationAddress == rhs._simulationAddress)) ivarsEqual = false; + if (!(_referenceNumber == rhs._referenceNumber)) ivarsEqual = false; - if( ! (_simulationAddress == rhs._simulationAddress) ) ivarsEqual = false; - if( ! (_referenceNumber == rhs._referenceNumber) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int UnattachedIdentifier::getMarshalledSize() const -{ - int marshalSize = 0; +int UnattachedIdentifier::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + _simulationAddress.getMarshalledSize(); // _simulationAddress - marshalSize = marshalSize + 2; // _referenceNumber - return marshalSize; + marshalSize = marshalSize + + _simulationAddress.getMarshalledSize(); // _simulationAddress + marshalSize = marshalSize + 2; // _referenceNumber + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -87,7 +72,7 @@ int UnattachedIdentifier::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UnattachedIdentifier.h b/src/dis7/UnattachedIdentifier.h index 0f70c14d..7f822288 100644 --- a/src/dis7/UnattachedIdentifier.h +++ b/src/dis7/UnattachedIdentifier.h @@ -1,54 +1,51 @@ #pragma once #include -#include #include +#include +namespace DIS { +// The unique designation of one or more unattached radios in an event or +// exercise Section 6.2.91 -namespace DIS -{ -// The unique designation of one or more unattached radios in an event or exercise Section 6.2.91 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT UnattachedIdentifier -{ -protected: +class OPENDIS7_EXPORT UnattachedIdentifier { + protected: /** See 6.2.79 */ - SimulationAddress _simulationAddress; + SimulationAddress _simulationAddress; /** Reference number */ - unsigned short _referenceNumber; - + unsigned short _referenceNumber; public: - UnattachedIdentifier(); - virtual ~UnattachedIdentifier(); + UnattachedIdentifier(); + virtual ~UnattachedIdentifier(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - SimulationAddress& getSimulationAddress(); - const SimulationAddress& getSimulationAddress() const; - void setSimulationAddress(const SimulationAddress &pX); + SimulationAddress& getSimulationAddress(); + const SimulationAddress& getSimulationAddress() const; + void setSimulationAddress(const SimulationAddress& pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + unsigned short getReferenceNumber() const; + void setReferenceNumber(unsigned short pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const UnattachedIdentifier& rhs) const; + bool operator==(const UnattachedIdentifier& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -61,7 +58,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UnsignedDISInteger.cpp b/src/dis7/UnsignedDISInteger.cpp index b2e26269..accacf4c 100644 --- a/src/dis7/UnsignedDISInteger.cpp +++ b/src/dis7/UnsignedDISInteger.cpp @@ -2,59 +2,42 @@ using namespace DIS; +UnsignedDISInteger::UnsignedDISInteger() : _val(0) {} -UnsignedDISInteger::UnsignedDISInteger(): - _val(0) -{ -} +UnsignedDISInteger::~UnsignedDISInteger() {} -UnsignedDISInteger::~UnsignedDISInteger() -{ -} +unsigned int UnsignedDISInteger::getVal() const { return _val; } -unsigned int UnsignedDISInteger::getVal() const -{ - return _val; -} +void UnsignedDISInteger::setVal(unsigned int pX) { _val = pX; } -void UnsignedDISInteger::setVal(unsigned int pX) -{ - _val = pX; +void UnsignedDISInteger::marshal(DataStream& dataStream) const { + dataStream << _val; } -void UnsignedDISInteger::marshal(DataStream& dataStream) const -{ - dataStream << _val; +void UnsignedDISInteger::unmarshal(DataStream& dataStream) { + dataStream >> _val; } -void UnsignedDISInteger::unmarshal(DataStream& dataStream) -{ - dataStream >> _val; -} +bool UnsignedDISInteger::operator==(const UnsignedDISInteger& rhs) const { + bool ivarsEqual = true; + if (!(_val == rhs._val)) ivarsEqual = false; -bool UnsignedDISInteger::operator ==(const UnsignedDISInteger& rhs) const - { - bool ivarsEqual = true; - - if( ! (_val == rhs._val) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int UnsignedDISInteger::getMarshalledSize() const -{ - int marshalSize = 0; +int UnsignedDISInteger::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _val - return marshalSize; + marshalSize = marshalSize + 4; // _val + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -67,7 +50,7 @@ int UnsignedDISInteger::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/UnsignedDISInteger.h b/src/dis7/UnsignedDISInteger.h index 7015d2fe..9229524a 100644 --- a/src/dis7/UnsignedDISInteger.h +++ b/src/dis7/UnsignedDISInteger.h @@ -1,46 +1,42 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // container class not in specification -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT UnsignedDISInteger -{ -protected: +class OPENDIS7_EXPORT UnsignedDISInteger { + protected: /** unsigned integer */ - unsigned int _val; - + unsigned int _val; public: - UnsignedDISInteger(); - virtual ~UnsignedDISInteger(); + UnsignedDISInteger(); + virtual ~UnsignedDISInteger(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getVal() const; - void setVal(unsigned int pX); + unsigned int getVal() const; + void setVal(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const UnsignedDISInteger& rhs) const; + bool operator==(const UnsignedDISInteger& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -53,7 +49,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VariableDatum.cpp b/src/dis7/VariableDatum.cpp index 4ab96401..2a6e8272 100644 --- a/src/dis7/VariableDatum.cpp +++ b/src/dis7/VariableDatum.cpp @@ -2,116 +2,92 @@ using namespace DIS; +VariableDatum::VariableDatum() + : _variableDatumID(0), + _variableDatumLength(0), + _variableDatumBits(0), + _padding(0) {} -VariableDatum::VariableDatum(): - _variableDatumID(0), - _variableDatumLength(0), - _variableDatumBits(0), - _padding(0) -{ -} - -VariableDatum::~VariableDatum() -{ -} - -unsigned int VariableDatum::getVariableDatumID() const -{ - return _variableDatumID; -} +VariableDatum::~VariableDatum() {} -void VariableDatum::setVariableDatumID(unsigned int pX) -{ - _variableDatumID = pX; +unsigned int VariableDatum::getVariableDatumID() const { + return _variableDatumID; } -unsigned int VariableDatum::getVariableDatumLength() const -{ - return _variableDatumLength; +void VariableDatum::setVariableDatumID(unsigned int pX) { + _variableDatumID = pX; } -void VariableDatum::setVariableDatumLength(unsigned int pX) -{ - _variableDatumLength = pX; +unsigned int VariableDatum::getVariableDatumLength() const { + return _variableDatumLength; } -unsigned int VariableDatum::getVariableDatumBits() const -{ - return _variableDatumBits; +void VariableDatum::setVariableDatumLength(unsigned int pX) { + _variableDatumLength = pX; } -void VariableDatum::setVariableDatumBits(unsigned int pX) -{ - _variableDatumBits = pX; +unsigned int VariableDatum::getVariableDatumBits() const { + return _variableDatumBits; } -unsigned int VariableDatum::getPadding() const -{ - return _padding; +void VariableDatum::setVariableDatumBits(unsigned int pX) { + _variableDatumBits = pX; } -void VariableDatum::setPadding(unsigned int pX) -{ - _padding = pX; -} +unsigned int VariableDatum::getPadding() const { return _padding; } -void VariableDatum::marshal(DataStream& dataStream) const -{ - dataStream << _variableDatumID; - dataStream << ( unsigned int )_variableDatums.size() * 64; +void VariableDatum::setPadding(unsigned int pX) { _padding = pX; } - for(size_t idx = 0; idx < _variableDatums.size(); idx++) - { - EightByteChunk x = _variableDatums[idx]; - x.marshal(dataStream); - } +void VariableDatum::marshal(DataStream& dataStream) const { + dataStream << _variableDatumID; + dataStream << (unsigned int)_variableDatums.size() * 64; + for (size_t idx = 0; idx < _variableDatums.size(); idx++) { + EightByteChunk x = _variableDatums[idx]; + x.marshal(dataStream); + } } -void VariableDatum::unmarshal(DataStream& dataStream) -{ - dataStream >> _variableDatumID; - dataStream >> _variableDatumLength; - _variableDatumLength = (_variableDatumLength / 64) + ((_variableDatumLength % 64) > 0); - - _variableDatums.clear(); - for(size_t idx = 0; idx < _variableDatumLength; idx++) - { - EightByteChunk x; - x.unmarshal(dataStream); - _variableDatums.push_back(x); - } +void VariableDatum::unmarshal(DataStream& dataStream) { + dataStream >> _variableDatumID; + dataStream >> _variableDatumLength; + _variableDatumLength = + (_variableDatumLength / 64) + ((_variableDatumLength % 64) > 0); + + _variableDatums.clear(); + for (size_t idx = 0; idx < _variableDatumLength; idx++) { + EightByteChunk x; + x.unmarshal(dataStream); + _variableDatums.push_back(x); + } } +bool VariableDatum::operator==(const VariableDatum& rhs) const { + bool ivarsEqual = true; -bool VariableDatum::operator ==(const VariableDatum& rhs) const - { - bool ivarsEqual = true; + if (!(_variableDatumID == rhs._variableDatumID)) ivarsEqual = false; + if (!(_variableDatumLength == rhs._variableDatumLength)) ivarsEqual = false; + if (!(_variableDatumBits == rhs._variableDatumBits)) ivarsEqual = false; + if (!(_padding == rhs._padding)) ivarsEqual = false; - if( ! (_variableDatumID == rhs._variableDatumID) ) ivarsEqual = false; - if( ! (_variableDatumLength == rhs._variableDatumLength) ) ivarsEqual = false; - if( ! (_variableDatumBits == rhs._variableDatumBits) ) ivarsEqual = false; - if( ! (_padding == rhs._padding) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int VariableDatum::getMarshalledSize() const -{ - int marshalSize = 0; +int VariableDatum::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _variableDatumID - marshalSize = marshalSize + 4; // _variableDatumLength - marshalSize = marshalSize + 4; // _variableDatumBits - marshalSize = marshalSize + 4; // _padding - return marshalSize; + marshalSize = marshalSize + 4; // _variableDatumID + marshalSize = marshalSize + 4; // _variableDatumLength + marshalSize = marshalSize + 4; // _variableDatumBits + marshalSize = marshalSize + 4; // _padding + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -124,7 +100,7 @@ int VariableDatum::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VariableDatum.h b/src/dis7/VariableDatum.h index d99ac3c9..afc6c97a 100644 --- a/src/dis7/VariableDatum.h +++ b/src/dis7/VariableDatum.h @@ -1,69 +1,69 @@ #pragma once -#include -#include -#include #include +#include +#include +#include -namespace DIS -{ -// the variable datum type, the datum length, and the value for that variable datum type. NOT COMPLETE. Section 6.2.92 +namespace DIS { +// the variable datum type, the datum length, and the value for that variable +// datum type. NOT COMPLETE. Section 6.2.92 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT VariableDatum -{ -protected: - /** Type of variable datum to be transmitted. 32 bit enumeration defined in EBV */ - unsigned int _variableDatumID; +class OPENDIS7_EXPORT VariableDatum { + protected: + /** Type of variable datum to be transmitted. 32 bit enumeration defined in + * EBV */ + unsigned int _variableDatumID; /** Length, in bits, of the variable datum. */ - unsigned int _variableDatumLength; + unsigned int _variableDatumLength; - /** Variable datum. This can be any number of bits long, depending on the datum. */ - unsigned int _variableDatumBits; + /** Variable datum. This can be any number of bits long, depending on the + * datum. */ + unsigned int _variableDatumBits; /** padding to put the record on a 64 bit boundary */ - unsigned int _padding; + unsigned int _padding; // Variable Data std::vector _variableDatums; - public: - VariableDatum(); - virtual ~VariableDatum(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + VariableDatum(); + virtual ~VariableDatum(); - unsigned int getVariableDatumID() const; - void setVariableDatumID(unsigned int pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getVariableDatumLength() const; - void setVariableDatumLength(unsigned int pX); + unsigned int getVariableDatumID() const; + void setVariableDatumID(unsigned int pX); - unsigned int getVariableDatumBits() const; - void setVariableDatumBits(unsigned int pX); + unsigned int getVariableDatumLength() const; + void setVariableDatumLength(unsigned int pX); - unsigned int getPadding() const; - void setPadding(unsigned int pX); + unsigned int getVariableDatumBits() const; + void setVariableDatumBits(unsigned int pX); + unsigned int getPadding() const; + void setPadding(unsigned int pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const VariableDatum& rhs) const; + bool operator==(const VariableDatum& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -76,7 +76,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VariableParameter.cpp b/src/dis7/VariableParameter.cpp index 6949134f..9220a288 100644 --- a/src/dis7/VariableParameter.cpp +++ b/src/dis7/VariableParameter.cpp @@ -2,119 +2,99 @@ using namespace DIS; +VariableParameter::VariableParameter() + : _recordType(0), + _variableParameterFields1(0.0), + _variableParameterFields2(0), + _variableParameterFields3(0), + _variableParameterFields4(0) {} -VariableParameter::VariableParameter(): - _recordType(0), - _variableParameterFields1(0.0), - _variableParameterFields2(0), - _variableParameterFields3(0), - _variableParameterFields4(0) -{ -} +VariableParameter::~VariableParameter() {} -VariableParameter::~VariableParameter() -{ -} +unsigned char VariableParameter::getRecordType() const { return _recordType; } -unsigned char VariableParameter::getRecordType() const -{ - return _recordType; -} +void VariableParameter::setRecordType(unsigned char pX) { _recordType = pX; } -void VariableParameter::setRecordType(unsigned char pX) -{ - _recordType = pX; +double VariableParameter::getVariableParameterFields1() const { + return _variableParameterFields1; } -double VariableParameter::getVariableParameterFields1() const -{ - return _variableParameterFields1; +void VariableParameter::setVariableParameterFields1(double pX) { + _variableParameterFields1 = pX; } -void VariableParameter::setVariableParameterFields1(double pX) -{ - _variableParameterFields1 = pX; +unsigned int VariableParameter::getVariableParameterFields2() const { + return _variableParameterFields2; } -unsigned int VariableParameter::getVariableParameterFields2() const -{ - return _variableParameterFields2; +void VariableParameter::setVariableParameterFields2(unsigned int pX) { + _variableParameterFields2 = pX; } -void VariableParameter::setVariableParameterFields2(unsigned int pX) -{ - _variableParameterFields2 = pX; +unsigned short VariableParameter::getVariableParameterFields3() const { + return _variableParameterFields3; } -unsigned short VariableParameter::getVariableParameterFields3() const -{ - return _variableParameterFields3; +void VariableParameter::setVariableParameterFields3(unsigned short pX) { + _variableParameterFields3 = pX; } -void VariableParameter::setVariableParameterFields3(unsigned short pX) -{ - _variableParameterFields3 = pX; +unsigned char VariableParameter::getVariableParameterFields4() const { + return _variableParameterFields4; } -unsigned char VariableParameter::getVariableParameterFields4() const -{ - return _variableParameterFields4; +void VariableParameter::setVariableParameterFields4(unsigned char pX) { + _variableParameterFields4 = pX; } -void VariableParameter::setVariableParameterFields4(unsigned char pX) -{ - _variableParameterFields4 = pX; +void VariableParameter::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _variableParameterFields1; + dataStream << _variableParameterFields2; + dataStream << _variableParameterFields3; + dataStream << _variableParameterFields4; } -void VariableParameter::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _variableParameterFields1; - dataStream << _variableParameterFields2; - dataStream << _variableParameterFields3; - dataStream << _variableParameterFields4; +void VariableParameter::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _variableParameterFields1; + dataStream >> _variableParameterFields2; + dataStream >> _variableParameterFields3; + dataStream >> _variableParameterFields4; } -void VariableParameter::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _variableParameterFields1; - dataStream >> _variableParameterFields2; - dataStream >> _variableParameterFields3; - dataStream >> _variableParameterFields4; -} +bool VariableParameter::operator==(const VariableParameter& rhs) const { + bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_variableParameterFields1 == rhs._variableParameterFields1)) + ivarsEqual = false; + if (!(_variableParameterFields2 == rhs._variableParameterFields2)) + ivarsEqual = false; + if (!(_variableParameterFields3 == rhs._variableParameterFields3)) + ivarsEqual = false; + if (!(_variableParameterFields4 == rhs._variableParameterFields4)) + ivarsEqual = false; -bool VariableParameter::operator ==(const VariableParameter& rhs) const - { - bool ivarsEqual = true; - - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_variableParameterFields1 == rhs._variableParameterFields1) ) ivarsEqual = false; - if( ! (_variableParameterFields2 == rhs._variableParameterFields2) ) ivarsEqual = false; - if( ! (_variableParameterFields3 == rhs._variableParameterFields3) ) ivarsEqual = false; - if( ! (_variableParameterFields4 == rhs._variableParameterFields4) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int VariableParameter::getMarshalledSize() const -{ - int marshalSize = 0; +int VariableParameter::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 1; // _recordType - marshalSize = marshalSize + 8; // _variableParameterFields1 - marshalSize = marshalSize + 4; // _variableParameterFields2 - marshalSize = marshalSize + 2; // _variableParameterFields3 - marshalSize = marshalSize + 1; // _variableParameterFields4 - return marshalSize; + marshalSize = marshalSize + 1; // _recordType + marshalSize = marshalSize + 8; // _variableParameterFields1 + marshalSize = marshalSize + 4; // _variableParameterFields2 + marshalSize = marshalSize + 2; // _variableParameterFields3 + marshalSize = marshalSize + 1; // _variableParameterFields4 + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -127,7 +107,7 @@ int VariableParameter::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VariableParameter.h b/src/dis7/VariableParameter.h index 38806ecb..b7d04ef5 100644 --- a/src/dis7/VariableParameter.h +++ b/src/dis7/VariableParameter.h @@ -1,70 +1,68 @@ #pragma once -#include #include +#include +namespace DIS { +// specification of additional information associated with an entity or +// detonation, not otherwise accounted for in a PDU 6.2.93.1 -namespace DIS -{ -// specification of additional information associated with an entity or detonation, not otherwise accounted for in a PDU 6.2.93.1 - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT VariableParameter -{ -protected: - /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; +class OPENDIS7_EXPORT VariableParameter { + protected: + /** the identification of the Variable Parameter record. Enumeration from EBV + */ + unsigned char _recordType; /** Variable parameter data fields. Two doubles minus one byte */ - double _variableParameterFields1; + double _variableParameterFields1; /** Variable parameter data fields. */ - unsigned int _variableParameterFields2; + unsigned int _variableParameterFields2; /** Variable parameter data fields. */ - unsigned short _variableParameterFields3; + unsigned short _variableParameterFields3; /** Variable parameter data fields. */ - unsigned char _variableParameterFields4; - + unsigned char _variableParameterFields4; public: - VariableParameter(); - virtual ~VariableParameter(); + VariableParameter(); + virtual ~VariableParameter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + unsigned char getRecordType() const; + void setRecordType(unsigned char pX); - double getVariableParameterFields1() const; - void setVariableParameterFields1(double pX); + double getVariableParameterFields1() const; + void setVariableParameterFields1(double pX); - unsigned int getVariableParameterFields2() const; - void setVariableParameterFields2(unsigned int pX); + unsigned int getVariableParameterFields2() const; + void setVariableParameterFields2(unsigned int pX); - unsigned short getVariableParameterFields3() const; - void setVariableParameterFields3(unsigned short pX); + unsigned short getVariableParameterFields3() const; + void setVariableParameterFields3(unsigned short pX); - unsigned char getVariableParameterFields4() const; - void setVariableParameterFields4(unsigned char pX); + unsigned char getVariableParameterFields4() const; + void setVariableParameterFields4(unsigned char pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const VariableParameter& rhs) const; + bool operator==(const VariableParameter& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -77,7 +75,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VariableTransmitterParameters.cpp b/src/dis7/VariableTransmitterParameters.cpp index 405af394..4c292d8f 100644 --- a/src/dis7/VariableTransmitterParameters.cpp +++ b/src/dis7/VariableTransmitterParameters.cpp @@ -2,74 +2,60 @@ using namespace DIS; +VariableTransmitterParameters::VariableTransmitterParameters() + : _recordType(4), _recordLength(4) {} -VariableTransmitterParameters::VariableTransmitterParameters(): - _recordType(4), - _recordLength(4) -{ -} - -VariableTransmitterParameters::~VariableTransmitterParameters() -{ -} +VariableTransmitterParameters::~VariableTransmitterParameters() {} -unsigned int VariableTransmitterParameters::getRecordType() const -{ - return _recordType; +unsigned int VariableTransmitterParameters::getRecordType() const { + return _recordType; } -void VariableTransmitterParameters::setRecordType(unsigned int pX) -{ - _recordType = pX; +void VariableTransmitterParameters::setRecordType(unsigned int pX) { + _recordType = pX; } -unsigned int VariableTransmitterParameters::getRecordLength() const -{ - return _recordLength; +unsigned int VariableTransmitterParameters::getRecordLength() const { + return _recordLength; } -void VariableTransmitterParameters::setRecordLength(unsigned int pX) -{ - _recordLength = pX; +void VariableTransmitterParameters::setRecordLength(unsigned int pX) { + _recordLength = pX; } -void VariableTransmitterParameters::marshal(DataStream& dataStream) const -{ - dataStream << _recordType; - dataStream << _recordLength; +void VariableTransmitterParameters::marshal(DataStream& dataStream) const { + dataStream << _recordType; + dataStream << _recordLength; } -void VariableTransmitterParameters::unmarshal(DataStream& dataStream) -{ - dataStream >> _recordType; - dataStream >> _recordLength; +void VariableTransmitterParameters::unmarshal(DataStream& dataStream) { + dataStream >> _recordType; + dataStream >> _recordLength; } +bool VariableTransmitterParameters::operator==( + const VariableTransmitterParameters& rhs) const { + bool ivarsEqual = true; -bool VariableTransmitterParameters::operator ==(const VariableTransmitterParameters& rhs) const - { - bool ivarsEqual = true; + if (!(_recordType == rhs._recordType)) ivarsEqual = false; + if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; - if( ! (_recordType == rhs._recordType) ) ivarsEqual = false; - if( ! (_recordLength == rhs._recordLength) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int VariableTransmitterParameters::getMarshalledSize() const -{ - int marshalSize = 0; +int VariableTransmitterParameters::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _recordType - marshalSize = marshalSize + 4; // _recordLength - return marshalSize; + marshalSize = marshalSize + 4; // _recordType + marshalSize = marshalSize + 4; // _recordLength + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +68,7 @@ int VariableTransmitterParameters::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VariableTransmitterParameters.h b/src/dis7/VariableTransmitterParameters.h index 02b9530e..9dc494c6 100644 --- a/src/dis7/VariableTransmitterParameters.h +++ b/src/dis7/VariableTransmitterParameters.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Relates to radios. NOT COMPLETE. Section 6.2.94 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT VariableTransmitterParameters -{ -protected: +class OPENDIS7_EXPORT VariableTransmitterParameters { + protected: /** Type of VTP. Enumeration from EBV */ - unsigned int _recordType; + unsigned int _recordType; /** Length, in bytes */ - unsigned int _recordLength; - + unsigned int _recordLength; public: - VariableTransmitterParameters(); - virtual ~VariableTransmitterParameters(); + VariableTransmitterParameters(); + virtual ~VariableTransmitterParameters(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + unsigned int getRecordType() const; + void setRecordType(unsigned int pX); - unsigned int getRecordLength() const; - void setRecordLength(unsigned int pX); + unsigned int getRecordLength() const; + void setRecordLength(unsigned int pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const VariableTransmitterParameters& rhs) const; + bool operator==(const VariableTransmitterParameters& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Vector2Float.cpp b/src/dis7/Vector2Float.cpp index cf031490..d9444f35 100644 --- a/src/dis7/Vector2Float.cpp +++ b/src/dis7/Vector2Float.cpp @@ -2,74 +2,50 @@ using namespace DIS; +Vector2Float::Vector2Float() : _x(0.0), _y(0.0) {} -Vector2Float::Vector2Float(): - _x(0.0), - _y(0.0) -{ -} +Vector2Float::~Vector2Float() {} -Vector2Float::~Vector2Float() -{ -} +float Vector2Float::getX() const { return _x; } -float Vector2Float::getX() const -{ - return _x; -} +void Vector2Float::setX(float pX) { _x = pX; } -void Vector2Float::setX(float pX) -{ - _x = pX; -} +float Vector2Float::getY() const { return _y; } -float Vector2Float::getY() const -{ - return _y; -} +void Vector2Float::setY(float pX) { _y = pX; } -void Vector2Float::setY(float pX) -{ - _y = pX; +void Vector2Float::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; } -void Vector2Float::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; -} - -void Vector2Float::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; +void Vector2Float::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; } +bool Vector2Float::operator==(const Vector2Float& rhs) const { + bool ivarsEqual = true; -bool Vector2Float::operator ==(const Vector2Float& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Vector2Float::getMarshalledSize() const -{ - int marshalSize = 0; +int Vector2Float::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - return marshalSize; + marshalSize = marshalSize + 4; // _x + marshalSize = marshalSize + 4; // _y + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +58,7 @@ int Vector2Float::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Vector2Float.h b/src/dis7/Vector2Float.h index e192d75e..056f204b 100644 --- a/src/dis7/Vector2Float.h +++ b/src/dis7/Vector2Float.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Two floating point values, x, y -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Vector2Float -{ -protected: +class OPENDIS7_EXPORT Vector2Float { + protected: /** X value */ - float _x; + float _x; /** y Value */ - float _y; - + float _y; public: - Vector2Float(); - virtual ~Vector2Float(); + Vector2Float(); + virtual ~Vector2Float(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getX() const; - void setX(float pX); + float getX() const; + void setX(float pX); - float getY() const; - void setY(float pX); + float getY() const; + void setY(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Vector2Float& rhs) const; + bool operator==(const Vector2Float& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Vector3Double.cpp b/src/dis7/Vector3Double.cpp index 2ab2473a..6a74895e 100644 --- a/src/dis7/Vector3Double.cpp +++ b/src/dis7/Vector3Double.cpp @@ -2,89 +2,58 @@ using namespace DIS; +Vector3Double::Vector3Double() : _x(0.0), _y(0.0), _z(0.0) {} -Vector3Double::Vector3Double(): - _x(0.0), - _y(0.0), - _z(0.0) -{ -} +Vector3Double::~Vector3Double() {} -Vector3Double::~Vector3Double() -{ -} +double Vector3Double::getX() const { return _x; } -double Vector3Double::getX() const -{ - return _x; -} +void Vector3Double::setX(double pX) { _x = pX; } -void Vector3Double::setX(double pX) -{ - _x = pX; -} +double Vector3Double::getY() const { return _y; } -double Vector3Double::getY() const -{ - return _y; -} +void Vector3Double::setY(double pX) { _y = pX; } -void Vector3Double::setY(double pX) -{ - _y = pX; -} +double Vector3Double::getZ() const { return _z; } -double Vector3Double::getZ() const -{ - return _z; -} - -void Vector3Double::setZ(double pX) -{ - _z = pX; -} +void Vector3Double::setZ(double pX) { _z = pX; } -void Vector3Double::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; - dataStream << _z; +void Vector3Double::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; + dataStream << _z; } -void Vector3Double::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; +void Vector3Double::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; + dataStream >> _z; } +bool Vector3Double::operator==(const Vector3Double& rhs) const { + bool ivarsEqual = true; -bool Vector3Double::operator ==(const Vector3Double& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; + if (!(_z == rhs._z)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - if( ! (_z == rhs._z) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Vector3Double::getMarshalledSize() const -{ - int marshalSize = 0; +int Vector3Double::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 8; // _x - marshalSize = marshalSize + 8; // _y - marshalSize = marshalSize + 8; // _z - return marshalSize; + marshalSize = marshalSize + 8; // _x + marshalSize = marshalSize + 8; // _y + marshalSize = marshalSize + 8; // _z + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int Vector3Double::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Vector3Double.h b/src/dis7/Vector3Double.h index ebee9a59..53ecd505 100644 --- a/src/dis7/Vector3Double.h +++ b/src/dis7/Vector3Double.h @@ -1,58 +1,55 @@ #pragma once -#include #include +#include +namespace DIS { +// Three double precision floating point values, x, y, and z. Used for world +// coordinates Section 6.2.97. -namespace DIS -{ -// Three double precision floating point values, x, y, and z. Used for world coordinates Section 6.2.97. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Vector3Double -{ -protected: +class OPENDIS7_EXPORT Vector3Double { + protected: /** X value */ - double _x; + double _x; /** y Value */ - double _y; + double _y; /** Z value */ - double _z; - + double _z; public: - Vector3Double(); - virtual ~Vector3Double(); + Vector3Double(); + virtual ~Vector3Double(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - double getX() const; - void setX(double pX); + double getX() const; + void setX(double pX); - double getY() const; - void setY(double pX); + double getY() const; + void setY(double pX); - double getZ() const; - void setZ(double pX); + double getZ() const; + void setZ(double pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Vector3Double& rhs) const; + bool operator==(const Vector3Double& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +62,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Vector3Float.cpp b/src/dis7/Vector3Float.cpp index c68d34cc..66e857b0 100644 --- a/src/dis7/Vector3Float.cpp +++ b/src/dis7/Vector3Float.cpp @@ -2,89 +2,58 @@ using namespace DIS; +Vector3Float::Vector3Float() : _x(0.0), _y(0.0), _z(0.0) {} -Vector3Float::Vector3Float(): - _x(0.0), - _y(0.0), - _z(0.0) -{ -} +Vector3Float::~Vector3Float() {} -Vector3Float::~Vector3Float() -{ -} +float Vector3Float::getX() const { return _x; } -float Vector3Float::getX() const -{ - return _x; -} +void Vector3Float::setX(float pX) { _x = pX; } -void Vector3Float::setX(float pX) -{ - _x = pX; -} +float Vector3Float::getY() const { return _y; } -float Vector3Float::getY() const -{ - return _y; -} +void Vector3Float::setY(float pX) { _y = pX; } -void Vector3Float::setY(float pX) -{ - _y = pX; -} +float Vector3Float::getZ() const { return _z; } -float Vector3Float::getZ() const -{ - return _z; -} - -void Vector3Float::setZ(float pX) -{ - _z = pX; -} +void Vector3Float::setZ(float pX) { _z = pX; } -void Vector3Float::marshal(DataStream& dataStream) const -{ - dataStream << _x; - dataStream << _y; - dataStream << _z; +void Vector3Float::marshal(DataStream& dataStream) const { + dataStream << _x; + dataStream << _y; + dataStream << _z; } -void Vector3Float::unmarshal(DataStream& dataStream) -{ - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; +void Vector3Float::unmarshal(DataStream& dataStream) { + dataStream >> _x; + dataStream >> _y; + dataStream >> _z; } +bool Vector3Float::operator==(const Vector3Float& rhs) const { + bool ivarsEqual = true; -bool Vector3Float::operator ==(const Vector3Float& rhs) const - { - bool ivarsEqual = true; + if (!(_x == rhs._x)) ivarsEqual = false; + if (!(_y == rhs._y)) ivarsEqual = false; + if (!(_z == rhs._z)) ivarsEqual = false; - if( ! (_x == rhs._x) ) ivarsEqual = false; - if( ! (_y == rhs._y) ) ivarsEqual = false; - if( ! (_z == rhs._z) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int Vector3Float::getMarshalledSize() const -{ - int marshalSize = 0; +int Vector3Float::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - marshalSize = marshalSize + 4; // _z - return marshalSize; + marshalSize = marshalSize + 4; // _x + marshalSize = marshalSize + 4; // _y + marshalSize = marshalSize + 4; // _z + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -97,7 +66,7 @@ int Vector3Float::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/Vector3Float.h b/src/dis7/Vector3Float.h index e2a028e8..12ddc338 100644 --- a/src/dis7/Vector3Float.h +++ b/src/dis7/Vector3Float.h @@ -1,58 +1,54 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Three floating point values, x, y, and z. Section 6.2.95 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT Vector3Float -{ -protected: +class OPENDIS7_EXPORT Vector3Float { + protected: /** X value */ - float _x; + float _x; /** y Value */ - float _y; + float _y; /** Z value */ - float _z; - + float _z; public: - Vector3Float(); - virtual ~Vector3Float(); + Vector3Float(); + virtual ~Vector3Float(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getX() const; - void setX(float pX); + float getX() const; + void setX(float pX); - float getY() const; - void setY(float pX); + float getY() const; + void setY(float pX); - float getZ() const; - void setZ(float pX); + float getZ() const; + void setZ(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const Vector3Float& rhs) const; + bool operator==(const Vector3Float& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -65,7 +61,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VectoringNozzleSystem.cpp b/src/dis7/VectoringNozzleSystem.cpp index 185b996b..9c1e8900 100644 --- a/src/dis7/VectoringNozzleSystem.cpp +++ b/src/dis7/VectoringNozzleSystem.cpp @@ -2,74 +2,61 @@ using namespace DIS; +VectoringNozzleSystem::VectoringNozzleSystem() + : _horizontalDeflectionAngle(0.0), _verticalDeflectionAngle(0.0) {} -VectoringNozzleSystem::VectoringNozzleSystem(): - _horizontalDeflectionAngle(0.0), - _verticalDeflectionAngle(0.0) -{ -} - -VectoringNozzleSystem::~VectoringNozzleSystem() -{ -} +VectoringNozzleSystem::~VectoringNozzleSystem() {} -float VectoringNozzleSystem::getHorizontalDeflectionAngle() const -{ - return _horizontalDeflectionAngle; +float VectoringNozzleSystem::getHorizontalDeflectionAngle() const { + return _horizontalDeflectionAngle; } -void VectoringNozzleSystem::setHorizontalDeflectionAngle(float pX) -{ - _horizontalDeflectionAngle = pX; +void VectoringNozzleSystem::setHorizontalDeflectionAngle(float pX) { + _horizontalDeflectionAngle = pX; } -float VectoringNozzleSystem::getVerticalDeflectionAngle() const -{ - return _verticalDeflectionAngle; +float VectoringNozzleSystem::getVerticalDeflectionAngle() const { + return _verticalDeflectionAngle; } -void VectoringNozzleSystem::setVerticalDeflectionAngle(float pX) -{ - _verticalDeflectionAngle = pX; +void VectoringNozzleSystem::setVerticalDeflectionAngle(float pX) { + _verticalDeflectionAngle = pX; } -void VectoringNozzleSystem::marshal(DataStream& dataStream) const -{ - dataStream << _horizontalDeflectionAngle; - dataStream << _verticalDeflectionAngle; +void VectoringNozzleSystem::marshal(DataStream& dataStream) const { + dataStream << _horizontalDeflectionAngle; + dataStream << _verticalDeflectionAngle; } -void VectoringNozzleSystem::unmarshal(DataStream& dataStream) -{ - dataStream >> _horizontalDeflectionAngle; - dataStream >> _verticalDeflectionAngle; +void VectoringNozzleSystem::unmarshal(DataStream& dataStream) { + dataStream >> _horizontalDeflectionAngle; + dataStream >> _verticalDeflectionAngle; } +bool VectoringNozzleSystem::operator==(const VectoringNozzleSystem& rhs) const { + bool ivarsEqual = true; -bool VectoringNozzleSystem::operator ==(const VectoringNozzleSystem& rhs) const - { - bool ivarsEqual = true; + if (!(_horizontalDeflectionAngle == rhs._horizontalDeflectionAngle)) + ivarsEqual = false; + if (!(_verticalDeflectionAngle == rhs._verticalDeflectionAngle)) + ivarsEqual = false; - if( ! (_horizontalDeflectionAngle == rhs._horizontalDeflectionAngle) ) ivarsEqual = false; - if( ! (_verticalDeflectionAngle == rhs._verticalDeflectionAngle) ) ivarsEqual = false; - - return ivarsEqual; - } + return ivarsEqual; +} -int VectoringNozzleSystem::getMarshalledSize() const -{ - int marshalSize = 0; +int VectoringNozzleSystem::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = marshalSize + 4; // _horizontalDeflectionAngle - marshalSize = marshalSize + 4; // _verticalDeflectionAngle - return marshalSize; + marshalSize = marshalSize + 4; // _horizontalDeflectionAngle + marshalSize = marshalSize + 4; // _verticalDeflectionAngle + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -82,7 +69,7 @@ int VectoringNozzleSystem::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/VectoringNozzleSystem.h b/src/dis7/VectoringNozzleSystem.h index 383e25f5..d73f04ea 100644 --- a/src/dis7/VectoringNozzleSystem.h +++ b/src/dis7/VectoringNozzleSystem.h @@ -1,52 +1,48 @@ #pragma once -#include #include +#include - -namespace DIS -{ +namespace DIS { // Operational data for describing the vectoring nozzle systems Section 6.2.96 -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT VectoringNozzleSystem -{ -protected: +class OPENDIS7_EXPORT VectoringNozzleSystem { + protected: /** In degrees */ - float _horizontalDeflectionAngle; + float _horizontalDeflectionAngle; /** In degrees */ - float _verticalDeflectionAngle; - + float _verticalDeflectionAngle; public: - VectoringNozzleSystem(); - virtual ~VectoringNozzleSystem(); + VectoringNozzleSystem(); + virtual ~VectoringNozzleSystem(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - float getHorizontalDeflectionAngle() const; - void setHorizontalDeflectionAngle(float pX); + float getHorizontalDeflectionAngle() const; + void setHorizontalDeflectionAngle(float pX); - float getVerticalDeflectionAngle() const; - void setVerticalDeflectionAngle(float pX); + float getVerticalDeflectionAngle() const; + void setVerticalDeflectionAngle(float pX); + virtual int getMarshalledSize() const; -virtual int getMarshalledSize() const; - - bool operator ==(const VectoringNozzleSystem& rhs) const; + bool operator==(const VectoringNozzleSystem& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -59,7 +55,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/WarfareFamilyPdu.cpp b/src/dis7/WarfareFamilyPdu.cpp index 1c3c998b..33ae0bc6 100644 --- a/src/dis7/WarfareFamilyPdu.cpp +++ b/src/dis7/WarfareFamilyPdu.cpp @@ -2,90 +2,72 @@ using namespace DIS; - -WarfareFamilyPdu::WarfareFamilyPdu() : Pdu(), - _firingEntityID(), - _targetEntityID() -{ - setProtocolFamily( 2 ); +WarfareFamilyPdu::WarfareFamilyPdu() + : Pdu(), _firingEntityID(), _targetEntityID() { + setProtocolFamily(2); } -WarfareFamilyPdu::~WarfareFamilyPdu() -{ -} +WarfareFamilyPdu::~WarfareFamilyPdu() {} -EntityID& WarfareFamilyPdu::getFiringEntityID() -{ - return _firingEntityID; -} +EntityID& WarfareFamilyPdu::getFiringEntityID() { return _firingEntityID; } -const EntityID& WarfareFamilyPdu::getFiringEntityID() const -{ - return _firingEntityID; +const EntityID& WarfareFamilyPdu::getFiringEntityID() const { + return _firingEntityID; } -void WarfareFamilyPdu::setFiringEntityID(const EntityID &pX) -{ - _firingEntityID = pX; +void WarfareFamilyPdu::setFiringEntityID(const EntityID& pX) { + _firingEntityID = pX; } -EntityID& WarfareFamilyPdu::getTargetEntityID() -{ - return _targetEntityID; -} +EntityID& WarfareFamilyPdu::getTargetEntityID() { return _targetEntityID; } -const EntityID& WarfareFamilyPdu::getTargetEntityID() const -{ - return _targetEntityID; +const EntityID& WarfareFamilyPdu::getTargetEntityID() const { + return _targetEntityID; } -void WarfareFamilyPdu::setTargetEntityID(const EntityID &pX) -{ - _targetEntityID = pX; +void WarfareFamilyPdu::setTargetEntityID(const EntityID& pX) { + _targetEntityID = pX; } -void WarfareFamilyPdu::marshal(DataStream& dataStream) const -{ - Pdu::marshal(dataStream); // Marshal information in superclass first - _firingEntityID.marshal(dataStream); - _targetEntityID.marshal(dataStream); +void WarfareFamilyPdu::marshal(DataStream& dataStream) const { + Pdu::marshal(dataStream); // Marshal information in superclass first + _firingEntityID.marshal(dataStream); + _targetEntityID.marshal(dataStream); } -void WarfareFamilyPdu::unmarshal(DataStream& dataStream) -{ - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _firingEntityID.unmarshal(dataStream); - _targetEntityID.unmarshal(dataStream); +void WarfareFamilyPdu::unmarshal(DataStream& dataStream) { + Pdu::unmarshal(dataStream); // unmarshal information in superclass first + _firingEntityID.unmarshal(dataStream); + _targetEntityID.unmarshal(dataStream); } +bool WarfareFamilyPdu::operator==(const WarfareFamilyPdu& rhs) const { + bool ivarsEqual = true; -bool WarfareFamilyPdu::operator ==(const WarfareFamilyPdu& rhs) const - { - bool ivarsEqual = true; - - ivarsEqual = Pdu::operator==(rhs); + ivarsEqual = Pdu::operator==(rhs); - if( ! (_firingEntityID == rhs._firingEntityID) ) ivarsEqual = false; - if( ! (_targetEntityID == rhs._targetEntityID) ) ivarsEqual = false; + if (!(_firingEntityID == rhs._firingEntityID)) ivarsEqual = false; + if (!(_targetEntityID == rhs._targetEntityID)) ivarsEqual = false; - return ivarsEqual; - } + return ivarsEqual; +} -int WarfareFamilyPdu::getMarshalledSize() const -{ - int marshalSize = 0; +int WarfareFamilyPdu::getMarshalledSize() const { + int marshalSize = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = marshalSize + _firingEntityID.getMarshalledSize(); // _firingEntityID - marshalSize = marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID - return marshalSize; + marshalSize = Pdu::getMarshalledSize(); + marshalSize = + marshalSize + _firingEntityID.getMarshalledSize(); // _firingEntityID + marshalSize = + marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID + return marshalSize; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -98,7 +80,7 @@ int WarfareFamilyPdu::getMarshalledSize() const // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/WarfareFamilyPdu.h b/src/dis7/WarfareFamilyPdu.h index 7ae64367..a82e80d5 100644 --- a/src/dis7/WarfareFamilyPdu.h +++ b/src/dis7/WarfareFamilyPdu.h @@ -1,57 +1,53 @@ #pragma once -#include #include #include -#include #include +#include +namespace DIS { +// abstract superclass for fire and detonation pdus that have shared +// information. Section 7.3 COMPLETE -namespace DIS -{ -// abstract superclass for fire and detonation pdus that have shared information. Section 7.3 COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All rights reserved. +// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All +// rights reserved. // // @author DMcG, jkg -class OPENDIS7_EXPORT WarfareFamilyPdu : public Pdu -{ -protected: +class OPENDIS7_EXPORT WarfareFamilyPdu : public Pdu { + protected: /** ID of the entity that shot */ - EntityID _firingEntityID; + EntityID _firingEntityID; /** ID of the entity that is being shot at */ - EntityID _targetEntityID; - + EntityID _targetEntityID; public: - WarfareFamilyPdu(); - virtual ~WarfareFamilyPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + WarfareFamilyPdu(); + virtual ~WarfareFamilyPdu(); - EntityID& getFiringEntityID(); - const EntityID& getFiringEntityID() const; - void setFiringEntityID(const EntityID &pX); + virtual void marshal(DataStream& dataStream) const; + virtual void unmarshal(DataStream& dataStream); - EntityID& getTargetEntityID(); - const EntityID& getTargetEntityID() const; - void setTargetEntityID(const EntityID &pX); + EntityID& getFiringEntityID(); + const EntityID& getFiringEntityID() const; + void setFiringEntityID(const EntityID& pX); + EntityID& getTargetEntityID(); + const EntityID& getTargetEntityID() const; + void setTargetEntityID(const EntityID& pX); -virtual int getMarshalledSize() const; + virtual int getMarshalledSize() const; - bool operator ==(const WarfareFamilyPdu& rhs) const; + bool operator==(const WarfareFamilyPdu& rhs) const; }; -} +} // namespace DIS // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above copyright @@ -64,7 +60,7 @@ virtual int getMarshalledSize() const; // nor the names of its contributors may be used to endorse or // promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS diff --git a/src/dis7/utils/DataStream.cpp b/src/dis7/utils/DataStream.cpp index 3cf24912..379ef45f 100644 --- a/src/dis7/utils/DataStream.cpp +++ b/src/dis7/utils/DataStream.cpp @@ -1,284 +1,225 @@ -#include +#include // for debug output -#include // for debug output +#include using namespace DIS; DataStream::DataStream(Endian stream) - : _buffer() - , _read_pos(0) - , _write_pos(0) - , _stream_endian(stream) - , _machine_endian(LITTLE) -{ - long one(1); - char e = (reinterpret_cast( &one ))[0]; - - if( e == (char)1 ) - { - _machine_endian = LITTLE; - } - else - { - _machine_endian = BIG; - } + : _buffer(), + _read_pos(0), + _write_pos(0), + _stream_endian(stream), + _machine_endian(LITTLE) { + long one(1); + char e = (reinterpret_cast(&one))[0]; + + if (e == (char)1) { + _machine_endian = LITTLE; + } else { + _machine_endian = BIG; + } } DataStream::DataStream(const char* buffer, size_t length, Endian stream) - : _buffer() - , _read_pos(0) - , _write_pos(0) - , _stream_endian(stream) - , _machine_endian(LITTLE) -{ - long one(1); - char e = (reinterpret_cast( &one ))[0]; - - if( e == (char)1 ) - { - _machine_endian = LITTLE; - } - else - { - _machine_endian = BIG; - } - - SetStream( buffer, length, stream ); -} -DataStream::~DataStream() -{ + : _buffer(), + _read_pos(0), + _write_pos(0), + _stream_endian(stream), + _machine_endian(LITTLE) { + long one(1); + char e = (reinterpret_cast(&one))[0]; + + if (e == (char)1) { + _machine_endian = LITTLE; + } else { + _machine_endian = BIG; + } + + SetStream(buffer, length, stream); } +DataStream::~DataStream() {} -//const DataStream::BufferType& DataStream::GetBuffer() const +// const DataStream::BufferType& DataStream::GetBuffer() const //{ -// return _buffer; -//} +// return _buffer; +// } -Endian DataStream::GetStreamEndian() const -{ - return _stream_endian; -} +Endian DataStream::GetStreamEndian() const { return _stream_endian; } -Endian DataStream::GetMachineEndian() const -{ - return _machine_endian; -} +Endian DataStream::GetMachineEndian() const { return _machine_endian; } -size_t DataStream::GetWritePos() const -{ - return _write_pos; -} +size_t DataStream::GetWritePos() const { return _write_pos; } -size_t DataStream::GetReadPos() const -{ - return _read_pos; -} +size_t DataStream::GetReadPos() const { return _read_pos; } -size_t DataStream::size() const -{ - return _buffer.size(); -} +size_t DataStream::size() const { return _buffer.size(); } -void DataStream::clear() -{ - _write_pos = 0; - _read_pos = 0; - _buffer.clear(); +void DataStream::clear() { + _write_pos = 0; + _read_pos = 0; + _buffer.clear(); } -bool DataStream::empty() const -{ - return _buffer.empty(); -} +bool DataStream::empty() const { return _buffer.empty(); } -const char& DataStream::operator [](unsigned int offset) const -{ - return _buffer[_read_pos+offset]; +const char& DataStream::operator[](unsigned int offset) const { + return _buffer[_read_pos + offset]; } // currently copies the source data. -void DataStream::SetStream(const char* buffer, size_t length, Endian stream) -{ - // reassign the endian - _stream_endian = stream; - - _write_pos = length; - _read_pos = 0; - - // resize the array - if( _buffer.size() < length ) - { - _buffer.resize( length ); - } - - // take ownership of the data - // copy the data, expensive! - for(unsigned int i=0; i>(char& c) -{ - ReadAlgorithm( c ); - return *this; +DataStream& DataStream::operator>>(char& c) { + ReadAlgorithm(c); + return *this; } -DataStream& DataStream::operator >>(unsigned char& c) -{ - ReadAlgorithm( c ); - return *this; +DataStream& DataStream::operator>>(unsigned char& c) { + ReadAlgorithm(c); + return *this; } -DataStream& DataStream::operator >>(float& f) -{ - ReadAlgorithm( f ); - return *this; +DataStream& DataStream::operator>>(float& f) { + ReadAlgorithm(f); + return *this; } -DataStream& DataStream::operator >>(double& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(double& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(int& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(int& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(unsigned int& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(unsigned int& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(long long& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(long long& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(unsigned long long& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(unsigned long long& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(unsigned short& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(unsigned short& d) { + ReadAlgorithm(d); + return *this; } -DataStream& DataStream::operator >>(short& d) -{ - ReadAlgorithm( d ); - return *this; +DataStream& DataStream::operator>>(short& d) { + ReadAlgorithm(d); + return *this; } diff --git a/src/dis7/utils/DataStream.h b/src/dis7/utils/DataStream.h index 99c78bf3..2215bf7f 100644 --- a/src/dis7/utils/DataStream.h +++ b/src/dis7/utils/DataStream.h @@ -6,148 +6,142 @@ #define _dcl_dis_data_stream_h_ // the class member, DataStream::BufferType is causing warnign 4251. -// disable it until a proper fix is found, as instructed from the enlightening article: -// http://www.unknownroad.com/rtfm/VisualStudio/warningC4251.html +// disable it until a proper fix is found, as instructed from the enlightening +// article: http://www.unknownroad.com/rtfm/VisualStudio/warningC4251.html #if _MSC_VER -#pragma warning( push ) -#pragma warning( disable : 4251 ) +#pragma warning(push) +#pragma warning(disable : 4251) #endif -#include // for typedef, member -#include // for typedef, member -#include // for enum -#include // for library symbols -#include // for size_t and NULL definition -#include // for memcpy - -namespace DIS -{ - /// a class to support managing a network buffer. - /// the clients are responsible for managing the char buffer memory. - /// this class explicitly defines operators for expected types. - class OPENDIS7_EXPORT DataStream - { - public: - /// Setup the internal buffer's Endian type. - /// @param stream the Endian type to use for the internal buffer, - /// which will be used for network socket writes. - DataStream(Endian stream); - - /// Setup the internal buffer. - /// @param buffer the data to copy and manage. - /// @param length the number of bytes in the buffer. - /// @param stream the Endian type to use for the internal buffer, - DataStream(const char* buffer, size_t length, Endian stream); - ~DataStream(); - - /// a method for reading the stored buffer data. - /// @param offset the index distance with respect to the current read point. - const char& operator [](unsigned int offset) const; - - /// take ownership of the data buffer. - void SetStream(const char* buffer, size_t length, Endian order); - - // write operations - DataStream& operator <<(bool c); - DataStream& operator <<(char c); - DataStream& operator <<(unsigned char c); - DataStream& operator <<(float c); - DataStream& operator <<(double c); - DataStream& operator <<(int c); - DataStream& operator <<(unsigned int c); - DataStream& operator <<(long long c); - DataStream& operator <<(unsigned long long c); - DataStream& operator <<(unsigned short c); - DataStream& operator <<(short c); - - // read operations - DataStream& operator >>(bool& c); - DataStream& operator >>(char& c); - DataStream& operator >>(unsigned char& c); - DataStream& operator >>(float& c); - DataStream& operator >>(double& c); - DataStream& operator >>(int& c); - DataStream& operator >>(unsigned int& c); - DataStream& operator >>(long long& c); - DataStream& operator >>(unsigned long long& c); - DataStream& operator >>(unsigned short& c); - DataStream& operator >>(short& c); - - Endian GetStreamEndian() const; - Endian GetMachineEndian() const; - - size_t GetWritePos() const; - size_t GetReadPos() const; - - size_t size() const; - - void clear(); - - bool empty() const; - - private: - template - void IncrementPointer(IterT& iter) - { - iter += sizeof(T); - } - - template - void DecrementPointer(IterT& iter) - { - iter -= sizeof(T); - } - - /// this algorithm should only be used for primitive types, - /// because the class size takes into account the virtual function table. - template - void WriteAlgorithm(T t) - { - char* ch = reinterpret_cast( &t ); - DoFlip( ch , sizeof(T) ); - DoWrite( ch , sizeof(T) ); - IncrementPointer( _write_pos ); - } - - /// this algorithm should only be used for primitive types, - /// because the class size takes into account the virtual function table. - template - void ReadAlgorithm(T& t) - { - char ch[sizeof(T)]; - DoRead( ch , sizeof(T) ); - DoFlip( ch , sizeof(T) ); - memcpy(&t, ch, sizeof(t)); - IncrementPointer( _read_pos ); - } - - /// will flip the buffer if the buffer endian is different than the machine's. - void DoFlip(char* buf, size_t bufsize); - - void DoWrite(const char* buf, size_t bufsize); - - void DoRead(char* ch, size_t bufsize); - - - typedef std::vector BufferType; - //const BufferType& GetBuffer() const; - - BufferType _buffer; - - /// the location of the read/write. - size_t _read_pos; - size_t _write_pos; - - /// the requirement for the managed buffer - Endian _stream_endian; - - /// the native endian type - Endian _machine_endian; - }; -} +#include // for size_t and NULL definition +#include // for memcpy +#include // for typedef, member +#include // for typedef, member + +#include // for library symbols +#include // for enum + +namespace DIS { +/// a class to support managing a network buffer. +/// the clients are responsible for managing the char buffer memory. +/// this class explicitly defines operators for expected types. +class OPENDIS7_EXPORT DataStream { + public: + /// Setup the internal buffer's Endian type. + /// @param stream the Endian type to use for the internal buffer, + /// which will be used for network socket writes. + DataStream(Endian stream); + + /// Setup the internal buffer. + /// @param buffer the data to copy and manage. + /// @param length the number of bytes in the buffer. + /// @param stream the Endian type to use for the internal buffer, + DataStream(const char* buffer, size_t length, Endian stream); + ~DataStream(); + + /// a method for reading the stored buffer data. + /// @param offset the index distance with respect to the current read point. + const char& operator[](unsigned int offset) const; + + /// take ownership of the data buffer. + void SetStream(const char* buffer, size_t length, Endian order); + + // write operations + DataStream& operator<<(bool c); + DataStream& operator<<(char c); + DataStream& operator<<(unsigned char c); + DataStream& operator<<(float c); + DataStream& operator<<(double c); + DataStream& operator<<(int c); + DataStream& operator<<(unsigned int c); + DataStream& operator<<(long long c); + DataStream& operator<<(unsigned long long c); + DataStream& operator<<(unsigned short c); + DataStream& operator<<(short c); + + // read operations + DataStream& operator>>(bool& c); + DataStream& operator>>(char& c); + DataStream& operator>>(unsigned char& c); + DataStream& operator>>(float& c); + DataStream& operator>>(double& c); + DataStream& operator>>(int& c); + DataStream& operator>>(unsigned int& c); + DataStream& operator>>(long long& c); + DataStream& operator>>(unsigned long long& c); + DataStream& operator>>(unsigned short& c); + DataStream& operator>>(short& c); + + Endian GetStreamEndian() const; + Endian GetMachineEndian() const; + + size_t GetWritePos() const; + size_t GetReadPos() const; + + size_t size() const; + + void clear(); + + bool empty() const; + + private: + template + void IncrementPointer(IterT& iter) { + iter += sizeof(T); + } + + template + void DecrementPointer(IterT& iter) { + iter -= sizeof(T); + } + + /// this algorithm should only be used for primitive types, + /// because the class size takes into account the virtual function table. + template + void WriteAlgorithm(T t) { + char* ch = reinterpret_cast(&t); + DoFlip(ch, sizeof(T)); + DoWrite(ch, sizeof(T)); + IncrementPointer(_write_pos); + } + + /// this algorithm should only be used for primitive types, + /// because the class size takes into account the virtual function table. + template + void ReadAlgorithm(T& t) { + char ch[sizeof(T)]; + DoRead(ch, sizeof(T)); + DoFlip(ch, sizeof(T)); + memcpy(&t, ch, sizeof(t)); + IncrementPointer(_read_pos); + } + + /// will flip the buffer if the buffer endian is different than the machine's. + void DoFlip(char* buf, size_t bufsize); + + void DoWrite(const char* buf, size_t bufsize); + + void DoRead(char* ch, size_t bufsize); + + typedef std::vector BufferType; + // const BufferType& GetBuffer() const; + + BufferType _buffer; + + /// the location of the read/write. + size_t _read_pos; + size_t _write_pos; + + /// the requirement for the managed buffer + Endian _stream_endian; + + /// the native endian type + Endian _machine_endian; +}; +} // namespace DIS #if _MSC_VER -#pragma warning( pop ) +#pragma warning(pop) #endif #endif // _dcl_dis_data_stream_h_ diff --git a/src/dis7/utils/Endian.h b/src/dis7/utils/Endian.h index 56d990ce..037f5d80 100644 --- a/src/dis7/utils/Endian.h +++ b/src/dis7/utils/Endian.h @@ -1,16 +1,14 @@ #ifndef _dcl_dis_endian_h_ #define _dcl_dis_endian_h_ -#include // for library symbols +#include // for library symbols -namespace DIS -{ - /// the order of bytes that are on the left - enum OPENDIS7_EXPORT Endian - { - LITTLE=1, - BIG=0, - }; -} +namespace DIS { +/// the order of bytes that are on the left +enum OPENDIS7_EXPORT Endian { + LITTLE = 1, + BIG = 0, +}; +} // namespace DIS -#endif // _dcl_dis_endian_h_ +#endif // _dcl_dis_endian_h_ From 62774f688b8dc06f47e4236f5cc6b45dfa2f0d8e Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Thu, 27 Apr 2023 01:59:12 +0000 Subject: [PATCH 03/22] Some cpplint fixes for dis6 --- src/dis6/AcknowledgePdu.cpp | 10 ++-- src/dis6/AcknowledgePdu.h | 18 +++---- src/dis6/AcknowledgeReliablePdu.cpp | 10 ++-- src/dis6/AcknowledgeReliablePdu.h | 18 +++---- src/dis6/AcousticBeamData.cpp | 10 ++-- src/dis6/AcousticBeamData.h | 18 +++---- src/dis6/AcousticBeamFundamentalParameter.cpp | 10 ++-- src/dis6/AcousticBeamFundamentalParameter.h | 16 +++--- src/dis6/AcousticEmitter.cpp | 6 +-- src/dis6/AcousticEmitter.h | 10 ++-- src/dis6/AcousticEmitterSystem.cpp | 6 +-- src/dis6/AcousticEmitterSystem.h | 10 ++-- src/dis6/AcousticEmitterSystemData.cpp | 8 +-- src/dis6/AcousticEmitterSystemData.h | 16 +++--- src/dis6/ActionRequestPdu.cpp | 6 +-- src/dis6/ActionRequestPdu.h | 10 ++-- src/dis6/ActionRequestReliablePdu.cpp | 10 ++-- src/dis6/ActionRequestReliablePdu.h | 16 +++--- src/dis6/ActionResponsePdu.cpp | 6 +-- src/dis6/ActionResponsePdu.h | 10 ++-- src/dis6/ActionResponseReliablePdu.cpp | 6 +-- src/dis6/ActionResponseReliablePdu.h | 10 ++-- src/dis6/AggregateID.cpp | 14 ++--- src/dis6/AggregateID.h | 22 ++++---- src/dis6/AggregateMarking.cpp | 2 +- src/dis6/AggregateMarking.h | 4 +- src/dis6/AggregateStatePdu.cpp | 28 +++++----- src/dis6/AggregateStatePdu.h | 38 ++++++------- src/dis6/AggregateType.cpp | 6 +-- src/dis6/AggregateType.h | 10 ++-- src/dis6/AngularVelocityVector.cpp | 2 +- src/dis6/AngularVelocityVector.h | 4 +- src/dis6/AntennaLocation.cpp | 2 +- src/dis6/AntennaLocation.h | 8 +-- src/dis6/ApaData.cpp | 10 ++-- src/dis6/ApaData.h | 16 +++--- src/dis6/ArealObjectStatePdu.cpp | 12 ++--- src/dis6/ArealObjectStatePdu.h | 26 ++++----- src/dis6/ArticulationParameter.cpp | 6 +-- src/dis6/ArticulationParameter.h | 10 ++-- src/dis6/BeamAntennaPattern.cpp | 6 +-- src/dis6/BeamAntennaPattern.h | 12 ++--- src/dis6/BeamData.cpp | 2 +- src/dis6/BeamData.h | 4 +- src/dis6/BurstDescriptor.cpp | 18 +++---- src/dis6/BurstDescriptor.h | 30 +++++------ src/dis6/ClockTime.cpp | 2 +- src/dis6/ClockTime.h | 4 +- src/dis6/CollisionElasticPdu.cpp | 6 +-- src/dis6/CollisionElasticPdu.h | 18 +++---- src/dis6/CollisionPdu.cpp | 2 +- src/dis6/CollisionPdu.h | 12 ++--- src/dis6/CommentPdu.cpp | 6 +-- src/dis6/CommentPdu.h | 10 ++-- src/dis6/CommentReliablePdu.cpp | 6 +-- src/dis6/CommentReliablePdu.h | 10 ++-- src/dis6/CreateEntityPdu.cpp | 2 +- src/dis6/CreateEntityPdu.h | 6 +-- src/dis6/CreateEntityReliablePdu.cpp | 6 +-- src/dis6/CreateEntityReliablePdu.h | 12 ++--- src/dis6/DataPdu.cpp | 6 +-- src/dis6/DataPdu.h | 10 ++-- src/dis6/DataQueryPdu.cpp | 6 +-- src/dis6/DataQueryPdu.h | 10 ++-- src/dis6/DataQueryReliablePdu.cpp | 10 ++-- src/dis6/DataQueryReliablePdu.h | 16 +++--- src/dis6/DataReliablePdu.cpp | 10 ++-- src/dis6/DataReliablePdu.h | 16 +++--- src/dis6/DeadReckoningParameter.cpp | 2 +- src/dis6/DeadReckoningParameter.h | 6 +-- src/dis6/DesignatorPdu.cpp | 14 ++--- src/dis6/DesignatorPdu.h | 30 +++++------ src/dis6/DetonationPdu.cpp | 8 +-- src/dis6/DetonationPdu.h | 24 ++++----- src/dis6/DistributedEmissionsFamilyPdu.cpp | 2 +- src/dis6/DistributedEmissionsFamilyPdu.h | 6 +-- src/dis6/EightByteChunk.cpp | 2 +- src/dis6/EightByteChunk.h | 4 +- src/dis6/ElectromagneticEmissionBeamData.cpp | 8 +-- src/dis6/ElectromagneticEmissionBeamData.h | 14 ++--- .../ElectromagneticEmissionSystemData.cpp | 8 +-- src/dis6/ElectromagneticEmissionSystemData.h | 16 +++--- src/dis6/ElectromagneticEmissionsPdu.cpp | 8 +-- src/dis6/ElectromagneticEmissionsPdu.h | 18 +++---- src/dis6/EmitterSystem.cpp | 6 +-- src/dis6/EmitterSystem.h | 10 ++-- src/dis6/EntityID.cpp | 14 ++--- src/dis6/EntityID.h | 22 ++++---- src/dis6/EntityInformationFamilyPdu.cpp | 2 +- src/dis6/EntityInformationFamilyPdu.h | 6 +-- src/dis6/EntityManagementFamilyPdu.cpp | 2 +- src/dis6/EntityManagementFamilyPdu.h | 6 +-- src/dis6/EntityStatePdu.cpp | 4 +- src/dis6/EntityStatePdu.h | 22 ++++---- src/dis6/EntityStateUpdatePdu.cpp | 4 +- src/dis6/EntityStateUpdatePdu.h | 16 +++--- src/dis6/EntityType.cpp | 6 +-- src/dis6/EntityType.h | 10 ++-- src/dis6/Environment.cpp | 2 +- src/dis6/Environment.h | 4 +- src/dis6/EnvironmentalProcessPdu.cpp | 8 +-- src/dis6/EnvironmentalProcessPdu.h | 18 +++---- src/dis6/EventID.cpp | 14 ++--- src/dis6/EventID.h | 22 ++++---- src/dis6/EventReportPdu.cpp | 6 +-- src/dis6/EventReportPdu.h | 10 ++-- src/dis6/EventReportReliablePdu.cpp | 10 ++-- src/dis6/EventReportReliablePdu.h | 16 +++--- src/dis6/FastEntityStatePdu.cpp | 24 ++++----- src/dis6/FastEntityStatePdu.h | 38 ++++++------- src/dis6/FirePdu.cpp | 2 +- src/dis6/FirePdu.h | 16 +++--- src/dis6/FixedDatum.cpp | 2 +- src/dis6/FixedDatum.h | 4 +- src/dis6/FourByteChunk.cpp | 2 +- src/dis6/FourByteChunk.h | 4 +- src/dis6/FundamentalParameterData.cpp | 2 +- src/dis6/FundamentalParameterData.h | 4 +- src/dis6/FundamentalParameterDataIff.cpp | 6 +-- src/dis6/FundamentalParameterDataIff.h | 10 ++-- src/dis6/GridAxisRecord.cpp | 10 ++-- src/dis6/GridAxisRecord.h | 16 +++--- src/dis6/GridAxisRecordRepresentation0.cpp | 6 +-- src/dis6/GridAxisRecordRepresentation0.h | 4 +- src/dis6/GridAxisRecordRepresentation1.cpp | 8 +-- src/dis6/GridAxisRecordRepresentation1.h | 12 ++--- src/dis6/GridAxisRecordRepresentation2.cpp | 8 +-- src/dis6/GridAxisRecordRepresentation2.h | 12 ++--- src/dis6/GriddedDataPdu.cpp | 28 +++++----- src/dis6/GriddedDataPdu.h | 50 ++++++++--------- src/dis6/IffAtcNavAidsLayer1Pdu.cpp | 6 +-- src/dis6/IffAtcNavAidsLayer1Pdu.h | 22 ++++---- src/dis6/IffAtcNavAidsLayer2Pdu.cpp | 4 +- src/dis6/IffAtcNavAidsLayer2Pdu.h | 12 ++--- src/dis6/IffFundamentalData.cpp | 26 ++++----- src/dis6/IffFundamentalData.h | 40 +++++++------- src/dis6/IntercomCommunicationsParameters.cpp | 10 ++-- src/dis6/IntercomCommunicationsParameters.h | 16 +++--- src/dis6/IntercomControlPdu.cpp | 8 +-- src/dis6/IntercomControlPdu.h | 16 +++--- src/dis6/IntercomSignalPdu.cpp | 22 ++++---- src/dis6/IntercomSignalPdu.h | 28 +++++----- src/dis6/IsGroupOfPdu.cpp | 4 +- src/dis6/IsGroupOfPdu.h | 10 ++-- src/dis6/IsPartOfPdu.cpp | 2 +- src/dis6/IsPartOfPdu.h | 16 +++--- src/dis6/LayerHeader.cpp | 6 +-- src/dis6/LayerHeader.h | 10 ++-- src/dis6/LinearObjectStatePdu.cpp | 8 +-- src/dis6/LinearObjectStatePdu.h | 20 +++---- src/dis6/LinearSegmentParameter.cpp | 18 +++---- src/dis6/LinearSegmentParameter.h | 34 ++++++------ src/dis6/LogisticsFamilyPdu.cpp | 2 +- src/dis6/LogisticsFamilyPdu.h | 6 +-- src/dis6/LogisticsPdu.cpp | 2 +- src/dis6/LogisticsPdu.h | 6 +-- src/dis6/Marking.cpp | 2 +- src/dis6/Marking.h | 4 +- src/dis6/MinefieldDataPdu.cpp | 10 ++-- src/dis6/MinefieldDataPdu.h | 20 +++---- src/dis6/MinefieldFamilyPdu.cpp | 2 +- src/dis6/MinefieldFamilyPdu.h | 6 +-- src/dis6/MinefieldPduFamily.cpp | 2 +- src/dis6/MinefieldPduFamily.h | 6 +-- src/dis6/MinefieldQueryPdu.cpp | 6 +-- src/dis6/MinefieldQueryPdu.h | 14 ++--- src/dis6/MinefieldResponseNackPdu.cpp | 4 +- src/dis6/MinefieldResponseNackPdu.h | 10 ++-- src/dis6/MinefieldStatePdu.cpp | 22 ++++---- src/dis6/MinefieldStatePdu.h | 38 ++++++------- src/dis6/ModulationType.cpp | 18 +++---- src/dis6/ModulationType.h | 28 +++++----- src/dis6/NamedLocation.cpp | 10 ++-- src/dis6/NamedLocation.h | 16 +++--- src/dis6/ObjectType.cpp | 6 +-- src/dis6/ObjectType.h | 12 ++--- src/dis6/Orientation.cpp | 2 +- src/dis6/Orientation.h | 4 +- src/dis6/Pdu.cpp | 10 ++-- src/dis6/Pdu.h | 16 +++--- src/dis6/PduContainer.cpp | 4 +- src/dis6/PduContainer.h | 6 +-- src/dis6/Point.cpp | 2 +- src/dis6/Point.h | 4 +- src/dis6/PointObjectStatePdu.cpp | 6 +-- src/dis6/PointObjectStatePdu.h | 22 ++++---- src/dis6/PropulsionSystemData.cpp | 2 +- src/dis6/PropulsionSystemData.h | 4 +- src/dis6/RadioCommunicationsFamilyPdu.cpp | 6 +-- src/dis6/RadioCommunicationsFamilyPdu.h | 14 ++--- src/dis6/RadioEntityType.cpp | 10 ++-- src/dis6/RadioEntityType.h | 16 +++--- src/dis6/ReceiverPdu.cpp | 14 ++--- src/dis6/ReceiverPdu.h | 26 ++++----- src/dis6/RecordQueryReliablePdu.cpp | 12 ++--- src/dis6/RecordQueryReliablePdu.h | 20 +++---- src/dis6/RecordSet.cpp | 14 ++--- src/dis6/RecordSet.h | 22 ++++---- src/dis6/Relationship.cpp | 10 ++-- src/dis6/Relationship.h | 16 +++--- src/dis6/RemoveEntityPdu.cpp | 2 +- src/dis6/RemoveEntityPdu.h | 6 +-- src/dis6/RemoveEntityReliablePdu.cpp | 6 +-- src/dis6/RemoveEntityReliablePdu.h | 12 ++--- src/dis6/RepairCompletePdu.cpp | 10 ++-- src/dis6/RepairCompletePdu.h | 20 +++---- src/dis6/RepairResponsePdu.cpp | 6 +-- src/dis6/RepairResponsePdu.h | 14 ++--- src/dis6/ResupplyCancelPdu.cpp | 2 +- src/dis6/ResupplyCancelPdu.h | 8 +-- src/dis6/ResupplyOfferPdu.cpp | 8 +-- src/dis6/ResupplyOfferPdu.h | 16 +++--- src/dis6/ResupplyReceivedPdu.cpp | 8 +-- src/dis6/ResupplyReceivedPdu.h | 16 +++--- src/dis6/SeesPdu.cpp | 26 ++++----- src/dis6/SeesPdu.h | 38 ++++++------- src/dis6/ServiceRequestPdu.cpp | 8 +-- src/dis6/ServiceRequestPdu.h | 16 +++--- src/dis6/SetDataPdu.cpp | 6 +-- src/dis6/SetDataPdu.h | 10 ++-- src/dis6/SetDataReliablePdu.cpp | 10 ++-- src/dis6/SetDataReliablePdu.h | 16 +++--- src/dis6/SetRecordReliablePdu.cpp | 8 +-- src/dis6/SetRecordReliablePdu.h | 14 ++--- src/dis6/ShaftRPMs.cpp | 10 ++-- src/dis6/ShaftRPMs.h | 16 +++--- src/dis6/SignalPdu.cpp | 16 +++--- src/dis6/SignalPdu.h | 22 ++++---- src/dis6/SimulationAddress.cpp | 10 ++-- src/dis6/SimulationAddress.h | 16 +++--- src/dis6/SimulationManagementFamilyPdu.cpp | 2 +- src/dis6/SimulationManagementFamilyPdu.h | 8 +-- ...tionManagementWithReliabilityFamilyPdu.cpp | 2 +- ...lationManagementWithReliabilityFamilyPdu.h | 8 +-- src/dis6/SixByteChunk.cpp | 2 +- src/dis6/SixByteChunk.h | 4 +- src/dis6/SphericalHarmonicAntennaPattern.cpp | 2 +- src/dis6/SphericalHarmonicAntennaPattern.h | 4 +- src/dis6/StartResumePdu.cpp | 2 +- src/dis6/StartResumePdu.h | 8 +-- src/dis6/StartResumeReliablePdu.cpp | 6 +-- src/dis6/StartResumeReliablePdu.h | 14 ++--- src/dis6/StopFreezePdu.cpp | 6 +-- src/dis6/StopFreezePdu.h | 14 ++--- src/dis6/StopFreezeReliablePdu.cpp | 2 +- src/dis6/StopFreezeReliablePdu.h | 8 +-- src/dis6/SupplyQuantity.cpp | 2 +- src/dis6/SupplyQuantity.h | 6 +-- src/dis6/SyntheticEnvironmentFamilyPdu.cpp | 2 +- src/dis6/SyntheticEnvironmentFamilyPdu.h | 6 +-- src/dis6/SystemID.cpp | 10 ++-- src/dis6/SystemID.h | 16 +++--- src/dis6/TrackJamTarget.cpp | 2 +- src/dis6/TrackJamTarget.h | 6 +-- src/dis6/TransferControlRequestPdu.cpp | 4 +- src/dis6/TransferControlRequestPdu.h | 10 ++-- src/dis6/TransmitterPdu.cpp | 34 ++++++------ src/dis6/TransmitterPdu.h | 54 +++++++++---------- src/dis6/TwoByteChunk.cpp | 2 +- src/dis6/TwoByteChunk.h | 4 +- src/dis6/UaPdu.cpp | 12 ++--- src/dis6/UaPdu.h | 22 ++++---- src/dis6/VariableDatum.cpp | 13 +++-- src/dis6/VariableDatum.h | 4 +- src/dis6/Vector3Double.cpp | 2 +- src/dis6/Vector3Double.h | 4 +- src/dis6/Vector3Float.cpp | 2 +- src/dis6/Vector3Float.h | 4 +- src/dis6/VectoringNozzleSystemData.cpp | 2 +- src/dis6/VectoringNozzleSystemData.h | 4 +- src/dis6/WarfareFamilyPdu.cpp | 2 +- src/dis6/WarfareFamilyPdu.h | 8 +-- src/dis6/symbolic_names.h | 30 +++++------ src/dis6/utils/DataStream.cpp | 20 +++---- src/dis6/utils/DataStream.h | 16 +++--- 275 files changed, 1509 insertions(+), 1510 deletions(-) diff --git a/src/dis6/AcknowledgePdu.cpp b/src/dis6/AcknowledgePdu.cpp index b7d077d8..7fd9dd81 100644 --- a/src/dis6/AcknowledgePdu.cpp +++ b/src/dis6/AcknowledgePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AcknowledgePdu.h" using namespace DIS; @@ -12,17 +12,17 @@ AcknowledgePdu::AcknowledgePdu() AcknowledgePdu::~AcknowledgePdu() {} -unsigned short AcknowledgePdu::getAcknowledgeFlag() const { +uint16_t AcknowledgePdu::getAcknowledgeFlag() const { return _acknowledgeFlag; } -void AcknowledgePdu::setAcknowledgeFlag(unsigned short pX) { +void AcknowledgePdu::setAcknowledgeFlag(uint16_t pX) { _acknowledgeFlag = pX; } -unsigned short AcknowledgePdu::getResponseFlag() const { return _responseFlag; } +uint16_t AcknowledgePdu::getResponseFlag() const { return _responseFlag; } -void AcknowledgePdu::setResponseFlag(unsigned short pX) { _responseFlag = pX; } +void AcknowledgePdu::setResponseFlag(uint16_t pX) { _responseFlag = pX; } unsigned int AcknowledgePdu::getRequestID() const { return _requestID; } diff --git a/src/dis6/AcknowledgePdu.h b/src/dis6/AcknowledgePdu.h index 3fa0b4eb..d39f91ff 100644 --- a/src/dis6/AcknowledgePdu.h +++ b/src/dis6/AcknowledgePdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.5. Acknowledge the receiptof a start/resume, stop/freeze, or @@ -16,10 +16,10 @@ namespace DIS { class OPENDIS6_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { protected: /** type of message being acknowledged */ - unsigned short _acknowledgeFlag; + uint16_t _acknowledgeFlag; /** Whether or not the receiving entity was able to comply with the request */ - unsigned short _responseFlag; + uint16_t _responseFlag; /** Request ID that is unique */ unsigned int _requestID; @@ -31,11 +31,11 @@ class OPENDIS6_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + uint16_t getAcknowledgeFlag() const; + void setAcknowledgeFlag(uint16_t pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + uint16_t getResponseFlag() const; + void setResponseFlag(uint16_t pX); unsigned int getRequestID() const; void setRequestID(unsigned int pX); diff --git a/src/dis6/AcknowledgeReliablePdu.cpp b/src/dis6/AcknowledgeReliablePdu.cpp index baacd39c..572917fd 100644 --- a/src/dis6/AcknowledgeReliablePdu.cpp +++ b/src/dis6/AcknowledgeReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AcknowledgeReliablePdu.h" using namespace DIS; @@ -12,19 +12,19 @@ AcknowledgeReliablePdu::AcknowledgeReliablePdu() AcknowledgeReliablePdu::~AcknowledgeReliablePdu() {} -unsigned short AcknowledgeReliablePdu::getAcknowledgeFlag() const { +uint16_t AcknowledgeReliablePdu::getAcknowledgeFlag() const { return _acknowledgeFlag; } -void AcknowledgeReliablePdu::setAcknowledgeFlag(unsigned short pX) { +void AcknowledgeReliablePdu::setAcknowledgeFlag(uint16_t pX) { _acknowledgeFlag = pX; } -unsigned short AcknowledgeReliablePdu::getResponseFlag() const { +uint16_t AcknowledgeReliablePdu::getResponseFlag() const { return _responseFlag; } -void AcknowledgeReliablePdu::setResponseFlag(unsigned short pX) { +void AcknowledgeReliablePdu::setResponseFlag(uint16_t pX) { _responseFlag = pX; } diff --git a/src/dis6/AcknowledgeReliablePdu.h b/src/dis6/AcknowledgeReliablePdu.h index 6bf4fccb..432aaa6d 100644 --- a/src/dis6/AcknowledgeReliablePdu.h +++ b/src/dis6/AcknowledgeReliablePdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity @@ -17,10 +17,10 @@ class OPENDIS6_EXPORT AcknowledgeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** ack flags */ - unsigned short _acknowledgeFlag; + uint16_t _acknowledgeFlag; /** response flags */ - unsigned short _responseFlag; + uint16_t _responseFlag; /** Request ID */ unsigned int _requestID; @@ -32,11 +32,11 @@ class OPENDIS6_EXPORT AcknowledgeReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + uint16_t getAcknowledgeFlag() const; + void setAcknowledgeFlag(uint16_t pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + uint16_t getResponseFlag() const; + void setResponseFlag(uint16_t pX); unsigned int getRequestID() const; void setRequestID(unsigned int pX); diff --git a/src/dis6/AcousticBeamData.cpp b/src/dis6/AcousticBeamData.cpp index f50a67bc..6c7b645d 100644 --- a/src/dis6/AcousticBeamData.cpp +++ b/src/dis6/AcousticBeamData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AcousticBeamData.h" using namespace DIS; @@ -10,11 +10,11 @@ AcousticBeamData::AcousticBeamData() AcousticBeamData::~AcousticBeamData() {} -unsigned short AcousticBeamData::getBeamDataLength() const { +uint16_t AcousticBeamData::getBeamDataLength() const { return _beamDataLength; } -void AcousticBeamData::setBeamDataLength(unsigned short pX) { +void AcousticBeamData::setBeamDataLength(uint16_t pX) { _beamDataLength = pX; } @@ -24,9 +24,9 @@ unsigned char AcousticBeamData::getBeamIDNumber() const { void AcousticBeamData::setBeamIDNumber(unsigned char pX) { _beamIDNumber = pX; } -unsigned short AcousticBeamData::getPad2() const { return _pad2; } +uint16_t AcousticBeamData::getPad2() const { return _pad2; } -void AcousticBeamData::setPad2(unsigned short pX) { _pad2 = pX; } +void AcousticBeamData::setPad2(uint16_t pX) { _pad2 = pX; } AcousticBeamFundamentalParameter& AcousticBeamData::getFundamentalDataParameters() { diff --git a/src/dis6/AcousticBeamData.h b/src/dis6/AcousticBeamData.h index 3dfeb8f7..a299fba8 100644 --- a/src/dis6/AcousticBeamData.h +++ b/src/dis6/AcousticBeamData.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/AcousticBeamFundamentalParameter.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Used in UA PDU @@ -15,13 +15,13 @@ namespace DIS { class OPENDIS6_EXPORT AcousticBeamData { protected: /** beam data length */ - unsigned short _beamDataLength; + uint16_t _beamDataLength; /** beamIDNumber */ unsigned char _beamIDNumber; /** padding */ - unsigned short _pad2; + uint16_t _pad2; /** fundamental data parameters */ AcousticBeamFundamentalParameter _fundamentalDataParameters; @@ -33,14 +33,14 @@ class OPENDIS6_EXPORT AcousticBeamData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getBeamDataLength() const; - void setBeamDataLength(unsigned short pX); + uint16_t getBeamDataLength() const; + void setBeamDataLength(uint16_t pX); unsigned char getBeamIDNumber() const; void setBeamIDNumber(unsigned char pX); - unsigned short getPad2() const; - void setPad2(unsigned short pX); + uint16_t getPad2() const; + void setPad2(uint16_t pX); AcousticBeamFundamentalParameter& getFundamentalDataParameters(); const AcousticBeamFundamentalParameter& getFundamentalDataParameters() const; diff --git a/src/dis6/AcousticBeamFundamentalParameter.cpp b/src/dis6/AcousticBeamFundamentalParameter.cpp index 112da484..f1219c59 100644 --- a/src/dis6/AcousticBeamFundamentalParameter.cpp +++ b/src/dis6/AcousticBeamFundamentalParameter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AcousticBeamFundamentalParameter.h" using namespace DIS; @@ -12,21 +12,21 @@ AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter() AcousticBeamFundamentalParameter::~AcousticBeamFundamentalParameter() {} -unsigned short +uint16_t AcousticBeamFundamentalParameter::getActiveEmissionParameterIndex() const { return _activeEmissionParameterIndex; } void AcousticBeamFundamentalParameter::setActiveEmissionParameterIndex( - unsigned short pX) { + uint16_t pX) { _activeEmissionParameterIndex = pX; } -unsigned short AcousticBeamFundamentalParameter::getScanPattern() const { +uint16_t AcousticBeamFundamentalParameter::getScanPattern() const { return _scanPattern; } -void AcousticBeamFundamentalParameter::setScanPattern(unsigned short pX) { +void AcousticBeamFundamentalParameter::setScanPattern(uint16_t pX) { _scanPattern = pX; } diff --git a/src/dis6/AcousticBeamFundamentalParameter.h b/src/dis6/AcousticBeamFundamentalParameter.h index 29e050e2..5d09cc20 100644 --- a/src/dis6/AcousticBeamFundamentalParameter.h +++ b/src/dis6/AcousticBeamFundamentalParameter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Used in UaPdu @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT AcousticBeamFundamentalParameter { protected: /** parameter index */ - unsigned short _activeEmissionParameterIndex; + uint16_t _activeEmissionParameterIndex; /** scan pattern */ - unsigned short _scanPattern; + uint16_t _scanPattern; /** beam center azimuth */ float _beamCenterAzimuth; @@ -38,11 +38,11 @@ class OPENDIS6_EXPORT AcousticBeamFundamentalParameter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getActiveEmissionParameterIndex() const; - void setActiveEmissionParameterIndex(unsigned short pX); + uint16_t getActiveEmissionParameterIndex() const; + void setActiveEmissionParameterIndex(uint16_t pX); - unsigned short getScanPattern() const; - void setScanPattern(unsigned short pX); + uint16_t getScanPattern() const; + void setScanPattern(uint16_t pX); float getBeamCenterAzimuth() const; void setBeamCenterAzimuth(float pX); diff --git a/src/dis6/AcousticEmitter.cpp b/src/dis6/AcousticEmitter.cpp index 3e1785d0..b36693dc 100644 --- a/src/dis6/AcousticEmitter.cpp +++ b/src/dis6/AcousticEmitter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AcousticEmitter.h" using namespace DIS; @@ -7,11 +7,11 @@ AcousticEmitter::AcousticEmitter() AcousticEmitter::~AcousticEmitter() {} -unsigned short AcousticEmitter::getAcousticName() const { +uint16_t AcousticEmitter::getAcousticName() const { return _acousticName; } -void AcousticEmitter::setAcousticName(unsigned short pX) { _acousticName = pX; } +void AcousticEmitter::setAcousticName(uint16_t pX) { _acousticName = pX; } unsigned char AcousticEmitter::getFunction() const { return _function; } diff --git a/src/dis6/AcousticEmitter.h b/src/dis6/AcousticEmitter.h index 69312a80..4bac344b 100644 --- a/src/dis6/AcousticEmitter.h +++ b/src/dis6/AcousticEmitter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.35. information about a specific UA emmtter @@ -14,7 +14,7 @@ namespace DIS { class OPENDIS6_EXPORT AcousticEmitter { protected: /** the system for a particular UA emitter, and an enumeration */ - unsigned short _acousticName; + uint16_t _acousticName; /** The function of the acoustic system */ unsigned char _function; @@ -29,8 +29,8 @@ class OPENDIS6_EXPORT AcousticEmitter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getAcousticName() const; - void setAcousticName(unsigned short pX); + uint16_t getAcousticName() const; + void setAcousticName(uint16_t pX); unsigned char getFunction() const; void setFunction(unsigned char pX); diff --git a/src/dis6/AcousticEmitterSystem.cpp b/src/dis6/AcousticEmitterSystem.cpp index 77fa3e72..104aa2e4 100644 --- a/src/dis6/AcousticEmitterSystem.cpp +++ b/src/dis6/AcousticEmitterSystem.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AcousticEmitterSystem.h" using namespace DIS; @@ -7,11 +7,11 @@ AcousticEmitterSystem::AcousticEmitterSystem() AcousticEmitterSystem::~AcousticEmitterSystem() {} -unsigned short AcousticEmitterSystem::getAcousticName() const { +uint16_t AcousticEmitterSystem::getAcousticName() const { return _acousticName; } -void AcousticEmitterSystem::setAcousticName(unsigned short pX) { +void AcousticEmitterSystem::setAcousticName(uint16_t pX) { _acousticName = pX; } diff --git a/src/dis6/AcousticEmitterSystem.h b/src/dis6/AcousticEmitterSystem.h index 06d292b4..4d6a0997 100644 --- a/src/dis6/AcousticEmitterSystem.h +++ b/src/dis6/AcousticEmitterSystem.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.3.35: Information about a particular UA emitter shall be represented using @@ -16,7 +16,7 @@ namespace DIS { class OPENDIS6_EXPORT AcousticEmitterSystem { protected: /** This field shall specify the system for a particular UA emitter. */ - unsigned short _acousticName; + uint16_t _acousticName; /** This field shall describe the function of the acoustic system. */ unsigned char _acousticFunction; @@ -36,8 +36,8 @@ class OPENDIS6_EXPORT AcousticEmitterSystem { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getAcousticName() const; - void setAcousticName(unsigned short pX); + uint16_t getAcousticName() const; + void setAcousticName(uint16_t pX); unsigned char getAcousticFunction() const; void setAcousticFunction(unsigned char pX); diff --git a/src/dis6/AcousticEmitterSystemData.cpp b/src/dis6/AcousticEmitterSystemData.cpp index af9c7d9c..1f762ef6 100644 --- a/src/dis6/AcousticEmitterSystemData.cpp +++ b/src/dis6/AcousticEmitterSystemData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AcousticEmitterSystemData.h" using namespace DIS; @@ -25,9 +25,9 @@ unsigned char AcousticEmitterSystemData::getNumberOfBeams() const { return _beamRecords.size(); } -unsigned short AcousticEmitterSystemData::getPad2() const { return _pad2; } +uint16_t AcousticEmitterSystemData::getPad2() const { return _pad2; } -void AcousticEmitterSystemData::setPad2(unsigned short pX) { _pad2 = pX; } +void AcousticEmitterSystemData::setPad2(uint16_t pX) { _pad2 = pX; } AcousticEmitterSystem& AcousticEmitterSystemData::getAcousticEmitterSystem() { return _acousticEmitterSystem; @@ -127,7 +127,7 @@ int AcousticEmitterSystemData::getMarshalledSize() const { marshalSize = marshalSize + _emitterLocation.getMarshalledSize(); // _emitterLocation - for (unsigned long long idx = 0; idx < _beamRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _beamRecords.size(); idx++) { AcousticBeamData listElement = _beamRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/AcousticEmitterSystemData.h b/src/dis6/AcousticEmitterSystemData.h index f51e748f..935ed8ab 100644 --- a/src/dis6/AcousticEmitterSystemData.h +++ b/src/dis6/AcousticEmitterSystemData.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/AcousticBeamData.h" +#include "dis6/AcousticEmitterSystem.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Used in the UA pdu; ties together an emmitter and a location. This requires @@ -26,7 +26,7 @@ class OPENDIS6_EXPORT AcousticEmitterSystemData { unsigned char _numberOfBeams; /** padding */ - unsigned short _pad2; + uint16_t _pad2; /** This field shall specify the system for a particular UA emitter. */ AcousticEmitterSystem _acousticEmitterSystem; @@ -51,8 +51,8 @@ class OPENDIS6_EXPORT AcousticEmitterSystemData { unsigned char getNumberOfBeams() const; - unsigned short getPad2() const; - void setPad2(unsigned short pX); + uint16_t getPad2() const; + void setPad2(uint16_t pX); AcousticEmitterSystem& getAcousticEmitterSystem(); const AcousticEmitterSystem& getAcousticEmitterSystem() const; diff --git a/src/dis6/ActionRequestPdu.cpp b/src/dis6/ActionRequestPdu.cpp index 764df346..a634fc49 100644 --- a/src/dis6/ActionRequestPdu.cpp +++ b/src/dis6/ActionRequestPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ActionRequestPdu.h" using namespace DIS; @@ -126,12 +126,12 @@ int ActionRequestPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ActionRequestPdu.h b/src/dis6/ActionRequestPdu.h index eff8ccf0..8c41c6b8 100644 --- a/src/dis6/ActionRequestPdu.h +++ b/src/dis6/ActionRequestPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.6. Request from simulation manager to an entity. COMPLETE diff --git a/src/dis6/ActionRequestReliablePdu.cpp b/src/dis6/ActionRequestReliablePdu.cpp index 786d013a..55e53061 100644 --- a/src/dis6/ActionRequestReliablePdu.cpp +++ b/src/dis6/ActionRequestReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ActionRequestReliablePdu.h" using namespace DIS; @@ -27,9 +27,9 @@ void ActionRequestReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short ActionRequestReliablePdu::getPad1() const { return _pad1; } +uint16_t ActionRequestReliablePdu::getPad1() const { return _pad1; } -void ActionRequestReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void ActionRequestReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char ActionRequestReliablePdu::getPad2() const { return _pad2; } @@ -171,12 +171,12 @@ int ActionRequestReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ActionRequestReliablePdu.h b/src/dis6/ActionRequestReliablePdu.h index bce54f46..1039887f 100644 --- a/src/dis6/ActionRequestReliablePdu.h +++ b/src/dis6/ActionRequestReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.6: request from a simulation manager to a managed entity to @@ -24,7 +24,7 @@ class OPENDIS6_EXPORT ActionRequestReliablePdu unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -57,8 +57,8 @@ class OPENDIS6_EXPORT ActionRequestReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/ActionResponsePdu.cpp b/src/dis6/ActionResponsePdu.cpp index 53318ba4..f07455bb 100644 --- a/src/dis6/ActionResponsePdu.cpp +++ b/src/dis6/ActionResponsePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ActionResponsePdu.h" using namespace DIS; @@ -131,12 +131,12 @@ int ActionResponsePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ActionResponsePdu.h b/src/dis6/ActionResponsePdu.h index c920d9ba..3b382a7f 100644 --- a/src/dis6/ActionResponsePdu.h +++ b/src/dis6/ActionResponsePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.7. response to an action request PDU. COMPLETE diff --git a/src/dis6/ActionResponseReliablePdu.cpp b/src/dis6/ActionResponseReliablePdu.cpp index d17ae093..2b35ef96 100644 --- a/src/dis6/ActionResponseReliablePdu.cpp +++ b/src/dis6/ActionResponseReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ActionResponseReliablePdu.h" using namespace DIS; @@ -144,12 +144,12 @@ int ActionResponseReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ActionResponseReliablePdu.h b/src/dis6/ActionResponseReliablePdu.h index cb188d31..cdd48744 100644 --- a/src/dis6/ActionResponseReliablePdu.h +++ b/src/dis6/ActionResponseReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE diff --git a/src/dis6/AggregateID.cpp b/src/dis6/AggregateID.cpp index 0514fe06..70bba1a2 100644 --- a/src/dis6/AggregateID.cpp +++ b/src/dis6/AggregateID.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AggregateID.h" using namespace DIS; @@ -6,17 +6,17 @@ AggregateID::AggregateID() : _site(0), _application(0), _aggregateID(0) {} AggregateID::~AggregateID() {} -unsigned short AggregateID::getSite() const { return _site; } +uint16_t AggregateID::getSite() const { return _site; } -void AggregateID::setSite(unsigned short pX) { _site = pX; } +void AggregateID::setSite(uint16_t pX) { _site = pX; } -unsigned short AggregateID::getApplication() const { return _application; } +uint16_t AggregateID::getApplication() const { return _application; } -void AggregateID::setApplication(unsigned short pX) { _application = pX; } +void AggregateID::setApplication(uint16_t pX) { _application = pX; } -unsigned short AggregateID::getAggregateID() const { return _aggregateID; } +uint16_t AggregateID::getAggregateID() const { return _aggregateID; } -void AggregateID::setAggregateID(unsigned short pX) { _aggregateID = pX; } +void AggregateID::setAggregateID(uint16_t pX) { _aggregateID = pX; } void AggregateID::marshal(DataStream& dataStream) const { dataStream << _site; diff --git a/src/dis6/AggregateID.h b/src/dis6/AggregateID.h index 5bcf6777..93ec4003 100644 --- a/src/dis6/AggregateID.h +++ b/src/dis6/AggregateID.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.36. Each agregate in a given simulation app is given an aggregate @@ -16,13 +16,13 @@ namespace DIS { class OPENDIS6_EXPORT AggregateID { protected: /** The site ID */ - unsigned short _site; + uint16_t _site; /** The application ID */ - unsigned short _application; + uint16_t _application; /** the aggregate ID */ - unsigned short _aggregateID; + uint16_t _aggregateID; public: AggregateID(); @@ -31,14 +31,14 @@ class OPENDIS6_EXPORT AggregateID { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + uint16_t getSite() const; + void setSite(uint16_t pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + uint16_t getApplication() const; + void setApplication(uint16_t pX); - unsigned short getAggregateID() const; - void setAggregateID(unsigned short pX); + uint16_t getAggregateID() const; + void setAggregateID(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/AggregateMarking.cpp b/src/dis6/AggregateMarking.cpp index a2087f40..93cb7668 100644 --- a/src/dis6/AggregateMarking.cpp +++ b/src/dis6/AggregateMarking.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AggregateMarking.h" using namespace DIS; diff --git a/src/dis6/AggregateMarking.h b/src/dis6/AggregateMarking.h index 766955d4..66884a7f 100644 --- a/src/dis6/AggregateMarking.h +++ b/src/dis6/AggregateMarking.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.37. Specifies the character set used inthe first byte, followed diff --git a/src/dis6/AggregateStatePdu.cpp b/src/dis6/AggregateStatePdu.cpp index 6a5051cd..e1d9580f 100644 --- a/src/dis6/AggregateStatePdu.cpp +++ b/src/dis6/AggregateStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AggregateStatePdu.h" using namespace DIS; @@ -115,19 +115,19 @@ const Vector3Float& AggregateStatePdu::getVelocity() const { return _velocity; } void AggregateStatePdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } -unsigned short AggregateStatePdu::getNumberOfDisAggregates() const { +uint16_t AggregateStatePdu::getNumberOfDisAggregates() const { return _aggregateIDList.size(); } -unsigned short AggregateStatePdu::getNumberOfDisEntities() const { +uint16_t AggregateStatePdu::getNumberOfDisEntities() const { return _entityIDList.size(); } -unsigned short AggregateStatePdu::getNumberOfSilentAggregateTypes() const { +uint16_t AggregateStatePdu::getNumberOfSilentAggregateTypes() const { return _silentAggregateSystemList.size(); } -unsigned short AggregateStatePdu::getNumberOfSilentEntityTypes() const { +uint16_t AggregateStatePdu::getNumberOfSilentEntityTypes() const { return _silentEntitySystemList.size(); } @@ -218,10 +218,10 @@ void AggregateStatePdu::marshal(DataStream& dataStream) const { _orientation.marshal(dataStream); _centerOfMass.marshal(dataStream); _velocity.marshal(dataStream); - dataStream << (unsigned short)_aggregateIDList.size(); - dataStream << (unsigned short)_entityIDList.size(); - dataStream << (unsigned short)_silentAggregateSystemList.size(); - dataStream << (unsigned short)_silentEntitySystemList.size(); + dataStream << (uint16_t)_aggregateIDList.size(); + dataStream << (uint16_t)_entityIDList.size(); + dataStream << (uint16_t)_silentAggregateSystemList.size(); + dataStream << (uint16_t)_silentEntitySystemList.size(); for (size_t idx = 0; idx < _aggregateIDList.size(); idx++) { AggregateID x = _aggregateIDList[idx]; @@ -377,25 +377,25 @@ int AggregateStatePdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _numberOfSilentAggregateTypes marshalSize = marshalSize + 2; // _numberOfSilentEntityTypes - for (unsigned long long idx = 0; idx < _aggregateIDList.size(); idx++) { + for (uint64_t idx = 0; idx < _aggregateIDList.size(); idx++) { AggregateID listElement = _aggregateIDList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _entityIDList.size(); idx++) { + for (uint64_t idx = 0; idx < _entityIDList.size(); idx++) { EntityID listElement = _entityIDList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } marshalSize = marshalSize + 1; // _pad2 - for (unsigned long long idx = 0; idx < _silentAggregateSystemList.size(); + for (uint64_t idx = 0; idx < _silentAggregateSystemList.size(); idx++) { EntityType listElement = _silentAggregateSystemList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _silentEntitySystemList.size(); + for (uint64_t idx = 0; idx < _silentEntitySystemList.size(); idx++) { EntityType listElement = _silentEntitySystemList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); @@ -403,7 +403,7 @@ int AggregateStatePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _variableDatumList.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumList.size(); idx++) { VariableDatum listElement = _variableDatumList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/AggregateStatePdu.h b/src/dis6/AggregateStatePdu.h index df123e80..b9b7c0a2 100644 --- a/src/dis6/AggregateStatePdu.h +++ b/src/dis6/AggregateStatePdu.h @@ -2,17 +2,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/AggregateID.h" +#include "dis6/AggregateMarking.h" +#include "dis6/EntityID.h" +#include "dis6/EntityManagementFamilyPdu.h" +#include "dis6/EntityType.h" +#include "dis6/Orientation.h" +#include "dis6/VariableDatum.h" +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.9.1 informationa bout aggregating entities anc communicating @@ -60,16 +60,16 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { Vector3Float _velocity; /** number of aggregates */ - unsigned short _numberOfDisAggregates; + uint16_t _numberOfDisAggregates; /** number of entities */ - unsigned short _numberOfDisEntities; + uint16_t _numberOfDisEntities; /** number of silent aggregate types */ - unsigned short _numberOfSilentAggregateTypes; + uint16_t _numberOfSilentAggregateTypes; /** number of silent entity types */ - unsigned short _numberOfSilentEntityTypes; + uint16_t _numberOfSilentEntityTypes; /** aggregates list */ std::vector _aggregateIDList; @@ -137,13 +137,13 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { const Vector3Float& getVelocity() const; void setVelocity(const Vector3Float& pX); - unsigned short getNumberOfDisAggregates() const; + uint16_t getNumberOfDisAggregates() const; - unsigned short getNumberOfDisEntities() const; + uint16_t getNumberOfDisEntities() const; - unsigned short getNumberOfSilentAggregateTypes() const; + uint16_t getNumberOfSilentAggregateTypes() const; - unsigned short getNumberOfSilentEntityTypes() const; + uint16_t getNumberOfSilentEntityTypes() const; std::vector& getAggregateIDList(); const std::vector& getAggregateIDList() const; diff --git a/src/dis6/AggregateType.cpp b/src/dis6/AggregateType.cpp index 75021909..f78aae3f 100644 --- a/src/dis6/AggregateType.cpp +++ b/src/dis6/AggregateType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AggregateType.h" using namespace DIS; @@ -21,9 +21,9 @@ unsigned char AggregateType::getDomain() const { return _domain; } void AggregateType::setDomain(unsigned char pX) { _domain = pX; } -unsigned short AggregateType::getCountry() const { return _country; } +uint16_t AggregateType::getCountry() const { return _country; } -void AggregateType::setCountry(unsigned short pX) { _country = pX; } +void AggregateType::setCountry(uint16_t pX) { _country = pX; } unsigned char AggregateType::getCategory() const { return _category; } diff --git a/src/dis6/AggregateType.h b/src/dis6/AggregateType.h index 7f112c5c..84ecfde8 100644 --- a/src/dis6/AggregateType.h +++ b/src/dis6/AggregateType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.38. Identifies the type of aggregate including kind of entity, @@ -21,7 +21,7 @@ class OPENDIS6_EXPORT AggregateType { unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ unsigned char _category; @@ -47,8 +47,8 @@ class OPENDIS6_EXPORT AggregateType { unsigned char getDomain() const; void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); unsigned char getCategory() const; void setCategory(unsigned char pX); diff --git a/src/dis6/AngularVelocityVector.cpp b/src/dis6/AngularVelocityVector.cpp index 41e0835a..b3df544c 100644 --- a/src/dis6/AngularVelocityVector.cpp +++ b/src/dis6/AngularVelocityVector.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AngularVelocityVector.h" using namespace DIS; diff --git a/src/dis6/AngularVelocityVector.h b/src/dis6/AngularVelocityVector.h index e91222e3..03090f2a 100644 --- a/src/dis6/AngularVelocityVector.h +++ b/src/dis6/AngularVelocityVector.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.2: angular velocity measured in radians per second out each of the diff --git a/src/dis6/AntennaLocation.cpp b/src/dis6/AntennaLocation.cpp index 663665cf..a6d0e0fd 100644 --- a/src/dis6/AntennaLocation.cpp +++ b/src/dis6/AntennaLocation.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/AntennaLocation.h" using namespace DIS; diff --git a/src/dis6/AntennaLocation.h b/src/dis6/AntennaLocation.h index dde4a9c2..268985fd 100644 --- a/src/dis6/AntennaLocation.h +++ b/src/dis6/AntennaLocation.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.3: location of the radiating portion of the antenna, specified in world diff --git a/src/dis6/ApaData.cpp b/src/dis6/ApaData.cpp index a88e4a04..b717d060 100644 --- a/src/dis6/ApaData.cpp +++ b/src/dis6/ApaData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ApaData.h" using namespace DIS; @@ -6,13 +6,13 @@ ApaData::ApaData() : _parameterIndex(0), _parameterValue(0) {} ApaData::~ApaData() {} -unsigned short ApaData::getParameterIndex() const { return _parameterIndex; } +uint16_t ApaData::getParameterIndex() const { return _parameterIndex; } -void ApaData::setParameterIndex(unsigned short pX) { _parameterIndex = pX; } +void ApaData::setParameterIndex(uint16_t pX) { _parameterIndex = pX; } -short ApaData::getParameterValue() const { return _parameterValue; } +int16_t ApaData::getParameterValue() const { return _parameterValue; } -void ApaData::setParameterValue(short pX) { _parameterValue = pX; } +void ApaData::setParameterValue(int16_t pX) { _parameterValue = pX; } void ApaData::marshal(DataStream& dataStream) const { dataStream << _parameterIndex; diff --git a/src/dis6/ApaData.h b/src/dis6/ApaData.h index f4418cbe..9d43aec8 100644 --- a/src/dis6/ApaData.h +++ b/src/dis6/ApaData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Used in UA PDU @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT ApaData { protected: /** Index of APA parameter */ - unsigned short _parameterIndex; + uint16_t _parameterIndex; /** Index of APA parameter */ - short _parameterValue; + int16_t _parameterValue; public: ApaData(); @@ -26,11 +26,11 @@ class OPENDIS6_EXPORT ApaData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getParameterIndex() const; - void setParameterIndex(unsigned short pX); + uint16_t getParameterIndex() const; + void setParameterIndex(uint16_t pX); - short getParameterValue() const; - void setParameterValue(short pX); + int16_t getParameterValue() const; + void setParameterValue(int16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/ArealObjectStatePdu.cpp b/src/dis6/ArealObjectStatePdu.cpp index 1a863290..702d0f0b 100644 --- a/src/dis6/ArealObjectStatePdu.cpp +++ b/src/dis6/ArealObjectStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ArealObjectStatePdu.h" using namespace DIS; @@ -37,11 +37,11 @@ void ArealObjectStatePdu::setReferencedObjectID(const EntityID& pX) { _referencedObjectID = pX; } -unsigned short ArealObjectStatePdu::getUpdateNumber() const { +uint16_t ArealObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void ArealObjectStatePdu::setUpdateNumber(unsigned short pX) { +void ArealObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } @@ -79,7 +79,7 @@ void ArealObjectStatePdu::setObjectAppearance(const SixByteChunk& pX) { _objectAppearance = pX; } -unsigned short ArealObjectStatePdu::getNumberOfPoints() const { +uint16_t ArealObjectStatePdu::getNumberOfPoints() const { return _objectLocation.size(); } @@ -131,7 +131,7 @@ void ArealObjectStatePdu::marshal(DataStream& dataStream) const { dataStream << _modifications; _objectType.marshal(dataStream); _objectAppearance.marshal(dataStream); - dataStream << (unsigned short)_objectLocation.size(); + dataStream << (uint16_t)_objectLocation.size(); _requesterID.marshal(dataStream); _receivingID.marshal(dataStream); @@ -202,7 +202,7 @@ int ArealObjectStatePdu::getMarshalledSize() const { marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - for (unsigned long long idx = 0; idx < _objectLocation.size(); idx++) { + for (uint64_t idx = 0; idx < _objectLocation.size(); idx++) { Vector3Double listElement = _objectLocation[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ArealObjectStatePdu.h b/src/dis6/ArealObjectStatePdu.h index 834592c1..613437cc 100644 --- a/src/dis6/ArealObjectStatePdu.h +++ b/src/dis6/ArealObjectStatePdu.h @@ -2,14 +2,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityType.h" +#include "dis6/SimulationAddress.h" +#include "dis6/SixByteChunk.h" +#include "dis6/SyntheticEnvironmentFamilyPdu.h" +#include "dis6/Vector3Double.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.11.5: Information about the addition/modification of an oobject @@ -31,7 +31,7 @@ class OPENDIS6_EXPORT ArealObjectStatePdu EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + uint16_t _updateNumber; /** force ID */ unsigned char _forceID; @@ -46,7 +46,7 @@ class OPENDIS6_EXPORT ArealObjectStatePdu SixByteChunk _objectAppearance; /** Number of points */ - unsigned short _numberOfPoints; + uint16_t _numberOfPoints; /** requesterID */ SimulationAddress _requesterID; @@ -72,8 +72,8 @@ class OPENDIS6_EXPORT ArealObjectStatePdu const EntityID& getReferencedObjectID() const; void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + uint16_t getUpdateNumber() const; + void setUpdateNumber(uint16_t pX); unsigned char getForceID() const; void setForceID(unsigned char pX); @@ -89,7 +89,7 @@ class OPENDIS6_EXPORT ArealObjectStatePdu const SixByteChunk& getObjectAppearance() const; void setObjectAppearance(const SixByteChunk& pX); - unsigned short getNumberOfPoints() const; + uint16_t getNumberOfPoints() const; SimulationAddress& getRequesterID(); const SimulationAddress& getRequesterID() const; diff --git a/src/dis6/ArticulationParameter.cpp b/src/dis6/ArticulationParameter.cpp index 35ed19f9..a38dd523 100644 --- a/src/dis6/ArticulationParameter.cpp +++ b/src/dis6/ArticulationParameter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ArticulationParameter.h" using namespace DIS; @@ -27,11 +27,11 @@ void ArticulationParameter::setChangeIndicator(unsigned char pX) { _changeIndicator = pX; } -unsigned short ArticulationParameter::getPartAttachedTo() const { +uint16_t ArticulationParameter::getPartAttachedTo() const { return _partAttachedTo; } -void ArticulationParameter::setPartAttachedTo(unsigned short pX) { +void ArticulationParameter::setPartAttachedTo(uint16_t pX) { _partAttachedTo = pX; } diff --git a/src/dis6/ArticulationParameter.h b/src/dis6/ArticulationParameter.h index 4ee9db46..ecb96b03 100644 --- a/src/dis6/ArticulationParameter.h +++ b/src/dis6/ArticulationParameter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.5. Articulation parameters for movable parts and attached parts @@ -20,7 +20,7 @@ class OPENDIS6_EXPORT ArticulationParameter { unsigned char _changeIndicator; - unsigned short _partAttachedTo; + uint16_t _partAttachedTo; int _parameterType; @@ -39,8 +39,8 @@ class OPENDIS6_EXPORT ArticulationParameter { unsigned char getChangeIndicator() const; void setChangeIndicator(unsigned char pX); - unsigned short getPartAttachedTo() const; - void setPartAttachedTo(unsigned short pX); + uint16_t getPartAttachedTo() const; + void setPartAttachedTo(uint16_t pX); int getParameterType() const; void setParameterType(int pX); diff --git a/src/dis6/BeamAntennaPattern.cpp b/src/dis6/BeamAntennaPattern.cpp index 9734dbf0..a8247145 100644 --- a/src/dis6/BeamAntennaPattern.cpp +++ b/src/dis6/BeamAntennaPattern.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/BeamAntennaPattern.h" using namespace DIS; @@ -38,9 +38,9 @@ float BeamAntennaPattern::getReferenceSystem() const { void BeamAntennaPattern::setReferenceSystem(float pX) { _referenceSystem = pX; } -short BeamAntennaPattern::getPadding1() const { return _padding1; } +int16_t BeamAntennaPattern::getPadding1() const { return _padding1; } -void BeamAntennaPattern::setPadding1(short pX) { _padding1 = pX; } +void BeamAntennaPattern::setPadding1(int16_t pX) { _padding1 = pX; } char BeamAntennaPattern::getPadding2() const { return _padding2; } diff --git a/src/dis6/BeamAntennaPattern.h b/src/dis6/BeamAntennaPattern.h index cedabbf1..46dd877b 100644 --- a/src/dis6/BeamAntennaPattern.h +++ b/src/dis6/BeamAntennaPattern.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Orientation.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. @@ -26,7 +26,7 @@ class OPENDIS6_EXPORT BeamAntennaPattern { float _referenceSystem; - short _padding1; + int16_t _padding1; char _padding2; @@ -58,8 +58,8 @@ class OPENDIS6_EXPORT BeamAntennaPattern { float getReferenceSystem() const; void setReferenceSystem(float pX); - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis6/BeamData.cpp b/src/dis6/BeamData.cpp index c3afb2ce..31a5be48 100644 --- a/src/dis6/BeamData.cpp +++ b/src/dis6/BeamData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/BeamData.h" using namespace DIS; diff --git a/src/dis6/BeamData.h b/src/dis6/BeamData.h index 1a5d5e79..7a79abab 100644 --- a/src/dis6/BeamData.h +++ b/src/dis6/BeamData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.39. Specification of the data necessary to describe the scan diff --git a/src/dis6/BurstDescriptor.cpp b/src/dis6/BurstDescriptor.cpp index 0e1cafad..99d4a263 100644 --- a/src/dis6/BurstDescriptor.cpp +++ b/src/dis6/BurstDescriptor.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/BurstDescriptor.h" using namespace DIS; @@ -13,21 +13,21 @@ const EntityType& BurstDescriptor::getMunition() const { return _munition; } void BurstDescriptor::setMunition(const EntityType& pX) { _munition = pX; } -unsigned short BurstDescriptor::getWarhead() const { return _warhead; } +uint16_t BurstDescriptor::getWarhead() const { return _warhead; } -void BurstDescriptor::setWarhead(unsigned short pX) { _warhead = pX; } +void BurstDescriptor::setWarhead(uint16_t pX) { _warhead = pX; } -unsigned short BurstDescriptor::getFuse() const { return _fuse; } +uint16_t BurstDescriptor::getFuse() const { return _fuse; } -void BurstDescriptor::setFuse(unsigned short pX) { _fuse = pX; } +void BurstDescriptor::setFuse(uint16_t pX) { _fuse = pX; } -unsigned short BurstDescriptor::getQuantity() const { return _quantity; } +uint16_t BurstDescriptor::getQuantity() const { return _quantity; } -void BurstDescriptor::setQuantity(unsigned short pX) { _quantity = pX; } +void BurstDescriptor::setQuantity(uint16_t pX) { _quantity = pX; } -unsigned short BurstDescriptor::getRate() const { return _rate; } +uint16_t BurstDescriptor::getRate() const { return _rate; } -void BurstDescriptor::setRate(unsigned short pX) { _rate = pX; } +void BurstDescriptor::setRate(uint16_t pX) { _rate = pX; } void BurstDescriptor::marshal(DataStream& dataStream) const { _munition.marshal(dataStream); diff --git a/src/dis6/BurstDescriptor.h b/src/dis6/BurstDescriptor.h index bc97b2b1..9efac4b6 100644 --- a/src/dis6/BurstDescriptor.h +++ b/src/dis6/BurstDescriptor.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/EntityType.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.7. Specifies the type of muntion fired, the type of warhead, the @@ -20,16 +20,16 @@ class OPENDIS6_EXPORT BurstDescriptor { EntityType _munition; /** type of warhead */ - unsigned short _warhead; + uint16_t _warhead; /** type of fuse used */ - unsigned short _fuse; + uint16_t _fuse; /** how many of the munition were fired */ - unsigned short _quantity; + uint16_t _quantity; /** rate at which the munition was fired */ - unsigned short _rate; + uint16_t _rate; public: BurstDescriptor(); @@ -42,17 +42,17 @@ class OPENDIS6_EXPORT BurstDescriptor { const EntityType& getMunition() const; void setMunition(const EntityType& pX); - unsigned short getWarhead() const; - void setWarhead(unsigned short pX); + uint16_t getWarhead() const; + void setWarhead(uint16_t pX); - unsigned short getFuse() const; - void setFuse(unsigned short pX); + uint16_t getFuse() const; + void setFuse(uint16_t pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + uint16_t getQuantity() const; + void setQuantity(uint16_t pX); - unsigned short getRate() const; - void setRate(unsigned short pX); + uint16_t getRate() const; + void setRate(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/ClockTime.cpp b/src/dis6/ClockTime.cpp index 0a1c960c..07292cd6 100644 --- a/src/dis6/ClockTime.cpp +++ b/src/dis6/ClockTime.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ClockTime.h" using namespace DIS; diff --git a/src/dis6/ClockTime.h b/src/dis6/ClockTime.h index c0d5d0b3..03c1a39f 100644 --- a/src/dis6/ClockTime.h +++ b/src/dis6/ClockTime.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.8. Time measurements that exceed one hour. Hours is the number of diff --git a/src/dis6/CollisionElasticPdu.cpp b/src/dis6/CollisionElasticPdu.cpp index fab5bb6c..fc86d1c4 100644 --- a/src/dis6/CollisionElasticPdu.cpp +++ b/src/dis6/CollisionElasticPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/CollisionElasticPdu.h" using namespace DIS; @@ -59,9 +59,9 @@ void CollisionElasticPdu::setCollisionEventID(const EventID& pX) { _collisionEventID = pX; } -short CollisionElasticPdu::getPad() const { return _pad; } +int16_t CollisionElasticPdu::getPad() const { return _pad; } -void CollisionElasticPdu::setPad(short pX) { _pad = pX; } +void CollisionElasticPdu::setPad(int16_t pX) { _pad = pX; } Vector3Float& CollisionElasticPdu::getContactVelocity() { return _contactVelocity; diff --git a/src/dis6/CollisionElasticPdu.h b/src/dis6/CollisionElasticPdu.h index d7938623..4fb5b666 100644 --- a/src/dis6/CollisionElasticPdu.h +++ b/src/dis6/CollisionElasticPdu.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityInformationFamilyPdu.h" +#include "dis6/EventID.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.3.3.3. Information about elastic collisions in a DIS exercise shall be @@ -28,7 +28,7 @@ class OPENDIS6_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu { EventID _collisionEventID; /** some padding */ - short _pad; + int16_t _pad; /** velocity at collision */ Vector3Float _contactVelocity; @@ -85,8 +85,8 @@ class OPENDIS6_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu { const EventID& getCollisionEventID() const; void setCollisionEventID(const EventID& pX); - short getPad() const; - void setPad(short pX); + int16_t getPad() const; + void setPad(int16_t pX); Vector3Float& getContactVelocity(); const Vector3Float& getContactVelocity() const; diff --git a/src/dis6/CollisionPdu.cpp b/src/dis6/CollisionPdu.cpp index 0399ff20..37e93618 100644 --- a/src/dis6/CollisionPdu.cpp +++ b/src/dis6/CollisionPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/CollisionPdu.h" using namespace DIS; diff --git a/src/dis6/CollisionPdu.h b/src/dis6/CollisionPdu.h index 74187a72..0e9e66e2 100644 --- a/src/dis6/CollisionPdu.h +++ b/src/dis6/CollisionPdu.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityInformationFamilyPdu.h" +#include "dis6/EventID.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.3.2. Information about a collision. COMPLETE diff --git a/src/dis6/CommentPdu.cpp b/src/dis6/CommentPdu.cpp index 58a0e171..92ba1782 100644 --- a/src/dis6/CommentPdu.cpp +++ b/src/dis6/CommentPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/CommentPdu.h" using namespace DIS; @@ -105,12 +105,12 @@ int CommentPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/CommentPdu.h b/src/dis6/CommentPdu.h index 2692794e..97bbd10e 100644 --- a/src/dis6/CommentPdu.h +++ b/src/dis6/CommentPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.12. Arbitrary messages can be entered into the data stream via diff --git a/src/dis6/CommentReliablePdu.cpp b/src/dis6/CommentReliablePdu.cpp index 30bc7c98..a8760994 100644 --- a/src/dis6/CommentReliablePdu.cpp +++ b/src/dis6/CommentReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/CommentReliablePdu.h" using namespace DIS; @@ -114,12 +114,12 @@ int CommentReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/CommentReliablePdu.h b/src/dis6/CommentReliablePdu.h index 3cef9bb3..a55e13bc 100644 --- a/src/dis6/CommentReliablePdu.h +++ b/src/dis6/CommentReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual diff --git a/src/dis6/CreateEntityPdu.cpp b/src/dis6/CreateEntityPdu.cpp index 707c119f..5b0654df 100644 --- a/src/dis6/CreateEntityPdu.cpp +++ b/src/dis6/CreateEntityPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/CreateEntityPdu.h" using namespace DIS; diff --git a/src/dis6/CreateEntityPdu.h b/src/dis6/CreateEntityPdu.h index 3a67398a..16bfb4cc 100644 --- a/src/dis6/CreateEntityPdu.h +++ b/src/dis6/CreateEntityPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.1. Create a new entity. COMPLETE diff --git a/src/dis6/CreateEntityReliablePdu.cpp b/src/dis6/CreateEntityReliablePdu.cpp index b51f6582..ad4e65bc 100644 --- a/src/dis6/CreateEntityReliablePdu.cpp +++ b/src/dis6/CreateEntityReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/CreateEntityReliablePdu.h" using namespace DIS; @@ -21,9 +21,9 @@ void CreateEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short CreateEntityReliablePdu::getPad1() const { return _pad1; } +uint16_t CreateEntityReliablePdu::getPad1() const { return _pad1; } -void CreateEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void CreateEntityReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char CreateEntityReliablePdu::getPad2() const { return _pad2; } diff --git a/src/dis6/CreateEntityReliablePdu.h b/src/dis6/CreateEntityReliablePdu.h index e19e59b5..5fd62768 100644 --- a/src/dis6/CreateEntityReliablePdu.h +++ b/src/dis6/CreateEntityReliablePdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.1: creation of an entity , reliable. COMPLETE @@ -19,7 +19,7 @@ class OPENDIS6_EXPORT CreateEntityReliablePdu unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -37,8 +37,8 @@ class OPENDIS6_EXPORT CreateEntityReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/DataPdu.cpp b/src/dis6/DataPdu.cpp index 3401a430..35b253d1 100644 --- a/src/dis6/DataPdu.cpp +++ b/src/dis6/DataPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DataPdu.h" using namespace DIS; @@ -124,12 +124,12 @@ int DataPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/DataPdu.h b/src/dis6/DataPdu.h index e3b44e85..b676392c 100644 --- a/src/dis6/DataPdu.h +++ b/src/dis6/DataPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.10. Information issued in response to a data query pdu or a set diff --git a/src/dis6/DataQueryPdu.cpp b/src/dis6/DataQueryPdu.cpp index bac5c22b..87d05e1d 100644 --- a/src/dis6/DataQueryPdu.cpp +++ b/src/dis6/DataQueryPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DataQueryPdu.h" using namespace DIS; @@ -124,12 +124,12 @@ int DataQueryPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/DataQueryPdu.h b/src/dis6/DataQueryPdu.h index 8e2c8a75..893e630c 100644 --- a/src/dis6/DataQueryPdu.h +++ b/src/dis6/DataQueryPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.8. Request for data from an entity. COMPLETE diff --git a/src/dis6/DataQueryReliablePdu.cpp b/src/dis6/DataQueryReliablePdu.cpp index 96235d45..ba331f6a 100644 --- a/src/dis6/DataQueryReliablePdu.cpp +++ b/src/dis6/DataQueryReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DataQueryReliablePdu.h" using namespace DIS; @@ -27,9 +27,9 @@ void DataQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short DataQueryReliablePdu::getPad1() const { return _pad1; } +uint16_t DataQueryReliablePdu::getPad1() const { return _pad1; } -void DataQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void DataQueryReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char DataQueryReliablePdu::getPad2() const { return _pad2; } @@ -169,12 +169,12 @@ int DataQueryReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/DataQueryReliablePdu.h b/src/dis6/DataQueryReliablePdu.h index 73627f76..7f1714c4 100644 --- a/src/dis6/DataQueryReliablePdu.h +++ b/src/dis6/DataQueryReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.8: request for data from an entity. COMPLETE @@ -23,7 +23,7 @@ class OPENDIS6_EXPORT DataQueryReliablePdu unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -56,8 +56,8 @@ class OPENDIS6_EXPORT DataQueryReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/DataReliablePdu.cpp b/src/dis6/DataReliablePdu.cpp index cea57e15..7dc4be25 100644 --- a/src/dis6/DataReliablePdu.cpp +++ b/src/dis6/DataReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DataReliablePdu.h" using namespace DIS; @@ -30,9 +30,9 @@ void DataReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short DataReliablePdu::getPad1() const { return _pad1; } +uint16_t DataReliablePdu::getPad1() const { return _pad1; } -void DataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void DataReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char DataReliablePdu::getPad2() const { return _pad2; } @@ -154,12 +154,12 @@ int DataReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/DataReliablePdu.h b/src/dis6/DataReliablePdu.h index 64c2756d..fb29dc60 100644 --- a/src/dis6/DataReliablePdu.h +++ b/src/dis6/DataReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.10: issued in response to a data query R or set dataR pdu. @@ -27,7 +27,7 @@ class OPENDIS6_EXPORT DataReliablePdu unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -57,8 +57,8 @@ class OPENDIS6_EXPORT DataReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/DeadReckoningParameter.cpp b/src/dis6/DeadReckoningParameter.cpp index b213588a..282171f7 100644 --- a/src/dis6/DeadReckoningParameter.cpp +++ b/src/dis6/DeadReckoningParameter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DeadReckoningParameter.h" using namespace DIS; diff --git a/src/dis6/DeadReckoningParameter.h b/src/dis6/DeadReckoningParameter.h index f975a986..412100c1 100644 --- a/src/dis6/DeadReckoningParameter.h +++ b/src/dis6/DeadReckoningParameter.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // represents values used in dead reckoning algorithms diff --git a/src/dis6/DesignatorPdu.cpp b/src/dis6/DesignatorPdu.cpp index c48ea022..8452922e 100644 --- a/src/dis6/DesignatorPdu.cpp +++ b/src/dis6/DesignatorPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DesignatorPdu.h" using namespace DIS; @@ -33,9 +33,9 @@ void DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { _designatingEntityID = pX; } -unsigned short DesignatorPdu::getCodeName() const { return _codeName; } +uint16_t DesignatorPdu::getCodeName() const { return _codeName; } -void DesignatorPdu::setCodeName(unsigned short pX) { _codeName = pX; } +void DesignatorPdu::setCodeName(uint16_t pX) { _codeName = pX; } EntityID& DesignatorPdu::getDesignatedEntityID() { return _designatedEntityID; } @@ -47,11 +47,11 @@ void DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { _designatedEntityID = pX; } -unsigned short DesignatorPdu::getDesignatorCode() const { +uint16_t DesignatorPdu::getDesignatorCode() const { return _designatorCode; } -void DesignatorPdu::setDesignatorCode(unsigned short pX) { +void DesignatorPdu::setDesignatorCode(uint16_t pX) { _designatorCode = pX; } @@ -99,9 +99,9 @@ void DesignatorPdu::setDeadReckoningAlgorithm(char pX) { _deadReckoningAlgorithm = pX; } -unsigned short DesignatorPdu::getPadding1() const { return _padding1; } +uint16_t DesignatorPdu::getPadding1() const { return _padding1; } -void DesignatorPdu::setPadding1(unsigned short pX) { _padding1 = pX; } +void DesignatorPdu::setPadding1(uint16_t pX) { _padding1 = pX; } char DesignatorPdu::getPadding2() const { return _padding2; } diff --git a/src/dis6/DesignatorPdu.h b/src/dis6/DesignatorPdu.h index 84887ab3..f08dced4 100644 --- a/src/dis6/DesignatorPdu.h +++ b/src/dis6/DesignatorPdu.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "dis6/DistributedEmissionsFamilyPdu.h" +#include "dis6/EntityID.h" +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.7.2. Handles designating operations. COMPLETE @@ -23,14 +23,14 @@ class OPENDIS6_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { /** This field shall specify a unique emitter database number assigned to * differentiate between otherwise similar or identical emitter beams within * an emitter system. */ - unsigned short _codeName; + uint16_t _codeName; /** ID of the entity being designated */ EntityID _designatedEntityID; /** This field shall identify the designator code being used by the * designating entity */ - unsigned short _designatorCode; + uint16_t _designatorCode; /** This field shall identify the designator output power in watts */ float _designatorPower; @@ -48,7 +48,7 @@ class OPENDIS6_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { char _deadReckoningAlgorithm; /** padding */ - unsigned short _padding1; + uint16_t _padding1; /** padding */ char _padding2; @@ -67,15 +67,15 @@ class OPENDIS6_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { const EntityID& getDesignatingEntityID() const; void setDesignatingEntityID(const EntityID& pX); - unsigned short getCodeName() const; - void setCodeName(unsigned short pX); + uint16_t getCodeName() const; + void setCodeName(uint16_t pX); EntityID& getDesignatedEntityID(); const EntityID& getDesignatedEntityID() const; void setDesignatedEntityID(const EntityID& pX); - unsigned short getDesignatorCode() const; - void setDesignatorCode(unsigned short pX); + uint16_t getDesignatorCode() const; + void setDesignatorCode(uint16_t pX); float getDesignatorPower() const; void setDesignatorPower(float pX); @@ -94,8 +94,8 @@ class OPENDIS6_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { char getDeadReckoningAlgorithm() const; void setDeadReckoningAlgorithm(char pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + uint16_t getPadding1() const; + void setPadding1(uint16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis6/DetonationPdu.cpp b/src/dis6/DetonationPdu.cpp index e1dba5ac..91f8ec89 100644 --- a/src/dis6/DetonationPdu.cpp +++ b/src/dis6/DetonationPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DetonationPdu.h" using namespace DIS; @@ -84,9 +84,9 @@ unsigned char DetonationPdu::getNumberOfArticulationParameters() const { return _articulationParameters.size(); } -short DetonationPdu::getPad() const { return _pad; } +int16_t DetonationPdu::getPad() const { return _pad; } -void DetonationPdu::setPad(short pX) { _pad = pX; } +void DetonationPdu::setPad(int16_t pX) { _pad = pX; } std::vector& DetonationPdu::getArticulationParameters() { return _articulationParameters; @@ -185,7 +185,7 @@ int DetonationPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfArticulationParameters marshalSize = marshalSize + 2; // _pad - for (unsigned long long idx = 0; idx < _articulationParameters.size(); + for (uint64_t idx = 0; idx < _articulationParameters.size(); idx++) { ArticulationParameter listElement = _articulationParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/DetonationPdu.h b/src/dis6/DetonationPdu.h index cbd9e782..25cb1b6c 100644 --- a/src/dis6/DetonationPdu.h +++ b/src/dis6/DetonationPdu.h @@ -2,15 +2,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/ArticulationParameter.h" +#include "dis6/BurstDescriptor.h" +#include "dis6/EntityID.h" +#include "dis6/EventID.h" +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/WarfareFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.4.2. Information about stuff exploding. COMPLETE @@ -48,7 +48,7 @@ class OPENDIS6_EXPORT DetonationPdu : public WarfareFamilyPdu { unsigned char _numberOfArticulationParameters; /** padding */ - short _pad; + int16_t _pad; std::vector _articulationParameters; @@ -88,8 +88,8 @@ class OPENDIS6_EXPORT DetonationPdu : public WarfareFamilyPdu { unsigned char getNumberOfArticulationParameters() const; - short getPad() const; - void setPad(short pX); + int16_t getPad() const; + void setPad(int16_t pX); std::vector& getArticulationParameters(); const std::vector& getArticulationParameters() const; diff --git a/src/dis6/DistributedEmissionsFamilyPdu.cpp b/src/dis6/DistributedEmissionsFamilyPdu.cpp index 7d5c659a..9206cb09 100644 --- a/src/dis6/DistributedEmissionsFamilyPdu.cpp +++ b/src/dis6/DistributedEmissionsFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/DistributedEmissionsFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/DistributedEmissionsFamilyPdu.h b/src/dis6/DistributedEmissionsFamilyPdu.h index ab6b1af3..534aba31 100644 --- a/src/dis6/DistributedEmissionsFamilyPdu.h +++ b/src/dis6/DistributedEmissionsFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.7. Electromagnetic Emissions. Abstract superclass for distirubted diff --git a/src/dis6/EightByteChunk.cpp b/src/dis6/EightByteChunk.cpp index 7cd5f71b..0334ab2c 100644 --- a/src/dis6/EightByteChunk.cpp +++ b/src/dis6/EightByteChunk.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EightByteChunk.h" using namespace DIS; diff --git a/src/dis6/EightByteChunk.h b/src/dis6/EightByteChunk.h index 1c2b7033..91673091 100644 --- a/src/dis6/EightByteChunk.h +++ b/src/dis6/EightByteChunk.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 64 bit piece of data diff --git a/src/dis6/ElectromagneticEmissionBeamData.cpp b/src/dis6/ElectromagneticEmissionBeamData.cpp index e8f5ef6d..327ec8ae 100644 --- a/src/dis6/ElectromagneticEmissionBeamData.cpp +++ b/src/dis6/ElectromagneticEmissionBeamData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ElectromagneticEmissionBeamData.h" using namespace DIS; @@ -33,11 +33,11 @@ void ElectromagneticEmissionBeamData::setBeamIDNumber(unsigned char pX) { _beamIDNumber = pX; } -unsigned short ElectromagneticEmissionBeamData::getBeamParameterIndex() const { +uint16_t ElectromagneticEmissionBeamData::getBeamParameterIndex() const { return _beamParameterIndex; } -void ElectromagneticEmissionBeamData::setBeamParameterIndex(unsigned short pX) { +void ElectromagneticEmissionBeamData::setBeamParameterIndex(uint16_t pX) { _beamParameterIndex = pX; } @@ -177,7 +177,7 @@ int ElectromagneticEmissionBeamData::getMarshalledSize() const { marshalSize = marshalSize + 1; // _pad4 marshalSize = marshalSize + 4; // _jammingModeSequence - for (unsigned long long idx = 0; idx < _trackJamTargets.size(); idx++) { + for (uint64_t idx = 0; idx < _trackJamTargets.size(); idx++) { TrackJamTarget listElement = _trackJamTargets[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ElectromagneticEmissionBeamData.h b/src/dis6/ElectromagneticEmissionBeamData.h index ad648744..073f4ef3 100644 --- a/src/dis6/ElectromagneticEmissionBeamData.h +++ b/src/dis6/ElectromagneticEmissionBeamData.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis6/FundamentalParameterData.h" +#include "dis6/TrackJamTarget.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Description of one electronic emission beam @@ -29,7 +29,7 @@ class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { * by receiving entities in conjunction with the Emitter Name field to provide * a pointer to the stored database parameters required to regenerate the * beam. */ - unsigned short _beamParameterIndex; + uint16_t _beamParameterIndex; /** Fundamental parameter data such as frequency range, beam sweep, etc. */ FundamentalParameterData _fundamentalParameterData; @@ -66,8 +66,8 @@ class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { unsigned char getBeamIDNumber() const; void setBeamIDNumber(unsigned char pX); - unsigned short getBeamParameterIndex() const; - void setBeamParameterIndex(unsigned short pX); + uint16_t getBeamParameterIndex() const; + void setBeamParameterIndex(uint16_t pX); FundamentalParameterData& getFundamentalParameterData(); const FundamentalParameterData& getFundamentalParameterData() const; diff --git a/src/dis6/ElectromagneticEmissionSystemData.cpp b/src/dis6/ElectromagneticEmissionSystemData.cpp index cb8c827d..4e8dac89 100644 --- a/src/dis6/ElectromagneticEmissionSystemData.cpp +++ b/src/dis6/ElectromagneticEmissionSystemData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ElectromagneticEmissionSystemData.h" using namespace DIS; @@ -25,12 +25,12 @@ unsigned char ElectromagneticEmissionSystemData::getNumberOfBeams() const { return _beamDataRecords.size(); } -unsigned short ElectromagneticEmissionSystemData::getEmissionsPadding2() const { +uint16_t ElectromagneticEmissionSystemData::getEmissionsPadding2() const { return _emissionsPadding2; } void ElectromagneticEmissionSystemData::setEmissionsPadding2( - unsigned short pX) { + uint16_t pX) { _emissionsPadding2 = pX; } @@ -130,7 +130,7 @@ int ElectromagneticEmissionSystemData::getMarshalledSize() const { marshalSize + _emitterSystem.getMarshalledSize(); // _emitterSystem marshalSize = marshalSize + _location.getMarshalledSize(); // _location - for (unsigned long long idx = 0; idx < _beamDataRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _beamDataRecords.size(); idx++) { ElectromagneticEmissionBeamData listElement = _beamDataRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ElectromagneticEmissionSystemData.h b/src/dis6/ElectromagneticEmissionSystemData.h index 7384b533..ad576cb4 100644 --- a/src/dis6/ElectromagneticEmissionSystemData.h +++ b/src/dis6/ElectromagneticEmissionSystemData.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/ElectromagneticEmissionBeamData.h" +#include "dis6/EmitterSystem.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Data about one electronic system @@ -28,7 +28,7 @@ class OPENDIS6_EXPORT ElectromagneticEmissionSystemData { unsigned char _numberOfBeams; /** padding. */ - unsigned short _emissionsPadding2; + uint16_t _emissionsPadding2; /** This field shall specify information about a particular emitter system */ EmitterSystem _emitterSystem; @@ -51,8 +51,8 @@ class OPENDIS6_EXPORT ElectromagneticEmissionSystemData { unsigned char getNumberOfBeams() const; - unsigned short getEmissionsPadding2() const; - void setEmissionsPadding2(unsigned short pX); + uint16_t getEmissionsPadding2() const; + void setEmissionsPadding2(uint16_t pX); EmitterSystem& getEmitterSystem(); const EmitterSystem& getEmitterSystem() const; diff --git a/src/dis6/ElectromagneticEmissionsPdu.cpp b/src/dis6/ElectromagneticEmissionsPdu.cpp index 5deb2a67..49427076 100644 --- a/src/dis6/ElectromagneticEmissionsPdu.cpp +++ b/src/dis6/ElectromagneticEmissionsPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ElectromagneticEmissionsPdu.h" using namespace DIS; @@ -51,11 +51,11 @@ unsigned char ElectromagneticEmissionsPdu::getNumberOfSystems() const { return _systems.size(); } -unsigned short ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const { +uint16_t ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const { return _paddingForEmissionsPdu; } -void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(unsigned short pX) { +void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(uint16_t pX) { _paddingForEmissionsPdu = pX; } @@ -136,7 +136,7 @@ int ElectromagneticEmissionsPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfSystems marshalSize = marshalSize + 2; // _paddingForEmissionsPdu - for (unsigned long long idx = 0; idx < _systems.size(); idx++) { + for (uint64_t idx = 0; idx < _systems.size(); idx++) { ElectromagneticEmissionSystemData listElement = _systems[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ElectromagneticEmissionsPdu.h b/src/dis6/ElectromagneticEmissionsPdu.h index 5dfb828b..68c6a7bb 100644 --- a/src/dis6/ElectromagneticEmissionsPdu.h +++ b/src/dis6/ElectromagneticEmissionsPdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis6/DistributedEmissionsFamilyPdu.h" +#include "dis6/ElectromagneticEmissionSystemData.h" +#include "dis6/EntityID.h" +#include "dis6/EventID.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.7.1. Information about active electronic warfare (EW) emissions @@ -39,7 +39,7 @@ class OPENDIS6_EXPORT ElectromagneticEmissionsPdu unsigned char _numberOfSystems; /** padding */ - unsigned short _paddingForEmissionsPdu; + uint16_t _paddingForEmissionsPdu; /** Electromagnetic emmissions systems */ std::vector _systems; @@ -64,8 +64,8 @@ class OPENDIS6_EXPORT ElectromagneticEmissionsPdu unsigned char getNumberOfSystems() const; - unsigned short getPaddingForEmissionsPdu() const; - void setPaddingForEmissionsPdu(unsigned short pX); + uint16_t getPaddingForEmissionsPdu() const; + void setPaddingForEmissionsPdu(uint16_t pX); std::vector& getSystems(); const std::vector& getSystems() const; diff --git a/src/dis6/EmitterSystem.cpp b/src/dis6/EmitterSystem.cpp index 56d36bf0..b81f0822 100644 --- a/src/dis6/EmitterSystem.cpp +++ b/src/dis6/EmitterSystem.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EmitterSystem.h" using namespace DIS; @@ -7,9 +7,9 @@ EmitterSystem::EmitterSystem() EmitterSystem::~EmitterSystem() {} -unsigned short EmitterSystem::getEmitterName() const { return _emitterName; } +uint16_t EmitterSystem::getEmitterName() const { return _emitterName; } -void EmitterSystem::setEmitterName(unsigned short pX) { _emitterName = pX; } +void EmitterSystem::setEmitterName(uint16_t pX) { _emitterName = pX; } unsigned char EmitterSystem::getFunction() const { return _function; } diff --git a/src/dis6/EmitterSystem.h b/src/dis6/EmitterSystem.h index 0b373cf9..286c467a 100644 --- a/src/dis6/EmitterSystem.h +++ b/src/dis6/EmitterSystem.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.11. This field shall specify information about a particular @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS6_EXPORT EmitterSystem { protected: /** Name of the emitter, 16 bit enumeration */ - unsigned short _emitterName; + uint16_t _emitterName; /** function of the emitter, 8 bit enumeration */ unsigned char _function; @@ -30,8 +30,8 @@ class OPENDIS6_EXPORT EmitterSystem { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getEmitterName() const; - void setEmitterName(unsigned short pX); + uint16_t getEmitterName() const; + void setEmitterName(uint16_t pX); unsigned char getFunction() const; void setFunction(unsigned char pX); diff --git a/src/dis6/EntityID.cpp b/src/dis6/EntityID.cpp index 95e8ac56..ad59e297 100644 --- a/src/dis6/EntityID.cpp +++ b/src/dis6/EntityID.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EntityID.h" using namespace DIS; @@ -6,17 +6,17 @@ EntityID::EntityID() : _site(0), _application(0), _entity(0) {} EntityID::~EntityID() {} -unsigned short EntityID::getSite() const { return _site; } +uint16_t EntityID::getSite() const { return _site; } -void EntityID::setSite(unsigned short pX) { _site = pX; } +void EntityID::setSite(uint16_t pX) { _site = pX; } -unsigned short EntityID::getApplication() const { return _application; } +uint16_t EntityID::getApplication() const { return _application; } -void EntityID::setApplication(unsigned short pX) { _application = pX; } +void EntityID::setApplication(uint16_t pX) { _application = pX; } -unsigned short EntityID::getEntity() const { return _entity; } +uint16_t EntityID::getEntity() const { return _entity; } -void EntityID::setEntity(unsigned short pX) { _entity = pX; } +void EntityID::setEntity(uint16_t pX) { _entity = pX; } void EntityID::marshal(DataStream& dataStream) const { dataStream << _site; diff --git a/src/dis6/EntityID.h b/src/dis6/EntityID.h index ee6d5632..2c9a1983 100644 --- a/src/dis6/EntityID.h +++ b/src/dis6/EntityID.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Each entity in a given DIS simulation application shall be given an entity @@ -27,13 +27,13 @@ namespace DIS { class OPENDIS6_EXPORT EntityID { protected: /** The site ID */ - unsigned short _site; + uint16_t _site; /** The application ID */ - unsigned short _application; + uint16_t _application; /** the entity ID */ - unsigned short _entity; + uint16_t _entity; public: EntityID(); @@ -42,14 +42,14 @@ class OPENDIS6_EXPORT EntityID { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + uint16_t getSite() const; + void setSite(uint16_t pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + uint16_t getApplication() const; + void setApplication(uint16_t pX); - unsigned short getEntity() const; - void setEntity(unsigned short pX); + uint16_t getEntity() const; + void setEntity(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/EntityInformationFamilyPdu.cpp b/src/dis6/EntityInformationFamilyPdu.cpp index 615d22f8..99ce6db0 100644 --- a/src/dis6/EntityInformationFamilyPdu.cpp +++ b/src/dis6/EntityInformationFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EntityInformationFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/EntityInformationFamilyPdu.h b/src/dis6/EntityInformationFamilyPdu.h index dff0216e..3c79ffdc 100644 --- a/src/dis6/EntityInformationFamilyPdu.h +++ b/src/dis6/EntityInformationFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.3. Common superclass for EntityState, Collision, diff --git a/src/dis6/EntityManagementFamilyPdu.cpp b/src/dis6/EntityManagementFamilyPdu.cpp index 20fc4ba2..1b26991d 100644 --- a/src/dis6/EntityManagementFamilyPdu.cpp +++ b/src/dis6/EntityManagementFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EntityManagementFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/EntityManagementFamilyPdu.h b/src/dis6/EntityManagementFamilyPdu.h index 11bb0aaf..5e8442e0 100644 --- a/src/dis6/EntityManagementFamilyPdu.h +++ b/src/dis6/EntityManagementFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.9. Common superclass for EntityManagment PDUs, including diff --git a/src/dis6/EntityStatePdu.cpp b/src/dis6/EntityStatePdu.cpp index 388fdc58..3dec7744 100644 --- a/src/dis6/EntityStatePdu.cpp +++ b/src/dis6/EntityStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EntityStatePdu.h" using namespace DIS; @@ -228,7 +228,7 @@ int EntityStatePdu::getMarshalledSize() const { marshalSize = marshalSize + _marking.getMarshalledSize(); // _marking marshalSize = marshalSize + 4; // _capabilities - for (unsigned long long idx = 0; idx < _articulationParameters.size(); + for (uint64_t idx = 0; idx < _articulationParameters.size(); idx++) { ArticulationParameter listElement = _articulationParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/EntityStatePdu.h b/src/dis6/EntityStatePdu.h index ec05530a..4b8bef8b 100644 --- a/src/dis6/EntityStatePdu.h +++ b/src/dis6/EntityStatePdu.h @@ -2,17 +2,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/ArticulationParameter.h" +#include "dis6/DeadReckoningParameter.h" +#include "dis6/EntityID.h" +#include "dis6/EntityInformationFamilyPdu.h" +#include "dis6/EntityType.h" +#include "dis6/Marking.h" +#include "dis6/Orientation.h" +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.3.1. Represents the postion and state of one entity in the world. diff --git a/src/dis6/EntityStateUpdatePdu.cpp b/src/dis6/EntityStateUpdatePdu.cpp index a0c1d2a6..f86fe4db 100644 --- a/src/dis6/EntityStateUpdatePdu.cpp +++ b/src/dis6/EntityStateUpdatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EntityStateUpdatePdu.h" using namespace DIS; @@ -164,7 +164,7 @@ int EntityStateUpdatePdu::getMarshalledSize() const { _entityOrientation.getMarshalledSize(); // _entityOrientation marshalSize = marshalSize + 4; // _entityAppearance - for (unsigned long long idx = 0; idx < _articulationParameters.size(); + for (uint64_t idx = 0; idx < _articulationParameters.size(); idx++) { ArticulationParameter listElement = _articulationParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/EntityStateUpdatePdu.h b/src/dis6/EntityStateUpdatePdu.h index 8e899a87..65a6b532 100644 --- a/src/dis6/EntityStateUpdatePdu.h +++ b/src/dis6/EntityStateUpdatePdu.h @@ -2,14 +2,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/ArticulationParameter.h" +#include "dis6/EntityID.h" +#include "dis6/EntityInformationFamilyPdu.h" +#include "dis6/Orientation.h" +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.3.3.4. Nonstatic information about a particular entity may be communicated diff --git a/src/dis6/EntityType.cpp b/src/dis6/EntityType.cpp index 53547065..99e88480 100644 --- a/src/dis6/EntityType.cpp +++ b/src/dis6/EntityType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EntityType.h" using namespace DIS; @@ -21,9 +21,9 @@ unsigned char EntityType::getDomain() const { return _domain; } void EntityType::setDomain(unsigned char pX) { _domain = pX; } -unsigned short EntityType::getCountry() const { return _country; } +uint16_t EntityType::getCountry() const { return _country; } -void EntityType::setCountry(unsigned short pX) { _country = pX; } +void EntityType::setCountry(uint16_t pX) { _country = pX; } unsigned char EntityType::getCategory() const { return _category; } diff --git a/src/dis6/EntityType.h b/src/dis6/EntityType.h index 8736d902..277f37d8 100644 --- a/src/dis6/EntityType.h +++ b/src/dis6/EntityType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.16. Identifies the type of entity, including kind of entity, @@ -21,7 +21,7 @@ class OPENDIS6_EXPORT EntityType { unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ unsigned char _category; @@ -47,8 +47,8 @@ class OPENDIS6_EXPORT EntityType { unsigned char getDomain() const; void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); unsigned char getCategory() const; void setCategory(unsigned char pX); diff --git a/src/dis6/Environment.cpp b/src/dis6/Environment.cpp index cc5d63a6..70bcb879 100644 --- a/src/dis6/Environment.cpp +++ b/src/dis6/Environment.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/Environment.h" using namespace DIS; diff --git a/src/dis6/Environment.h b/src/dis6/Environment.h index 4ed8ad3e..1c9abb01 100644 --- a/src/dis6/Environment.h +++ b/src/dis6/Environment.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.40. Information about a geometry, a state associated with a diff --git a/src/dis6/EnvironmentalProcessPdu.cpp b/src/dis6/EnvironmentalProcessPdu.cpp index 9afa2158..172059a0 100644 --- a/src/dis6/EnvironmentalProcessPdu.cpp +++ b/src/dis6/EnvironmentalProcessPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EnvironmentalProcessPdu.h" using namespace DIS; @@ -61,11 +61,11 @@ unsigned char EnvironmentalProcessPdu::getNumberOfEnvironmentRecords() const { return _environmentRecords.size(); } -unsigned short EnvironmentalProcessPdu::getSequenceNumber() const { +uint16_t EnvironmentalProcessPdu::getSequenceNumber() const { return _sequenceNumber; } -void EnvironmentalProcessPdu::setSequenceNumber(unsigned short pX) { +void EnvironmentalProcessPdu::setSequenceNumber(uint16_t pX) { _sequenceNumber = pX; } @@ -152,7 +152,7 @@ int EnvironmentalProcessPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfEnvironmentRecords marshalSize = marshalSize + 2; // _sequenceNumber - for (unsigned long long idx = 0; idx < _environmentRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _environmentRecords.size(); idx++) { Environment listElement = _environmentRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/EnvironmentalProcessPdu.h b/src/dis6/EnvironmentalProcessPdu.h index f6ab8cbc..12609932 100644 --- a/src/dis6/EnvironmentalProcessPdu.h +++ b/src/dis6/EnvironmentalProcessPdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityType.h" +#include "dis6/Environment.h" +#include "dis6/SyntheticEnvironmentFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.11.1: Information about environmental effects and processes. This @@ -39,7 +39,7 @@ class OPENDIS6_EXPORT EnvironmentalProcessPdu /** PDU sequence number for the environmentla process if pdu sequencing * required */ - unsigned short _sequenceNumber; + uint16_t _sequenceNumber; /** environemt records */ std::vector _environmentRecords; @@ -67,8 +67,8 @@ class OPENDIS6_EXPORT EnvironmentalProcessPdu unsigned char getNumberOfEnvironmentRecords() const; - unsigned short getSequenceNumber() const; - void setSequenceNumber(unsigned short pX); + uint16_t getSequenceNumber() const; + void setSequenceNumber(uint16_t pX); std::vector& getEnvironmentRecords(); const std::vector& getEnvironmentRecords() const; diff --git a/src/dis6/EventID.cpp b/src/dis6/EventID.cpp index 5422bbdb..54a6123b 100644 --- a/src/dis6/EventID.cpp +++ b/src/dis6/EventID.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EventID.h" using namespace DIS; @@ -6,17 +6,17 @@ EventID::EventID() : _site(0), _application(0), _eventNumber(0) {} EventID::~EventID() {} -unsigned short EventID::getSite() const { return _site; } +uint16_t EventID::getSite() const { return _site; } -void EventID::setSite(unsigned short pX) { _site = pX; } +void EventID::setSite(uint16_t pX) { _site = pX; } -unsigned short EventID::getApplication() const { return _application; } +uint16_t EventID::getApplication() const { return _application; } -void EventID::setApplication(unsigned short pX) { _application = pX; } +void EventID::setApplication(uint16_t pX) { _application = pX; } -unsigned short EventID::getEventNumber() const { return _eventNumber; } +uint16_t EventID::getEventNumber() const { return _eventNumber; } -void EventID::setEventNumber(unsigned short pX) { _eventNumber = pX; } +void EventID::setEventNumber(uint16_t pX) { _eventNumber = pX; } void EventID::marshal(DataStream& dataStream) const { dataStream << _site; diff --git a/src/dis6/EventID.h b/src/dis6/EventID.h index dd020ca6..e61d920b 100644 --- a/src/dis6/EventID.h +++ b/src/dis6/EventID.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.18. Identifies a unique event in a simulation via the combination @@ -15,13 +15,13 @@ namespace DIS { class OPENDIS6_EXPORT EventID { protected: /** The site ID */ - unsigned short _site; + uint16_t _site; /** The application ID */ - unsigned short _application; + uint16_t _application; /** the number of the event */ - unsigned short _eventNumber; + uint16_t _eventNumber; public: EventID(); @@ -30,14 +30,14 @@ class OPENDIS6_EXPORT EventID { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + uint16_t getSite() const; + void setSite(uint16_t pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + uint16_t getApplication() const; + void setApplication(uint16_t pX); - unsigned short getEventNumber() const; - void setEventNumber(unsigned short pX); + uint16_t getEventNumber() const; + void setEventNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/EventReportPdu.cpp b/src/dis6/EventReportPdu.cpp index f761578d..1e2d6a3d 100644 --- a/src/dis6/EventReportPdu.cpp +++ b/src/dis6/EventReportPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EventReportPdu.h" using namespace DIS; @@ -126,12 +126,12 @@ int EventReportPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/EventReportPdu.h b/src/dis6/EventReportPdu.h index 057c3ea6..4f65dbec 100644 --- a/src/dis6/EventReportPdu.h +++ b/src/dis6/EventReportPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.11. Reports occurance of a significant event to the simulation diff --git a/src/dis6/EventReportReliablePdu.cpp b/src/dis6/EventReportReliablePdu.cpp index c9ff41fe..3bce49dc 100644 --- a/src/dis6/EventReportReliablePdu.cpp +++ b/src/dis6/EventReportReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/EventReportReliablePdu.h" using namespace DIS; @@ -16,11 +16,11 @@ EventReportReliablePdu::~EventReportReliablePdu() { _variableDatumRecords.clear(); } -unsigned short EventReportReliablePdu::getEventType() const { +uint16_t EventReportReliablePdu::getEventType() const { return _eventType; } -void EventReportReliablePdu::setEventType(unsigned short pX) { +void EventReportReliablePdu::setEventType(uint16_t pX) { _eventType = pX; } @@ -138,12 +138,12 @@ int EventReportReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/EventReportReliablePdu.h b/src/dis6/EventReportReliablePdu.h index f996cee3..11481a30 100644 --- a/src/dis6/EventReportReliablePdu.h +++ b/src/dis6/EventReportReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.11: reports the occurance of a significatnt event to the @@ -22,7 +22,7 @@ class OPENDIS6_EXPORT EventReportReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Event type */ - unsigned short _eventType; + uint16_t _eventType; /** padding */ unsigned int _pad1; @@ -46,8 +46,8 @@ class OPENDIS6_EXPORT EventReportReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + uint16_t getEventType() const; + void setEventType(uint16_t pX); unsigned int getPad1() const; void setPad1(unsigned int pX); diff --git a/src/dis6/FastEntityStatePdu.cpp b/src/dis6/FastEntityStatePdu.cpp index 7e082bc4..e1469f41 100644 --- a/src/dis6/FastEntityStatePdu.cpp +++ b/src/dis6/FastEntityStatePdu.cpp @@ -1,6 +1,6 @@ #include -#include +#include "dis6/FastEntityStatePdu.h" using namespace DIS; @@ -58,21 +58,21 @@ FastEntityStatePdu::FastEntityStatePdu() FastEntityStatePdu::~FastEntityStatePdu() { _articulationParameters.clear(); } -unsigned short FastEntityStatePdu::getSite() const { return _site; } +uint16_t FastEntityStatePdu::getSite() const { return _site; } -void FastEntityStatePdu::setSite(unsigned short pX) { _site = pX; } +void FastEntityStatePdu::setSite(uint16_t pX) { _site = pX; } -unsigned short FastEntityStatePdu::getApplication() const { +uint16_t FastEntityStatePdu::getApplication() const { return _application; } -void FastEntityStatePdu::setApplication(unsigned short pX) { +void FastEntityStatePdu::setApplication(uint16_t pX) { _application = pX; } -unsigned short FastEntityStatePdu::getEntity() const { return _entity; } +uint16_t FastEntityStatePdu::getEntity() const { return _entity; } -void FastEntityStatePdu::setEntity(unsigned short pX) { _entity = pX; } +void FastEntityStatePdu::setEntity(uint16_t pX) { _entity = pX; } unsigned char FastEntityStatePdu::getForceId() const { return _forceId; } @@ -90,9 +90,9 @@ unsigned char FastEntityStatePdu::getDomain() const { return _domain; } void FastEntityStatePdu::setDomain(unsigned char pX) { _domain = pX; } -unsigned short FastEntityStatePdu::getCountry() const { return _country; } +uint16_t FastEntityStatePdu::getCountry() const { return _country; } -void FastEntityStatePdu::setCountry(unsigned short pX) { _country = pX; } +void FastEntityStatePdu::setCountry(uint16_t pX) { _country = pX; } unsigned char FastEntityStatePdu::getCategory() const { return _category; } @@ -124,9 +124,9 @@ unsigned char FastEntityStatePdu::getAltDomain() const { return _altDomain; } void FastEntityStatePdu::setAltDomain(unsigned char pX) { _altDomain = pX; } -unsigned short FastEntityStatePdu::getAltCountry() const { return _altCountry; } +uint16_t FastEntityStatePdu::getAltCountry() const { return _altCountry; } -void FastEntityStatePdu::setAltCountry(unsigned short pX) { _altCountry = pX; } +void FastEntityStatePdu::setAltCountry(uint16_t pX) { _altCountry = pX; } unsigned char FastEntityStatePdu::getAltCategory() const { return _altCategory; @@ -508,7 +508,7 @@ int FastEntityStatePdu::getMarshalledSize() const { marshalSize = marshalSize + 12 * 1; // _marking marshalSize = marshalSize + 4; // _capabilities - for (unsigned long long idx = 0; idx < _articulationParameters.size(); + for (uint64_t idx = 0; idx < _articulationParameters.size(); idx++) { ArticulationParameter listElement = _articulationParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/FastEntityStatePdu.h b/src/dis6/FastEntityStatePdu.h index 2b899b19..1800f17e 100644 --- a/src/dis6/FastEntityStatePdu.h +++ b/src/dis6/FastEntityStatePdu.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis6/ArticulationParameter.h" +#include "dis6/EntityInformationFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.3.1. Represents the postion and state of one entity in the world. @@ -20,13 +20,13 @@ namespace DIS { class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { protected: /** The site ID */ - unsigned short _site; + uint16_t _site; /** The application ID */ - unsigned short _application; + uint16_t _application; /** the entity ID */ - unsigned short _entity; + uint16_t _entity; /** what force this entity is affiliated with, eg red, blue, neutral, etc */ unsigned char _forceId; @@ -41,7 +41,7 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ unsigned char _category; @@ -61,7 +61,7 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { unsigned char _altDomain; /** country to which the design of the entity is attributed */ - unsigned short _altCountry; + uint16_t _altCountry; /** category of entity */ unsigned char _altCategory; @@ -143,14 +143,14 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + uint16_t getSite() const; + void setSite(uint16_t pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + uint16_t getApplication() const; + void setApplication(uint16_t pX); - unsigned short getEntity() const; - void setEntity(unsigned short pX); + uint16_t getEntity() const; + void setEntity(uint16_t pX); unsigned char getForceId() const; void setForceId(unsigned char pX); @@ -163,8 +163,8 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { unsigned char getDomain() const; void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); unsigned char getCategory() const; void setCategory(unsigned char pX); @@ -184,8 +184,8 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { unsigned char getAltDomain() const; void setAltDomain(unsigned char pX); - unsigned short getAltCountry() const; - void setAltCountry(unsigned short pX); + uint16_t getAltCountry() const; + void setAltCountry(uint16_t pX); unsigned char getAltCategory() const; void setAltCategory(unsigned char pX); diff --git a/src/dis6/FirePdu.cpp b/src/dis6/FirePdu.cpp index edaf013a..86ebab9a 100644 --- a/src/dis6/FirePdu.cpp +++ b/src/dis6/FirePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/FirePdu.h" using namespace DIS; diff --git a/src/dis6/FirePdu.h b/src/dis6/FirePdu.h index 02bf2238..56ff70ff 100644 --- a/src/dis6/FirePdu.h +++ b/src/dis6/FirePdu.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/BurstDescriptor.h" +#include "dis6/EntityID.h" +#include "dis6/EventID.h" +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/WarfareFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Sectioin 5.3.4.1. Information about someone firing something. COMPLETE diff --git a/src/dis6/FixedDatum.cpp b/src/dis6/FixedDatum.cpp index 195429d8..078c186e 100644 --- a/src/dis6/FixedDatum.cpp +++ b/src/dis6/FixedDatum.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/FixedDatum.h" using namespace DIS; diff --git a/src/dis6/FixedDatum.h b/src/dis6/FixedDatum.h index f6a89210..1a34fbb5 100644 --- a/src/dis6/FixedDatum.h +++ b/src/dis6/FixedDatum.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.18. Fixed Datum Record diff --git a/src/dis6/FourByteChunk.cpp b/src/dis6/FourByteChunk.cpp index 41afa438..4265d0f2 100644 --- a/src/dis6/FourByteChunk.cpp +++ b/src/dis6/FourByteChunk.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/FourByteChunk.h" using namespace DIS; diff --git a/src/dis6/FourByteChunk.h b/src/dis6/FourByteChunk.h index ff7fb27b..24463529 100644 --- a/src/dis6/FourByteChunk.h +++ b/src/dis6/FourByteChunk.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 32 bit piece of data diff --git a/src/dis6/FundamentalParameterData.cpp b/src/dis6/FundamentalParameterData.cpp index b40b0249..77e8b8ba 100644 --- a/src/dis6/FundamentalParameterData.cpp +++ b/src/dis6/FundamentalParameterData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/FundamentalParameterData.h" using namespace DIS; diff --git a/src/dis6/FundamentalParameterData.h b/src/dis6/FundamentalParameterData.h index 16bab4f9..3929bb6f 100644 --- a/src/dis6/FundamentalParameterData.h +++ b/src/dis6/FundamentalParameterData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.22. Contains electromagnetic emmision regineratin parameters that diff --git a/src/dis6/FundamentalParameterDataIff.cpp b/src/dis6/FundamentalParameterDataIff.cpp index da06a941..7b4180af 100644 --- a/src/dis6/FundamentalParameterDataIff.cpp +++ b/src/dis6/FundamentalParameterDataIff.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/FundamentalParameterDataIff.h" using namespace DIS; @@ -46,9 +46,9 @@ void FundamentalParameterDataIff::setApplicableModes(unsigned char pX) { _applicableModes = pX; } -unsigned short FundamentalParameterDataIff::getPad2() const { return _pad2; } +uint16_t FundamentalParameterDataIff::getPad2() const { return _pad2; } -void FundamentalParameterDataIff::setPad2(unsigned short pX) { _pad2 = pX; } +void FundamentalParameterDataIff::setPad2(uint16_t pX) { _pad2 = pX; } unsigned char FundamentalParameterDataIff::getPad3() const { return _pad3; } diff --git a/src/dis6/FundamentalParameterDataIff.h b/src/dis6/FundamentalParameterDataIff.h index f3229c50..9c512c6b 100644 --- a/src/dis6/FundamentalParameterDataIff.h +++ b/src/dis6/FundamentalParameterDataIff.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.45. Fundamental IFF atc data @@ -32,7 +32,7 @@ class OPENDIS6_EXPORT FundamentalParameterDataIff { unsigned char _applicableModes; /** padding */ - unsigned short _pad2; + uint16_t _pad2; /** padding */ unsigned char _pad3; @@ -62,8 +62,8 @@ class OPENDIS6_EXPORT FundamentalParameterDataIff { unsigned char getApplicableModes() const; void setApplicableModes(unsigned char pX); - unsigned short getPad2() const; - void setPad2(unsigned short pX); + uint16_t getPad2() const; + void setPad2(uint16_t pX); unsigned char getPad3() const; void setPad3(unsigned char pX); diff --git a/src/dis6/GridAxisRecord.cpp b/src/dis6/GridAxisRecord.cpp index 4598855c..fb1a4712 100644 --- a/src/dis6/GridAxisRecord.cpp +++ b/src/dis6/GridAxisRecord.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/GridAxisRecord.h" using namespace DIS; @@ -6,15 +6,15 @@ GridAxisRecord::GridAxisRecord() : _sampleType(0), _dataRepresentation(0) {} GridAxisRecord::~GridAxisRecord() {} -unsigned short GridAxisRecord::getSampleType() const { return _sampleType; } +uint16_t GridAxisRecord::getSampleType() const { return _sampleType; } -void GridAxisRecord::setSampleType(unsigned short pX) { _sampleType = pX; } +void GridAxisRecord::setSampleType(uint16_t pX) { _sampleType = pX; } -unsigned short GridAxisRecord::getDataRepresentation() const { +uint16_t GridAxisRecord::getDataRepresentation() const { return _dataRepresentation; } -void GridAxisRecord::setDataRepresentation(unsigned short pX) { +void GridAxisRecord::setDataRepresentation(uint16_t pX) { _dataRepresentation = pX; } diff --git a/src/dis6/GridAxisRecord.h b/src/dis6/GridAxisRecord.h index 768d8b09..0f52452c 100644 --- a/src/dis6/GridAxisRecord.h +++ b/src/dis6/GridAxisRecord.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.44: Grid data record, a common abstract superclass for several subtypes @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT GridAxisRecord { protected: /** type of environmental sample */ - unsigned short _sampleType; + uint16_t _sampleType; /** value that describes data representation */ - unsigned short _dataRepresentation; + uint16_t _dataRepresentation; public: GridAxisRecord(); @@ -26,11 +26,11 @@ class OPENDIS6_EXPORT GridAxisRecord { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSampleType() const; - void setSampleType(unsigned short pX); + uint16_t getSampleType() const; + void setSampleType(uint16_t pX); - unsigned short getDataRepresentation() const; - void setDataRepresentation(unsigned short pX); + uint16_t getDataRepresentation() const; + void setDataRepresentation(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/GridAxisRecordRepresentation0.cpp b/src/dis6/GridAxisRecordRepresentation0.cpp index 874304d2..bafafe19 100644 --- a/src/dis6/GridAxisRecordRepresentation0.cpp +++ b/src/dis6/GridAxisRecordRepresentation0.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/GridAxisRecordRepresentation0.h" using namespace DIS; @@ -9,7 +9,7 @@ GridAxisRecordRepresentation0::~GridAxisRecordRepresentation0() { _dataValues.clear(); } -unsigned short GridAxisRecordRepresentation0::getNumberOfBytes() const { +uint16_t GridAxisRecordRepresentation0::getNumberOfBytes() const { return _dataValues.size(); } @@ -30,7 +30,7 @@ void GridAxisRecordRepresentation0::setDataValues( void GridAxisRecordRepresentation0::marshal(DataStream& dataStream) const { GridAxisRecord::marshal( dataStream); // Marshal information in superclass first - dataStream << (unsigned short)_dataValues.size(); + dataStream << (uint16_t)_dataValues.size(); for (auto& byte : _dataValues) { dataStream << byte; diff --git a/src/dis6/GridAxisRecordRepresentation0.h b/src/dis6/GridAxisRecordRepresentation0.h index 9b674267..60beec4e 100644 --- a/src/dis6/GridAxisRecordRepresentation0.h +++ b/src/dis6/GridAxisRecordRepresentation0.h @@ -18,7 +18,7 @@ namespace DIS { class OPENDIS6_EXPORT GridAxisRecordRepresentation0 : public GridAxisRecord { protected: /** number of bytes of environmental state data */ - unsigned short _numberOfBytes; + uint16_t _numberOfBytes; /** variable length list of data parameters ^^^this is wrong--need padding as * well */ @@ -31,7 +31,7 @@ class OPENDIS6_EXPORT GridAxisRecordRepresentation0 : public GridAxisRecord { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getNumberOfBytes() const; + uint16_t getNumberOfBytes() const; std::vector& getDataValues(); const std::vector& getDataValues() const; diff --git a/src/dis6/GridAxisRecordRepresentation1.cpp b/src/dis6/GridAxisRecordRepresentation1.cpp index 03fce267..56f1bbac 100644 --- a/src/dis6/GridAxisRecordRepresentation1.cpp +++ b/src/dis6/GridAxisRecordRepresentation1.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/GridAxisRecordRepresentation1.h" using namespace DIS; @@ -28,7 +28,7 @@ void GridAxisRecordRepresentation1::setFieldOffset(float pX) { _fieldOffset = pX; } -unsigned short GridAxisRecordRepresentation1::getNumberOfValues() const { +uint16_t GridAxisRecordRepresentation1::getNumberOfValues() const { return _dataValues.size(); } @@ -51,7 +51,7 @@ void GridAxisRecordRepresentation1::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _fieldScale; dataStream << _fieldOffset; - dataStream << (unsigned short)_dataValues.size(); + dataStream << (uint16_t)_dataValues.size(); for (size_t idx = 0; idx < _dataValues.size(); idx++) { TwoByteChunk x = _dataValues[idx]; @@ -98,7 +98,7 @@ int GridAxisRecordRepresentation1::getMarshalledSize() const { marshalSize = marshalSize + 4; // _fieldOffset marshalSize = marshalSize + 2; // _numberOfValues - for (unsigned long long idx = 0; idx < _dataValues.size(); idx++) { + for (uint64_t idx = 0; idx < _dataValues.size(); idx++) { TwoByteChunk listElement = _dataValues[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/GridAxisRecordRepresentation1.h b/src/dis6/GridAxisRecordRepresentation1.h index 7f67fefa..0cc1d9de 100644 --- a/src/dis6/GridAxisRecordRepresentation1.h +++ b/src/dis6/GridAxisRecordRepresentation1.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis6/GridAxisRecord.h" +#include "dis6/TwoByteChunk.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.44: Grid data record, representation 1 @@ -24,7 +24,7 @@ class OPENDIS6_EXPORT GridAxisRecordRepresentation1 : public GridAxisRecord { float _fieldOffset; /** Number of data values */ - unsigned short _numberOfValues; + uint16_t _numberOfValues; /** variable length list of data parameters ^^^this is wrong--need padding as * well */ @@ -43,7 +43,7 @@ class OPENDIS6_EXPORT GridAxisRecordRepresentation1 : public GridAxisRecord { float getFieldOffset() const; void setFieldOffset(float pX); - unsigned short getNumberOfValues() const; + uint16_t getNumberOfValues() const; std::vector& getDataValues(); const std::vector& getDataValues() const; diff --git a/src/dis6/GridAxisRecordRepresentation2.cpp b/src/dis6/GridAxisRecordRepresentation2.cpp index 8bbffafc..8c199064 100644 --- a/src/dis6/GridAxisRecordRepresentation2.cpp +++ b/src/dis6/GridAxisRecordRepresentation2.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/GridAxisRecordRepresentation2.h" using namespace DIS; @@ -9,7 +9,7 @@ GridAxisRecordRepresentation2::~GridAxisRecordRepresentation2() { _dataValues.clear(); } -unsigned short GridAxisRecordRepresentation2::getNumberOfValues() const { +uint16_t GridAxisRecordRepresentation2::getNumberOfValues() const { return _dataValues.size(); } @@ -30,7 +30,7 @@ void GridAxisRecordRepresentation2::setDataValues( void GridAxisRecordRepresentation2::marshal(DataStream& dataStream) const { GridAxisRecord::marshal( dataStream); // Marshal information in superclass first - dataStream << (unsigned short)_dataValues.size(); + dataStream << (uint16_t)_dataValues.size(); for (size_t idx = 0; idx < _dataValues.size(); idx++) { FourByteChunk x = _dataValues[idx]; @@ -70,7 +70,7 @@ int GridAxisRecordRepresentation2::getMarshalledSize() const { marshalSize = GridAxisRecord::getMarshalledSize(); marshalSize = marshalSize + 2; // _numberOfValues - for (unsigned long long idx = 0; idx < _dataValues.size(); idx++) { + for (uint64_t idx = 0; idx < _dataValues.size(); idx++) { FourByteChunk listElement = _dataValues[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/GridAxisRecordRepresentation2.h b/src/dis6/GridAxisRecordRepresentation2.h index eb4bb2d7..12a24495 100644 --- a/src/dis6/GridAxisRecordRepresentation2.h +++ b/src/dis6/GridAxisRecordRepresentation2.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis6/FourByteChunk.h" +#include "dis6/GridAxisRecord.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.44: Grid data record, representation 1 @@ -18,7 +18,7 @@ namespace DIS { class OPENDIS6_EXPORT GridAxisRecordRepresentation2 : public GridAxisRecord { protected: /** number of values */ - unsigned short _numberOfValues; + uint16_t _numberOfValues; /** variable length list of data parameters ^^^this is wrong--need padding as * well */ @@ -31,7 +31,7 @@ class OPENDIS6_EXPORT GridAxisRecordRepresentation2 : public GridAxisRecord { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getNumberOfValues() const; + uint16_t getNumberOfValues() const; std::vector& getDataValues(); const std::vector& getDataValues() const; diff --git a/src/dis6/GriddedDataPdu.cpp b/src/dis6/GriddedDataPdu.cpp index 441cdfa4..e4cb579a 100644 --- a/src/dis6/GriddedDataPdu.cpp +++ b/src/dis6/GriddedDataPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/GriddedDataPdu.h" using namespace DIS; @@ -37,23 +37,23 @@ void GriddedDataPdu::setEnvironmentalSimulationApplicationID( _environmentalSimulationApplicationID = pX; } -unsigned short GriddedDataPdu::getFieldNumber() const { return _fieldNumber; } +uint16_t GriddedDataPdu::getFieldNumber() const { return _fieldNumber; } -void GriddedDataPdu::setFieldNumber(unsigned short pX) { _fieldNumber = pX; } +void GriddedDataPdu::setFieldNumber(uint16_t pX) { _fieldNumber = pX; } -unsigned short GriddedDataPdu::getPduNumber() const { return _pduNumber; } +uint16_t GriddedDataPdu::getPduNumber() const { return _pduNumber; } -void GriddedDataPdu::setPduNumber(unsigned short pX) { _pduNumber = pX; } +void GriddedDataPdu::setPduNumber(uint16_t pX) { _pduNumber = pX; } -unsigned short GriddedDataPdu::getPduTotal() const { return _pduTotal; } +uint16_t GriddedDataPdu::getPduTotal() const { return _pduTotal; } -void GriddedDataPdu::setPduTotal(unsigned short pX) { _pduTotal = pX; } +void GriddedDataPdu::setPduTotal(uint16_t pX) { _pduTotal = pX; } -unsigned short GriddedDataPdu::getCoordinateSystem() const { +uint16_t GriddedDataPdu::getCoordinateSystem() const { return _coordinateSystem; } -void GriddedDataPdu::setCoordinateSystem(unsigned short pX) { +void GriddedDataPdu::setCoordinateSystem(uint16_t pX) { _coordinateSystem = pX; } @@ -85,9 +85,9 @@ void GriddedDataPdu::setOrientation(const Orientation& pX) { _orientation = pX; } -unsigned long long GriddedDataPdu::getSampleTime() const { return _sampleTime; } +uint64_t GriddedDataPdu::getSampleTime() const { return _sampleTime; } -void GriddedDataPdu::setSampleTime(unsigned long long pX) { _sampleTime = pX; } +void GriddedDataPdu::setSampleTime(uint64_t pX) { _sampleTime = pX; } unsigned int GriddedDataPdu::getTotalValues() const { return _totalValues; } @@ -101,9 +101,9 @@ void GriddedDataPdu::setVectorDimension(unsigned char pX) { _vectorDimension = pX; } -unsigned short GriddedDataPdu::getPadding1() const { return _padding1; } +uint16_t GriddedDataPdu::getPadding1() const { return _padding1; } -void GriddedDataPdu::setPadding1(unsigned short pX) { _padding1 = pX; } +void GriddedDataPdu::setPadding1(uint16_t pX) { _padding1 = pX; } unsigned char GriddedDataPdu::getPadding2() const { return _padding2; } @@ -222,7 +222,7 @@ int GriddedDataPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _padding1 marshalSize = marshalSize + 1; // _padding2 - for (unsigned long long idx = 0; idx < _gridDataList.size(); idx++) { + for (uint64_t idx = 0; idx < _gridDataList.size(); idx++) { GridAxisRecord listElement = _gridDataList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/GriddedDataPdu.h b/src/dis6/GriddedDataPdu.h index ac43f171..112872f1 100644 --- a/src/dis6/GriddedDataPdu.h +++ b/src/dis6/GriddedDataPdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityType.h" +#include "dis6/GridAxisRecord.h" +#include "dis6/Orientation.h" +#include "dis6/SyntheticEnvironmentFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.11.2: Information about globat, spatially varying enviornmental @@ -26,16 +26,16 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { EntityID _environmentalSimulationApplicationID; /** unique identifier for each piece of enviornmental data */ - unsigned short _fieldNumber; + uint16_t _fieldNumber; /** sequence number for the total set of PDUS used to transmit the data */ - unsigned short _pduNumber; + uint16_t _pduNumber; /** Total number of PDUS used to transmit the data */ - unsigned short _pduTotal; + uint16_t _pduTotal; /** coordinate system of the grid */ - unsigned short _coordinateSystem; + uint16_t _coordinateSystem; /** number of grid axes for the environmental data */ unsigned char _numberOfGridAxes; @@ -50,7 +50,7 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { Orientation _orientation; /** valid time of the enviormental data sample, 64 bit unsigned int */ - unsigned long long _sampleTime; + uint64_t _sampleTime; /** total number of all data values for all pdus for an environmental sample */ @@ -60,7 +60,7 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { unsigned char _vectorDimension; /** padding */ - unsigned short _padding1; + uint16_t _padding1; /** padding */ unsigned char _padding2; @@ -79,17 +79,17 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { const EntityID& getEnvironmentalSimulationApplicationID() const; void setEnvironmentalSimulationApplicationID(const EntityID& pX); - unsigned short getFieldNumber() const; - void setFieldNumber(unsigned short pX); + uint16_t getFieldNumber() const; + void setFieldNumber(uint16_t pX); - unsigned short getPduNumber() const; - void setPduNumber(unsigned short pX); + uint16_t getPduNumber() const; + void setPduNumber(uint16_t pX); - unsigned short getPduTotal() const; - void setPduTotal(unsigned short pX); + uint16_t getPduTotal() const; + void setPduTotal(uint16_t pX); - unsigned short getCoordinateSystem() const; - void setCoordinateSystem(unsigned short pX); + uint16_t getCoordinateSystem() const; + void setCoordinateSystem(uint16_t pX); unsigned char getNumberOfGridAxes() const; @@ -104,8 +104,8 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { const Orientation& getOrientation() const; void setOrientation(const Orientation& pX); - unsigned long long getSampleTime() const; - void setSampleTime(unsigned long long pX); + uint64_t getSampleTime() const; + void setSampleTime(uint64_t pX); unsigned int getTotalValues() const; void setTotalValues(unsigned int pX); @@ -113,8 +113,8 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { unsigned char getVectorDimension() const; void setVectorDimension(unsigned char pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + uint16_t getPadding1() const; + void setPadding1(uint16_t pX); unsigned char getPadding2() const; void setPadding2(unsigned char pX); diff --git a/src/dis6/IffAtcNavAidsLayer1Pdu.cpp b/src/dis6/IffAtcNavAidsLayer1Pdu.cpp index 64d24891..d79df8a4 100644 --- a/src/dis6/IffAtcNavAidsLayer1Pdu.cpp +++ b/src/dis6/IffAtcNavAidsLayer1Pdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IffAtcNavAidsLayer1Pdu.h" using namespace DIS; @@ -51,9 +51,9 @@ const SystemID& IffAtcNavAidsLayer1Pdu::getSystemID() const { void IffAtcNavAidsLayer1Pdu::setSystemID(const SystemID& pX) { _systemID = pX; } -unsigned short IffAtcNavAidsLayer1Pdu::getPad2() const { return _pad2; } +uint16_t IffAtcNavAidsLayer1Pdu::getPad2() const { return _pad2; } -void IffAtcNavAidsLayer1Pdu::setPad2(unsigned short pX) { _pad2 = pX; } +void IffAtcNavAidsLayer1Pdu::setPad2(uint16_t pX) { _pad2 = pX; } IffFundamentalData& IffAtcNavAidsLayer1Pdu::getFundamentalParameters() { return _fundamentalParameters; diff --git a/src/dis6/IffAtcNavAidsLayer1Pdu.h b/src/dis6/IffAtcNavAidsLayer1Pdu.h index 93d655c9..0bf02ae4 100644 --- a/src/dis6/IffAtcNavAidsLayer1Pdu.h +++ b/src/dis6/IffAtcNavAidsLayer1Pdu.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/DistributedEmissionsFamilyPdu.h" +#include "dis6/EntityID.h" +#include "dis6/EventID.h" +#include "dis6/IffFundamentalData.h" +#include "dis6/SystemID.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.3.7.4.1: Navigational and IFF PDU. COMPLETE @@ -34,7 +34,7 @@ class OPENDIS6_EXPORT IffAtcNavAidsLayer1Pdu SystemID _systemID; /** padding */ - unsigned short _pad2; + uint16_t _pad2; /** fundamental parameters */ IffFundamentalData _fundamentalParameters; @@ -62,8 +62,8 @@ class OPENDIS6_EXPORT IffAtcNavAidsLayer1Pdu const SystemID& getSystemID() const; void setSystemID(const SystemID& pX); - unsigned short getPad2() const; - void setPad2(unsigned short pX); + uint16_t getPad2() const; + void setPad2(uint16_t pX); IffFundamentalData& getFundamentalParameters(); const IffFundamentalData& getFundamentalParameters() const; diff --git a/src/dis6/IffAtcNavAidsLayer2Pdu.cpp b/src/dis6/IffAtcNavAidsLayer2Pdu.cpp index 0065739b..70c68be7 100644 --- a/src/dis6/IffAtcNavAidsLayer2Pdu.cpp +++ b/src/dis6/IffAtcNavAidsLayer2Pdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IffAtcNavAidsLayer2Pdu.h" using namespace DIS; @@ -114,7 +114,7 @@ int IffAtcNavAidsLayer2Pdu::getMarshalledSize() const { marshalSize + _secondaryOperationalData .getMarshalledSize(); // _secondaryOperationalData - for (unsigned long long idx = 0; idx < _fundamentalIffParameters.size(); + for (uint64_t idx = 0; idx < _fundamentalIffParameters.size(); idx++) { FundamentalParameterDataIff listElement = _fundamentalIffParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/IffAtcNavAidsLayer2Pdu.h b/src/dis6/IffAtcNavAidsLayer2Pdu.h index 82f76422..aeb40814 100644 --- a/src/dis6/IffAtcNavAidsLayer2Pdu.h +++ b/src/dis6/IffAtcNavAidsLayer2Pdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis6/BeamData.h" +#include "dis6/FundamentalParameterDataIff.h" +#include "dis6/IffAtcNavAidsLayer1Pdu.h" +#include "dis6/LayerHeader.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the diff --git a/src/dis6/IffFundamentalData.cpp b/src/dis6/IffFundamentalData.cpp index b8b14589..a5b70fb4 100644 --- a/src/dis6/IffFundamentalData.cpp +++ b/src/dis6/IffFundamentalData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IffFundamentalData.h" using namespace DIS; @@ -44,29 +44,29 @@ unsigned char IffFundamentalData::getModifier() const { return _modifier; } void IffFundamentalData::setModifier(unsigned char pX) { _modifier = pX; } -unsigned short IffFundamentalData::getParameter1() const { return _parameter1; } +uint16_t IffFundamentalData::getParameter1() const { return _parameter1; } -void IffFundamentalData::setParameter1(unsigned short pX) { _parameter1 = pX; } +void IffFundamentalData::setParameter1(uint16_t pX) { _parameter1 = pX; } -unsigned short IffFundamentalData::getParameter2() const { return _parameter2; } +uint16_t IffFundamentalData::getParameter2() const { return _parameter2; } -void IffFundamentalData::setParameter2(unsigned short pX) { _parameter2 = pX; } +void IffFundamentalData::setParameter2(uint16_t pX) { _parameter2 = pX; } -unsigned short IffFundamentalData::getParameter3() const { return _parameter3; } +uint16_t IffFundamentalData::getParameter3() const { return _parameter3; } -void IffFundamentalData::setParameter3(unsigned short pX) { _parameter3 = pX; } +void IffFundamentalData::setParameter3(uint16_t pX) { _parameter3 = pX; } -unsigned short IffFundamentalData::getParameter4() const { return _parameter4; } +uint16_t IffFundamentalData::getParameter4() const { return _parameter4; } -void IffFundamentalData::setParameter4(unsigned short pX) { _parameter4 = pX; } +void IffFundamentalData::setParameter4(uint16_t pX) { _parameter4 = pX; } -unsigned short IffFundamentalData::getParameter5() const { return _parameter5; } +uint16_t IffFundamentalData::getParameter5() const { return _parameter5; } -void IffFundamentalData::setParameter5(unsigned short pX) { _parameter5 = pX; } +void IffFundamentalData::setParameter5(uint16_t pX) { _parameter5 = pX; } -unsigned short IffFundamentalData::getParameter6() const { return _parameter6; } +uint16_t IffFundamentalData::getParameter6() const { return _parameter6; } -void IffFundamentalData::setParameter6(unsigned short pX) { _parameter6 = pX; } +void IffFundamentalData::setParameter6(uint16_t pX) { _parameter6 = pX; } void IffFundamentalData::marshal(DataStream& dataStream) const { dataStream << _systemStatus; diff --git a/src/dis6/IffFundamentalData.h b/src/dis6/IffFundamentalData.h index 9c370309..d81110d1 100644 --- a/src/dis6/IffFundamentalData.h +++ b/src/dis6/IffFundamentalData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.42. Basic operational data ofr IFF ATC NAVAIDS @@ -26,22 +26,22 @@ class OPENDIS6_EXPORT IffFundamentalData { unsigned char _modifier; /** parameter, enumeration */ - unsigned short _parameter1; + uint16_t _parameter1; /** parameter, enumeration */ - unsigned short _parameter2; + uint16_t _parameter2; /** parameter, enumeration */ - unsigned short _parameter3; + uint16_t _parameter3; /** parameter, enumeration */ - unsigned short _parameter4; + uint16_t _parameter4; /** parameter, enumeration */ - unsigned short _parameter5; + uint16_t _parameter5; /** parameter, enumeration */ - unsigned short _parameter6; + uint16_t _parameter6; public: IffFundamentalData(); @@ -62,23 +62,23 @@ class OPENDIS6_EXPORT IffFundamentalData { unsigned char getModifier() const; void setModifier(unsigned char pX); - unsigned short getParameter1() const; - void setParameter1(unsigned short pX); + uint16_t getParameter1() const; + void setParameter1(uint16_t pX); - unsigned short getParameter2() const; - void setParameter2(unsigned short pX); + uint16_t getParameter2() const; + void setParameter2(uint16_t pX); - unsigned short getParameter3() const; - void setParameter3(unsigned short pX); + uint16_t getParameter3() const; + void setParameter3(uint16_t pX); - unsigned short getParameter4() const; - void setParameter4(unsigned short pX); + uint16_t getParameter4() const; + void setParameter4(uint16_t pX); - unsigned short getParameter5() const; - void setParameter5(unsigned short pX); + uint16_t getParameter5() const; + void setParameter5(uint16_t pX); - unsigned short getParameter6() const; - void setParameter6(unsigned short pX); + uint16_t getParameter6() const; + void setParameter6(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/IntercomCommunicationsParameters.cpp b/src/dis6/IntercomCommunicationsParameters.cpp index 1d0246c7..710069e4 100644 --- a/src/dis6/IntercomCommunicationsParameters.cpp +++ b/src/dis6/IntercomCommunicationsParameters.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IntercomCommunicationsParameters.h" using namespace DIS; @@ -7,19 +7,19 @@ IntercomCommunicationsParameters::IntercomCommunicationsParameters() IntercomCommunicationsParameters::~IntercomCommunicationsParameters() {} -unsigned short IntercomCommunicationsParameters::getRecordType() const { +uint16_t IntercomCommunicationsParameters::getRecordType() const { return _recordType; } -void IntercomCommunicationsParameters::setRecordType(unsigned short pX) { +void IntercomCommunicationsParameters::setRecordType(uint16_t pX) { _recordType = pX; } -unsigned short IntercomCommunicationsParameters::getRecordLength() const { +uint16_t IntercomCommunicationsParameters::getRecordLength() const { return _recordLength; } -void IntercomCommunicationsParameters::setRecordLength(unsigned short pX) { +void IntercomCommunicationsParameters::setRecordLength(uint16_t pX) { _recordLength = pX; } diff --git a/src/dis6/IntercomCommunicationsParameters.h b/src/dis6/IntercomCommunicationsParameters.h index 05b28ead..8a645e88 100644 --- a/src/dis6/IntercomCommunicationsParameters.h +++ b/src/dis6/IntercomCommunicationsParameters.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.46. Intercom communcations parameters @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT IntercomCommunicationsParameters { protected: /** Type of intercom parameters record */ - unsigned short _recordType; + uint16_t _recordType; /** length of record */ - unsigned short _recordLength; + uint16_t _recordLength; /** Jerks. Looks like the committee is forcing a lookup of the record type * parameter to find out how long the field is. This is a placeholder. */ @@ -30,11 +30,11 @@ class OPENDIS6_EXPORT IntercomCommunicationsParameters { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getRecordType() const; - void setRecordType(unsigned short pX); + uint16_t getRecordType() const; + void setRecordType(uint16_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); unsigned int getRecordSpecificField() const; void setRecordSpecificField(unsigned int pX); diff --git a/src/dis6/IntercomControlPdu.cpp b/src/dis6/IntercomControlPdu.cpp index 744f753b..13ac7827 100644 --- a/src/dis6/IntercomControlPdu.cpp +++ b/src/dis6/IntercomControlPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IntercomControlPdu.h" using namespace DIS; @@ -90,11 +90,11 @@ void IntercomControlPdu::setMasterEntityID(const EntityID& pX) { _masterEntityID = pX; } -unsigned short IntercomControlPdu::getMasterCommunicationsDeviceID() const { +uint16_t IntercomControlPdu::getMasterCommunicationsDeviceID() const { return _masterCommunicationsDeviceID; } -void IntercomControlPdu::setMasterCommunicationsDeviceID(unsigned short pX) { +void IntercomControlPdu::setMasterCommunicationsDeviceID(uint16_t pX) { _masterCommunicationsDeviceID = pX; } @@ -206,7 +206,7 @@ int IntercomControlPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _masterCommunicationsDeviceID marshalSize = marshalSize + 4; // _intercomParametersLength - for (unsigned long long idx = 0; idx < _intercomParameters.size(); idx++) { + for (uint64_t idx = 0; idx < _intercomParameters.size(); idx++) { IntercomCommunicationsParameters listElement = _intercomParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/IntercomControlPdu.h b/src/dis6/IntercomControlPdu.h index 4d00fed3..8f69cb3b 100644 --- a/src/dis6/IntercomControlPdu.h +++ b/src/dis6/IntercomControlPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/IntercomCommunicationsParameters.h" +#include "dis6/RadioCommunicationsFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.8.5. Detailed inofrmation about the state of an intercom device @@ -50,7 +50,7 @@ class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { EntityID _masterEntityID; /** specific intercom device that has created this intercom channel */ - unsigned short _masterCommunicationsDeviceID; + uint16_t _masterCommunicationsDeviceID; /** number of intercom parameters */ unsigned int _intercomParametersLength; @@ -95,8 +95,8 @@ class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { const EntityID& getMasterEntityID() const; void setMasterEntityID(const EntityID& pX); - unsigned short getMasterCommunicationsDeviceID() const; - void setMasterCommunicationsDeviceID(unsigned short pX); + uint16_t getMasterCommunicationsDeviceID() const; + void setMasterCommunicationsDeviceID(uint16_t pX); unsigned int getIntercomParametersLength() const; diff --git a/src/dis6/IntercomSignalPdu.cpp b/src/dis6/IntercomSignalPdu.cpp index 22426a76..93b688f7 100644 --- a/src/dis6/IntercomSignalPdu.cpp +++ b/src/dis6/IntercomSignalPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IntercomSignalPdu.h" using namespace DIS; @@ -22,35 +22,35 @@ const EntityID& IntercomSignalPdu::getEntityID() const { return _entityID; } void IntercomSignalPdu::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned short IntercomSignalPdu::getCommunicationsDeviceID() const { +uint16_t IntercomSignalPdu::getCommunicationsDeviceID() const { return _communicationsDeviceID; } -void IntercomSignalPdu::setCommunicationsDeviceID(unsigned short pX) { +void IntercomSignalPdu::setCommunicationsDeviceID(uint16_t pX) { _communicationsDeviceID = pX; } -unsigned short IntercomSignalPdu::getEncodingScheme() const { +uint16_t IntercomSignalPdu::getEncodingScheme() const { return _encodingScheme; } -void IntercomSignalPdu::setEncodingScheme(unsigned short pX) { +void IntercomSignalPdu::setEncodingScheme(uint16_t pX) { _encodingScheme = pX; } -unsigned short IntercomSignalPdu::getTdlType() const { return _tdlType; } +uint16_t IntercomSignalPdu::getTdlType() const { return _tdlType; } -void IntercomSignalPdu::setTdlType(unsigned short pX) { _tdlType = pX; } +void IntercomSignalPdu::setTdlType(uint16_t pX) { _tdlType = pX; } unsigned int IntercomSignalPdu::getSampleRate() const { return _sampleRate; } void IntercomSignalPdu::setSampleRate(unsigned int pX) { _sampleRate = pX; } -unsigned short IntercomSignalPdu::getDataLength() const { return _data.size(); } +uint16_t IntercomSignalPdu::getDataLength() const { return _data.size(); } -unsigned short IntercomSignalPdu::getSamples() const { return _samples; } +uint16_t IntercomSignalPdu::getSamples() const { return _samples; } -void IntercomSignalPdu::setSamples(unsigned short pX) { _samples = pX; } +void IntercomSignalPdu::setSamples(uint16_t pX) { _samples = pX; } std::vector& IntercomSignalPdu::getData() { return _data; } @@ -66,7 +66,7 @@ void IntercomSignalPdu::marshal(DataStream& dataStream) const { dataStream << _encodingScheme; dataStream << _tdlType; dataStream << _sampleRate; - dataStream << (unsigned short)_data.size(); + dataStream << (uint16_t)_data.size(); dataStream << _samples; for (auto& byte : _data) { diff --git a/src/dis6/IntercomSignalPdu.h b/src/dis6/IntercomSignalPdu.h index 90bd5cb6..d5ca4c72 100644 --- a/src/dis6/IntercomSignalPdu.h +++ b/src/dis6/IntercomSignalPdu.h @@ -22,22 +22,22 @@ class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { EntityID _entityID; /** ID of communications device */ - unsigned short _communicationsDeviceID; + uint16_t _communicationsDeviceID; /** encoding scheme */ - unsigned short _encodingScheme; + uint16_t _encodingScheme; /** tactical data link type */ - unsigned short _tdlType; + uint16_t _tdlType; /** sample rate */ unsigned int _sampleRate; /** data length */ - unsigned short _dataLength; + uint16_t _dataLength; /** samples */ - unsigned short _samples; + uint16_t _samples; /** data bytes */ std::vector _data; @@ -53,22 +53,22 @@ class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { const EntityID& getEntityID() const; void setEntityID(const EntityID& pX); - unsigned short getCommunicationsDeviceID() const; - void setCommunicationsDeviceID(unsigned short pX); + uint16_t getCommunicationsDeviceID() const; + void setCommunicationsDeviceID(uint16_t pX); - unsigned short getEncodingScheme() const; - void setEncodingScheme(unsigned short pX); + uint16_t getEncodingScheme() const; + void setEncodingScheme(uint16_t pX); - unsigned short getTdlType() const; - void setTdlType(unsigned short pX); + uint16_t getTdlType() const; + void setTdlType(uint16_t pX); unsigned int getSampleRate() const; void setSampleRate(unsigned int pX); - unsigned short getDataLength() const; + uint16_t getDataLength() const; - unsigned short getSamples() const; - void setSamples(unsigned short pX); + uint16_t getSamples() const; + void setSamples(uint16_t pX); std::vector& getData(); const std::vector& getData() const; diff --git a/src/dis6/IsGroupOfPdu.cpp b/src/dis6/IsGroupOfPdu.cpp index 4f4ef34c..4715349b 100644 --- a/src/dis6/IsGroupOfPdu.cpp +++ b/src/dis6/IsGroupOfPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IsGroupOfPdu.h" using namespace DIS; @@ -128,7 +128,7 @@ int IsGroupOfPdu::getMarshalledSize() const { marshalSize = marshalSize + 8; // _latitude marshalSize = marshalSize + 8; // _longitude - for (unsigned long long idx = 0; idx < _groupedEntityDescriptions.size(); + for (uint64_t idx = 0; idx < _groupedEntityDescriptions.size(); idx++) { VariableDatum listElement = _groupedEntityDescriptions[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/IsGroupOfPdu.h b/src/dis6/IsGroupOfPdu.h index 60e05a24..9339567e 100644 --- a/src/dis6/IsGroupOfPdu.h +++ b/src/dis6/IsGroupOfPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.9.2 Information about a particular group of entities grouped diff --git a/src/dis6/IsPartOfPdu.cpp b/src/dis6/IsPartOfPdu.cpp index 37b84bbd..58192371 100644 --- a/src/dis6/IsPartOfPdu.cpp +++ b/src/dis6/IsPartOfPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/IsPartOfPdu.h" using namespace DIS; diff --git a/src/dis6/IsPartOfPdu.h b/src/dis6/IsPartOfPdu.h index 35590e31..a8272ee7 100644 --- a/src/dis6/IsPartOfPdu.h +++ b/src/dis6/IsPartOfPdu.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityManagementFamilyPdu.h" +#include "dis6/EntityType.h" +#include "dis6/NamedLocation.h" +#include "dis6/Relationship.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.9.4 The joining of two or more simulation entities is diff --git a/src/dis6/LayerHeader.cpp b/src/dis6/LayerHeader.cpp index 0f52e121..021643db 100644 --- a/src/dis6/LayerHeader.cpp +++ b/src/dis6/LayerHeader.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/LayerHeader.h" using namespace DIS; @@ -19,9 +19,9 @@ void LayerHeader::setLayerSpecificInformaiton(unsigned char pX) { _layerSpecificInformaiton = pX; } -unsigned short LayerHeader::getLength() const { return _length; } +uint16_t LayerHeader::getLength() const { return _length; } -void LayerHeader::setLength(unsigned short pX) { _length = pX; } +void LayerHeader::setLength(uint16_t pX) { _length = pX; } void LayerHeader::marshal(DataStream& dataStream) const { dataStream << _layerNumber; diff --git a/src/dis6/LayerHeader.h b/src/dis6/LayerHeader.h index 2840df17..07ab8c1f 100644 --- a/src/dis6/LayerHeader.h +++ b/src/dis6/LayerHeader.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.47. Layer header. @@ -20,7 +20,7 @@ class OPENDIS6_EXPORT LayerHeader { unsigned char _layerSpecificInformaiton; /** information length */ - unsigned short _length; + uint16_t _length; public: LayerHeader(); @@ -35,8 +35,8 @@ class OPENDIS6_EXPORT LayerHeader { unsigned char getLayerSpecificInformaiton() const; void setLayerSpecificInformaiton(unsigned char pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + uint16_t getLength() const; + void setLength(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/LinearObjectStatePdu.cpp b/src/dis6/LinearObjectStatePdu.cpp index 08615896..752538fd 100644 --- a/src/dis6/LinearObjectStatePdu.cpp +++ b/src/dis6/LinearObjectStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/LinearObjectStatePdu.h" using namespace DIS; @@ -37,11 +37,11 @@ void LinearObjectStatePdu::setReferencedObjectID(const EntityID& pX) { _referencedObjectID = pX; } -unsigned short LinearObjectStatePdu::getUpdateNumber() const { +uint16_t LinearObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void LinearObjectStatePdu::setUpdateNumber(unsigned short pX) { +void LinearObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } @@ -175,7 +175,7 @@ int LinearObjectStatePdu::getMarshalledSize() const { marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - for (unsigned long long idx = 0; idx < _linearSegmentParameters.size(); + for (uint64_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { LinearSegmentParameter listElement = _linearSegmentParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/LinearObjectStatePdu.h b/src/dis6/LinearObjectStatePdu.h index 434b2c23..40ade491 100644 --- a/src/dis6/LinearObjectStatePdu.h +++ b/src/dis6/LinearObjectStatePdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/LinearSegmentParameter.h" +#include "dis6/ObjectType.h" +#include "dis6/SimulationAddress.h" +#include "dis6/SyntheticEnvironmentFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.11.4: Information abut the addition or modification of a @@ -30,7 +30,7 @@ class OPENDIS6_EXPORT LinearObjectStatePdu EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + uint16_t _updateNumber; /** force ID */ unsigned char _forceID; @@ -65,8 +65,8 @@ class OPENDIS6_EXPORT LinearObjectStatePdu const EntityID& getReferencedObjectID() const; void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + uint16_t getUpdateNumber() const; + void setUpdateNumber(uint16_t pX); unsigned char getForceID() const; void setForceID(unsigned char pX); diff --git a/src/dis6/LinearSegmentParameter.cpp b/src/dis6/LinearSegmentParameter.cpp index 279de0dc..075ddd1f 100644 --- a/src/dis6/LinearSegmentParameter.cpp +++ b/src/dis6/LinearSegmentParameter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/LinearSegmentParameter.h" using namespace DIS; @@ -55,35 +55,35 @@ void LinearSegmentParameter::setOrientation(const Orientation& pX) { _orientation = pX; } -unsigned short LinearSegmentParameter::getSegmentLength() const { +uint16_t LinearSegmentParameter::getSegmentLength() const { return _segmentLength; } -void LinearSegmentParameter::setSegmentLength(unsigned short pX) { +void LinearSegmentParameter::setSegmentLength(uint16_t pX) { _segmentLength = pX; } -unsigned short LinearSegmentParameter::getSegmentWidth() const { +uint16_t LinearSegmentParameter::getSegmentWidth() const { return _segmentWidth; } -void LinearSegmentParameter::setSegmentWidth(unsigned short pX) { +void LinearSegmentParameter::setSegmentWidth(uint16_t pX) { _segmentWidth = pX; } -unsigned short LinearSegmentParameter::getSegmentHeight() const { +uint16_t LinearSegmentParameter::getSegmentHeight() const { return _segmentHeight; } -void LinearSegmentParameter::setSegmentHeight(unsigned short pX) { +void LinearSegmentParameter::setSegmentHeight(uint16_t pX) { _segmentHeight = pX; } -unsigned short LinearSegmentParameter::getSegmentDepth() const { +uint16_t LinearSegmentParameter::getSegmentDepth() const { return _segmentDepth; } -void LinearSegmentParameter::setSegmentDepth(unsigned short pX) { +void LinearSegmentParameter::setSegmentDepth(uint16_t pX) { _segmentDepth = pX; } diff --git a/src/dis6/LinearSegmentParameter.h b/src/dis6/LinearSegmentParameter.h index b92d3cb3..4e1ff07f 100644 --- a/src/dis6/LinearSegmentParameter.h +++ b/src/dis6/LinearSegmentParameter.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include "dis6/Orientation.h" +#include "dis6/SixByteChunk.h" +#include "dis6/Vector3Double.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.48: Linear segment parameters @@ -29,16 +29,16 @@ class OPENDIS6_EXPORT LinearSegmentParameter { Orientation _orientation; /** segmentLength */ - unsigned short _segmentLength; + uint16_t _segmentLength; /** segmentWidth */ - unsigned short _segmentWidth; + uint16_t _segmentWidth; /** segmentHeight */ - unsigned short _segmentHeight; + uint16_t _segmentHeight; /** segment Depth */ - unsigned short _segmentDepth; + uint16_t _segmentDepth; /** segment Depth */ unsigned int _pad1; @@ -65,17 +65,17 @@ class OPENDIS6_EXPORT LinearSegmentParameter { const Orientation& getOrientation() const; void setOrientation(const Orientation& pX); - unsigned short getSegmentLength() const; - void setSegmentLength(unsigned short pX); + uint16_t getSegmentLength() const; + void setSegmentLength(uint16_t pX); - unsigned short getSegmentWidth() const; - void setSegmentWidth(unsigned short pX); + uint16_t getSegmentWidth() const; + void setSegmentWidth(uint16_t pX); - unsigned short getSegmentHeight() const; - void setSegmentHeight(unsigned short pX); + uint16_t getSegmentHeight() const; + void setSegmentHeight(uint16_t pX); - unsigned short getSegmentDepth() const; - void setSegmentDepth(unsigned short pX); + uint16_t getSegmentDepth() const; + void setSegmentDepth(uint16_t pX); unsigned int getPad1() const; void setPad1(unsigned int pX); diff --git a/src/dis6/LogisticsFamilyPdu.cpp b/src/dis6/LogisticsFamilyPdu.cpp index 4c4d5238..66cce165 100644 --- a/src/dis6/LogisticsFamilyPdu.cpp +++ b/src/dis6/LogisticsFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/LogisticsFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/LogisticsFamilyPdu.h b/src/dis6/LogisticsFamilyPdu.h index 0f34c86b..4c6c2c0e 100644 --- a/src/dis6/LogisticsFamilyPdu.h +++ b/src/dis6/LogisticsFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.5. Abstract superclass for logistics PDUs. COMPLETE diff --git a/src/dis6/LogisticsPdu.cpp b/src/dis6/LogisticsPdu.cpp index 42ddead5..ce727f85 100644 --- a/src/dis6/LogisticsPdu.cpp +++ b/src/dis6/LogisticsPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/LogisticsPdu.h" using namespace DIS; diff --git a/src/dis6/LogisticsPdu.h b/src/dis6/LogisticsPdu.h index 6f0d24d6..18061a08 100644 --- a/src/dis6/LogisticsPdu.h +++ b/src/dis6/LogisticsPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.5. Abstract superclass for logistics PDUs. COMPLETE diff --git a/src/dis6/Marking.cpp b/src/dis6/Marking.cpp index 543368db..a9f9ad49 100644 --- a/src/dis6/Marking.cpp +++ b/src/dis6/Marking.cpp @@ -1,6 +1,6 @@ #include -#include +#include "dis6/Marking.h" using namespace DIS; diff --git a/src/dis6/Marking.h b/src/dis6/Marking.h index b52ae043..095520d6 100644 --- a/src/dis6/Marking.h +++ b/src/dis6/Marking.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.15. Specifies the character set used inthe first byte, followed diff --git a/src/dis6/MinefieldDataPdu.cpp b/src/dis6/MinefieldDataPdu.cpp index 7720b910..c15089b3 100644 --- a/src/dis6/MinefieldDataPdu.cpp +++ b/src/dis6/MinefieldDataPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/MinefieldDataPdu.h" using namespace DIS; @@ -44,11 +44,11 @@ void MinefieldDataPdu::setRequestingEntityID(const EntityID& pX) { _requestingEntityID = pX; } -unsigned short MinefieldDataPdu::getMinefieldSequenceNumbeer() const { +uint16_t MinefieldDataPdu::getMinefieldSequenceNumbeer() const { return _minefieldSequenceNumbeer; } -void MinefieldDataPdu::setMinefieldSequenceNumbeer(unsigned short pX) { +void MinefieldDataPdu::setMinefieldSequenceNumbeer(uint16_t pX) { _minefieldSequenceNumbeer = pX; } @@ -225,14 +225,14 @@ int MinefieldDataPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _dataFilter marshalSize = marshalSize + _mineType.getMarshalledSize(); // _mineType - for (unsigned long long idx = 0; idx < _sensorTypes.size(); idx++) { + for (uint64_t idx = 0; idx < _sensorTypes.size(); idx++) { TwoByteChunk listElement = _sensorTypes[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } marshalSize = marshalSize + 1; // _pad3 - for (unsigned long long idx = 0; idx < _mineLocation.size(); idx++) { + for (uint64_t idx = 0; idx < _mineLocation.size(); idx++) { Vector3Float listElement = _mineLocation[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/MinefieldDataPdu.h b/src/dis6/MinefieldDataPdu.h index 8fd139ba..61da3375 100644 --- a/src/dis6/MinefieldDataPdu.h +++ b/src/dis6/MinefieldDataPdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityType.h" +#include "dis6/MinefieldFamilyPdu.h" +#include "dis6/TwoByteChunk.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.10.3 Information about individual mines within a minefield. This @@ -28,7 +28,7 @@ class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { EntityID _requestingEntityID; /** Minefield sequence number */ - unsigned short _minefieldSequenceNumbeer; + uint16_t _minefieldSequenceNumbeer; /** request ID */ unsigned char _requestID; @@ -79,8 +79,8 @@ class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { const EntityID& getRequestingEntityID() const; void setRequestingEntityID(const EntityID& pX); - unsigned short getMinefieldSequenceNumbeer() const; - void setMinefieldSequenceNumbeer(unsigned short pX); + uint16_t getMinefieldSequenceNumbeer() const; + void setMinefieldSequenceNumbeer(uint16_t pX); unsigned char getRequestID() const; void setRequestID(unsigned char pX); diff --git a/src/dis6/MinefieldFamilyPdu.cpp b/src/dis6/MinefieldFamilyPdu.cpp index d72e022a..1c8ffd7f 100644 --- a/src/dis6/MinefieldFamilyPdu.cpp +++ b/src/dis6/MinefieldFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/MinefieldFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/MinefieldFamilyPdu.h b/src/dis6/MinefieldFamilyPdu.h index 5fee9502..f59cd0a9 100644 --- a/src/dis6/MinefieldFamilyPdu.h +++ b/src/dis6/MinefieldFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.10.1 Abstract superclass for PDUs relating to minefields diff --git a/src/dis6/MinefieldPduFamily.cpp b/src/dis6/MinefieldPduFamily.cpp index b3cbc874..f10aa52c 100644 --- a/src/dis6/MinefieldPduFamily.cpp +++ b/src/dis6/MinefieldPduFamily.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/MinefieldPduFamily.h" using namespace DIS; diff --git a/src/dis6/MinefieldPduFamily.h b/src/dis6/MinefieldPduFamily.h index d69a3e86..c59e7dd1 100644 --- a/src/dis6/MinefieldPduFamily.h +++ b/src/dis6/MinefieldPduFamily.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.10.1 Abstract superclass for PDUs relating to minefields diff --git a/src/dis6/MinefieldQueryPdu.cpp b/src/dis6/MinefieldQueryPdu.cpp index fd1e8272..ca8493de 100644 --- a/src/dis6/MinefieldQueryPdu.cpp +++ b/src/dis6/MinefieldQueryPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/MinefieldQueryPdu.h" using namespace DIS; @@ -189,13 +189,13 @@ int MinefieldQueryPdu::getMarshalledSize() const { marshalSize = marshalSize + _requestedMineType.getMarshalledSize(); // _requestedMineType - for (unsigned long long idx = 0; idx < _requestedPerimeterPoints.size(); + for (uint64_t idx = 0; idx < _requestedPerimeterPoints.size(); idx++) { Point listElement = _requestedPerimeterPoints[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _sensorTypes.size(); idx++) { + for (uint64_t idx = 0; idx < _sensorTypes.size(); idx++) { TwoByteChunk listElement = _sensorTypes[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/MinefieldQueryPdu.h b/src/dis6/MinefieldQueryPdu.h index 1282e17d..45fc9b39 100644 --- a/src/dis6/MinefieldQueryPdu.h +++ b/src/dis6/MinefieldQueryPdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityType.h" +#include "dis6/MinefieldFamilyPdu.h" +#include "dis6/Point.h" +#include "dis6/TwoByteChunk.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.10.2 Query a minefield for information about individual mines. diff --git a/src/dis6/MinefieldResponseNackPdu.cpp b/src/dis6/MinefieldResponseNackPdu.cpp index 17a135c9..d2a9898a 100644 --- a/src/dis6/MinefieldResponseNackPdu.cpp +++ b/src/dis6/MinefieldResponseNackPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/MinefieldResponseNackPdu.h" using namespace DIS; @@ -123,7 +123,7 @@ int MinefieldResponseNackPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _requestID marshalSize = marshalSize + 1; // _numberOfMissingPdus - for (unsigned long long idx = 0; idx < _missingPduSequenceNumbers.size(); + for (uint64_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { EightByteChunk listElement = _missingPduSequenceNumbers[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis6/MinefieldResponseNackPdu.h b/src/dis6/MinefieldResponseNackPdu.h index b8536101..b4d6a094 100644 --- a/src/dis6/MinefieldResponseNackPdu.h +++ b/src/dis6/MinefieldResponseNackPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/EightByteChunk.h" +#include "dis6/EntityID.h" +#include "dis6/MinefieldFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.10.4 proivde the means to request a retransmit of a minefield diff --git a/src/dis6/MinefieldStatePdu.cpp b/src/dis6/MinefieldStatePdu.cpp index 10e33a75..24328f88 100644 --- a/src/dis6/MinefieldStatePdu.cpp +++ b/src/dis6/MinefieldStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/MinefieldStatePdu.h" using namespace DIS; @@ -32,11 +32,11 @@ void MinefieldStatePdu::setMinefieldID(const EntityID& pX) { _minefieldID = pX; } -unsigned short MinefieldStatePdu::getMinefieldSequence() const { +uint16_t MinefieldStatePdu::getMinefieldSequence() const { return _minefieldSequence; } -void MinefieldStatePdu::setMinefieldSequence(unsigned short pX) { +void MinefieldStatePdu::setMinefieldSequence(uint16_t pX) { _minefieldSequence = pX; } @@ -58,7 +58,7 @@ void MinefieldStatePdu::setMinefieldType(const EntityType& pX) { _minefieldType = pX; } -unsigned short MinefieldStatePdu::getNumberOfMineTypes() const { +uint16_t MinefieldStatePdu::getNumberOfMineTypes() const { return _mineType.size(); } @@ -86,15 +86,15 @@ void MinefieldStatePdu::setMinefieldOrientation(const Orientation& pX) { _minefieldOrientation = pX; } -unsigned short MinefieldStatePdu::getAppearance() const { return _appearance; } +uint16_t MinefieldStatePdu::getAppearance() const { return _appearance; } -void MinefieldStatePdu::setAppearance(unsigned short pX) { _appearance = pX; } +void MinefieldStatePdu::setAppearance(uint16_t pX) { _appearance = pX; } -unsigned short MinefieldStatePdu::getProtocolMode() const { +uint16_t MinefieldStatePdu::getProtocolMode() const { return _protocolMode; } -void MinefieldStatePdu::setProtocolMode(unsigned short pX) { +void MinefieldStatePdu::setProtocolMode(uint16_t pX) { _protocolMode = pX; } @@ -128,7 +128,7 @@ void MinefieldStatePdu::marshal(DataStream& dataStream) const { dataStream << _forceID; dataStream << (unsigned char)_perimeterPoints.size(); _minefieldType.marshal(dataStream); - dataStream << (unsigned short)_mineType.size(); + dataStream << (uint16_t)_mineType.size(); _minefieldLocation.marshal(dataStream); _minefieldOrientation.marshal(dataStream); dataStream << _appearance; @@ -219,12 +219,12 @@ int MinefieldStatePdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _appearance marshalSize = marshalSize + 2; // _protocolMode - for (unsigned long long idx = 0; idx < _perimeterPoints.size(); idx++) { + for (uint64_t idx = 0; idx < _perimeterPoints.size(); idx++) { Point listElement = _perimeterPoints[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _mineType.size(); idx++) { + for (uint64_t idx = 0; idx < _mineType.size(); idx++) { EntityType listElement = _mineType[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/MinefieldStatePdu.h b/src/dis6/MinefieldStatePdu.h index 10c72984..c662fb60 100644 --- a/src/dis6/MinefieldStatePdu.h +++ b/src/dis6/MinefieldStatePdu.h @@ -2,14 +2,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityType.h" +#include "dis6/MinefieldFamilyPdu.h" +#include "dis6/Orientation.h" +#include "dis6/Point.h" +#include "dis6/Vector3Double.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.10.1 Abstract superclass for PDUs relating to minefields. @@ -26,7 +26,7 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { EntityID _minefieldID; /** Minefield sequence */ - unsigned short _minefieldSequence; + uint16_t _minefieldSequence; /** force ID */ unsigned char _forceID; @@ -38,7 +38,7 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { EntityType _minefieldType; /** how many mine types */ - unsigned short _numberOfMineTypes; + uint16_t _numberOfMineTypes; /** location of minefield in world coords */ Vector3Double _minefieldLocation; @@ -47,10 +47,10 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { Orientation _minefieldOrientation; /** appearance bitflags */ - unsigned short _appearance; + uint16_t _appearance; /** protocolMode */ - unsigned short _protocolMode; + uint16_t _protocolMode; /** perimeter points for the minefield */ std::vector _perimeterPoints; @@ -69,8 +69,8 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { const EntityID& getMinefieldID() const; void setMinefieldID(const EntityID& pX); - unsigned short getMinefieldSequence() const; - void setMinefieldSequence(unsigned short pX); + uint16_t getMinefieldSequence() const; + void setMinefieldSequence(uint16_t pX); unsigned char getForceID() const; void setForceID(unsigned char pX); @@ -81,7 +81,7 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { const EntityType& getMinefieldType() const; void setMinefieldType(const EntityType& pX); - unsigned short getNumberOfMineTypes() const; + uint16_t getNumberOfMineTypes() const; Vector3Double& getMinefieldLocation(); const Vector3Double& getMinefieldLocation() const; @@ -91,11 +91,11 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { const Orientation& getMinefieldOrientation() const; void setMinefieldOrientation(const Orientation& pX); - unsigned short getAppearance() const; - void setAppearance(unsigned short pX); + uint16_t getAppearance() const; + void setAppearance(uint16_t pX); - unsigned short getProtocolMode() const; - void setProtocolMode(unsigned short pX); + uint16_t getProtocolMode() const; + void setProtocolMode(uint16_t pX); std::vector& getPerimeterPoints(); const std::vector& getPerimeterPoints() const; diff --git a/src/dis6/ModulationType.cpp b/src/dis6/ModulationType.cpp index 8dd86e7d..9820735f 100644 --- a/src/dis6/ModulationType.cpp +++ b/src/dis6/ModulationType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ModulationType.h" using namespace DIS; @@ -7,25 +7,25 @@ ModulationType::ModulationType() ModulationType::~ModulationType() {} -unsigned short ModulationType::getSpreadSpectrum() const { +uint16_t ModulationType::getSpreadSpectrum() const { return _spreadSpectrum; } -void ModulationType::setSpreadSpectrum(unsigned short pX) { +void ModulationType::setSpreadSpectrum(uint16_t pX) { _spreadSpectrum = pX; } -unsigned short ModulationType::getMajor() const { return _major; } +uint16_t ModulationType::getMajor() const { return _major; } -void ModulationType::setMajor(unsigned short pX) { _major = pX; } +void ModulationType::setMajor(uint16_t pX) { _major = pX; } -unsigned short ModulationType::getDetail() const { return _detail; } +uint16_t ModulationType::getDetail() const { return _detail; } -void ModulationType::setDetail(unsigned short pX) { _detail = pX; } +void ModulationType::setDetail(uint16_t pX) { _detail = pX; } -unsigned short ModulationType::getSystem() const { return _system; } +uint16_t ModulationType::getSystem() const { return _system; } -void ModulationType::setSystem(unsigned short pX) { _system = pX; } +void ModulationType::setSystem(uint16_t pX) { _system = pX; } void ModulationType::marshal(DataStream& dataStream) const { dataStream << _spreadSpectrum; diff --git a/src/dis6/ModulationType.h b/src/dis6/ModulationType.h index 19d966ef..320087ad 100644 --- a/src/dis6/ModulationType.h +++ b/src/dis6/ModulationType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Radio modulation @@ -14,16 +14,16 @@ namespace DIS { class OPENDIS6_EXPORT ModulationType { protected: /** spread spectrum, 16 bit boolean array */ - unsigned short _spreadSpectrum; + uint16_t _spreadSpectrum; /** major */ - unsigned short _major; + uint16_t _major; /** detail */ - unsigned short _detail; + uint16_t _detail; /** system */ - unsigned short _system; + uint16_t _system; public: ModulationType(); @@ -32,17 +32,17 @@ class OPENDIS6_EXPORT ModulationType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSpreadSpectrum() const; - void setSpreadSpectrum(unsigned short pX); + uint16_t getSpreadSpectrum() const; + void setSpreadSpectrum(uint16_t pX); - unsigned short getMajor() const; - void setMajor(unsigned short pX); + uint16_t getMajor() const; + void setMajor(uint16_t pX); - unsigned short getDetail() const; - void setDetail(unsigned short pX); + uint16_t getDetail() const; + void setDetail(uint16_t pX); - unsigned short getSystem() const; - void setSystem(unsigned short pX); + uint16_t getSystem() const; + void setSystem(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/NamedLocation.cpp b/src/dis6/NamedLocation.cpp index 5d1e157d..817948f7 100644 --- a/src/dis6/NamedLocation.cpp +++ b/src/dis6/NamedLocation.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/NamedLocation.h" using namespace DIS; @@ -6,15 +6,15 @@ NamedLocation::NamedLocation() : _stationName(0), _stationNumber(0) {} NamedLocation::~NamedLocation() {} -unsigned short NamedLocation::getStationName() const { return _stationName; } +uint16_t NamedLocation::getStationName() const { return _stationName; } -void NamedLocation::setStationName(unsigned short pX) { _stationName = pX; } +void NamedLocation::setStationName(uint16_t pX) { _stationName = pX; } -unsigned short NamedLocation::getStationNumber() const { +uint16_t NamedLocation::getStationNumber() const { return _stationNumber; } -void NamedLocation::setStationNumber(unsigned short pX) { _stationNumber = pX; } +void NamedLocation::setStationNumber(uint16_t pX) { _stationNumber = pX; } void NamedLocation::marshal(DataStream& dataStream) const { dataStream << _stationName; diff --git a/src/dis6/NamedLocation.h b/src/dis6/NamedLocation.h index edf9f0ac..aa571aaf 100644 --- a/src/dis6/NamedLocation.h +++ b/src/dis6/NamedLocation.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // discrete ostional relationsihip @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT NamedLocation { protected: /** station name enumeration */ - unsigned short _stationName; + uint16_t _stationName; /** station number */ - unsigned short _stationNumber; + uint16_t _stationNumber; public: NamedLocation(); @@ -26,11 +26,11 @@ class OPENDIS6_EXPORT NamedLocation { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getStationName() const; - void setStationName(unsigned short pX); + uint16_t getStationName() const; + void setStationName(uint16_t pX); - unsigned short getStationNumber() const; - void setStationNumber(unsigned short pX); + uint16_t getStationNumber() const; + void setStationNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/ObjectType.cpp b/src/dis6/ObjectType.cpp index f24df752..e9fe566e 100644 --- a/src/dis6/ObjectType.cpp +++ b/src/dis6/ObjectType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ObjectType.h" using namespace DIS; @@ -15,9 +15,9 @@ unsigned char ObjectType::getDomain() const { return _domain; } void ObjectType::setDomain(unsigned char pX) { _domain = pX; } -unsigned short ObjectType::getCountry() const { return _country; } +uint16_t ObjectType::getCountry() const { return _country; } -void ObjectType::setCountry(unsigned short pX) { _country = pX; } +void ObjectType::setCountry(uint16_t pX) { _country = pX; } unsigned char ObjectType::getCategory() const { return _category; } diff --git a/src/dis6/ObjectType.h b/src/dis6/ObjectType.h index 0f1c1fba..9bcd7c71 100644 --- a/src/dis6/ObjectType.h +++ b/src/dis6/ObjectType.h @@ -1,10 +1,10 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { -// Identifies type of object. This is a shorter version of EntityType that omits +// Identifies type of object. This is a int16_ter version of EntityType that omits // the specific and extra fields. // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -21,7 +21,7 @@ class OPENDIS6_EXPORT ObjectType { unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ unsigned char _category; @@ -42,8 +42,8 @@ class OPENDIS6_EXPORT ObjectType { unsigned char getDomain() const; void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); unsigned char getCategory() const; void setCategory(unsigned char pX); diff --git a/src/dis6/Orientation.cpp b/src/dis6/Orientation.cpp index 483ab88d..9e876a4f 100644 --- a/src/dis6/Orientation.cpp +++ b/src/dis6/Orientation.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/Orientation.h" using namespace DIS; diff --git a/src/dis6/Orientation.h b/src/dis6/Orientation.h index a7738cbe..be233b8c 100644 --- a/src/dis6/Orientation.h +++ b/src/dis6/Orientation.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.17. Three floating point values representing an orientation, psi, diff --git a/src/dis6/Pdu.cpp b/src/dis6/Pdu.cpp index f691c5ec..2fa0ca09 100644 --- a/src/dis6/Pdu.cpp +++ b/src/dis6/Pdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/Pdu.h" using namespace DIS; @@ -33,13 +33,13 @@ unsigned int Pdu::getTimestamp() const { return _timestamp; } void Pdu::setTimestamp(unsigned int pX) { _timestamp = pX; } -unsigned short Pdu::getLength() const { return this->getMarshalledSize(); } +uint16_t Pdu::getLength() const { return this->getMarshalledSize(); } -void Pdu::setLength(unsigned short pX) { _length = pX; } +void Pdu::setLength(uint16_t pX) { _length = pX; } -short Pdu::getPadding() const { return _padding; } +int16_t Pdu::getPadding() const { return _padding; } -void Pdu::setPadding(short pX) { _padding = pX; } +void Pdu::setPadding(int16_t pX) { _padding = pX; } void Pdu::marshal(DataStream& dataStream) const { dataStream << _protocolVersion; diff --git a/src/dis6/Pdu.h b/src/dis6/Pdu.h index 84a281c6..1a45ff6b 100644 --- a/src/dis6/Pdu.h +++ b/src/dis6/Pdu.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // The superclass for all PDUs. This incorporates the PduHeader record, @@ -30,10 +30,10 @@ class OPENDIS6_EXPORT Pdu { unsigned int _timestamp; /** Length, in bytes, of the PDU */ - unsigned short _length; + uint16_t _length; /** zero-filled array of padding */ - short _padding; + int16_t _padding; public: Pdu(); @@ -57,11 +57,11 @@ class OPENDIS6_EXPORT Pdu { unsigned int getTimestamp() const; void setTimestamp(unsigned int pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + uint16_t getLength() const; + void setLength(uint16_t pX); - short getPadding() const; - void setPadding(short pX); + int16_t getPadding() const; + void setPadding(int16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/PduContainer.cpp b/src/dis6/PduContainer.cpp index c10a6c5f..3f47edbd 100644 --- a/src/dis6/PduContainer.cpp +++ b/src/dis6/PduContainer.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/PduContainer.h" using namespace DIS; @@ -49,7 +49,7 @@ int PduContainer::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfPdus - for (unsigned long long idx = 0; idx < _pdus.size(); idx++) { + for (uint64_t idx = 0; idx < _pdus.size(); idx++) { Pdu listElement = _pdus[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/PduContainer.h b/src/dis6/PduContainer.h index b176f85f..ef85cd2b 100644 --- a/src/dis6/PduContainer.h +++ b/src/dis6/PduContainer.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Used for XML compatability. A container that holds PDUs diff --git a/src/dis6/Point.cpp b/src/dis6/Point.cpp index 8b617796..da2fd596 100644 --- a/src/dis6/Point.cpp +++ b/src/dis6/Point.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/Point.h" using namespace DIS; diff --git a/src/dis6/Point.h b/src/dis6/Point.h index 2cd8a1d0..8e72af92 100644 --- a/src/dis6/Point.h +++ b/src/dis6/Point.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // x,y point diff --git a/src/dis6/PointObjectStatePdu.cpp b/src/dis6/PointObjectStatePdu.cpp index 5566a720..1b3c9004 100644 --- a/src/dis6/PointObjectStatePdu.cpp +++ b/src/dis6/PointObjectStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/PointObjectStatePdu.h" using namespace DIS; @@ -39,11 +39,11 @@ void PointObjectStatePdu::setReferencedObjectID(const EntityID& pX) { _referencedObjectID = pX; } -unsigned short PointObjectStatePdu::getUpdateNumber() const { +uint16_t PointObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void PointObjectStatePdu::setUpdateNumber(unsigned short pX) { +void PointObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } diff --git a/src/dis6/PointObjectStatePdu.h b/src/dis6/PointObjectStatePdu.h index f67ce66d..d3b00f4e 100644 --- a/src/dis6/PointObjectStatePdu.h +++ b/src/dis6/PointObjectStatePdu.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/ObjectType.h" +#include "dis6/Orientation.h" +#include "dis6/SimulationAddress.h" +#include "dis6/SyntheticEnvironmentFamilyPdu.h" +#include "dis6/Vector3Double.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.11.3: Inormation abut the addition or modification of a synthecic @@ -29,7 +29,7 @@ class OPENDIS6_EXPORT PointObjectStatePdu EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + uint16_t _updateNumber; /** force ID */ unsigned char _forceID; @@ -73,8 +73,8 @@ class OPENDIS6_EXPORT PointObjectStatePdu const EntityID& getReferencedObjectID() const; void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + uint16_t getUpdateNumber() const; + void setUpdateNumber(uint16_t pX); unsigned char getForceID() const; void setForceID(unsigned char pX); diff --git a/src/dis6/PropulsionSystemData.cpp b/src/dis6/PropulsionSystemData.cpp index c92100f6..638ee2cd 100644 --- a/src/dis6/PropulsionSystemData.cpp +++ b/src/dis6/PropulsionSystemData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/PropulsionSystemData.h" using namespace DIS; diff --git a/src/dis6/PropulsionSystemData.h b/src/dis6/PropulsionSystemData.h index c06f6d63..a65a1d10 100644 --- a/src/dis6/PropulsionSystemData.h +++ b/src/dis6/PropulsionSystemData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Data about a propulsion system diff --git a/src/dis6/RadioCommunicationsFamilyPdu.cpp b/src/dis6/RadioCommunicationsFamilyPdu.cpp index 56a54c1b..e1bc7f75 100644 --- a/src/dis6/RadioCommunicationsFamilyPdu.cpp +++ b/src/dis6/RadioCommunicationsFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RadioCommunicationsFamilyPdu.h" using namespace DIS; @@ -19,11 +19,11 @@ void RadioCommunicationsFamilyPdu::setEntityId(const EntityID& pX) { _entityId = pX; } -unsigned short RadioCommunicationsFamilyPdu::getRadioId() const { +uint16_t RadioCommunicationsFamilyPdu::getRadioId() const { return _radioId; } -void RadioCommunicationsFamilyPdu::setRadioId(unsigned short pX) { +void RadioCommunicationsFamilyPdu::setRadioId(uint16_t pX) { _radioId = pX; } diff --git a/src/dis6/RadioCommunicationsFamilyPdu.h b/src/dis6/RadioCommunicationsFamilyPdu.h index 838c11ec..90fa818c 100644 --- a/src/dis6/RadioCommunicationsFamilyPdu.h +++ b/src/dis6/RadioCommunicationsFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.8. Abstract superclass for radio communications PDUs. @@ -19,7 +19,7 @@ class OPENDIS6_EXPORT RadioCommunicationsFamilyPdu : public Pdu { EntityID _entityId; /** particular radio within an entity */ - unsigned short _radioId; + uint16_t _radioId; public: RadioCommunicationsFamilyPdu(); @@ -32,8 +32,8 @@ class OPENDIS6_EXPORT RadioCommunicationsFamilyPdu : public Pdu { const EntityID& getEntityId() const; void setEntityId(const EntityID& pX); - unsigned short getRadioId() const; - void setRadioId(unsigned short pX); + uint16_t getRadioId() const; + void setRadioId(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RadioEntityType.cpp b/src/dis6/RadioEntityType.cpp index f22b4e47..d55a4261 100644 --- a/src/dis6/RadioEntityType.cpp +++ b/src/dis6/RadioEntityType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RadioEntityType.h" using namespace DIS; @@ -20,9 +20,9 @@ unsigned char RadioEntityType::getDomain() const { return _domain; } void RadioEntityType::setDomain(unsigned char pX) { _domain = pX; } -unsigned short RadioEntityType::getCountry() const { return _country; } +uint16_t RadioEntityType::getCountry() const { return _country; } -void RadioEntityType::setCountry(unsigned short pX) { _country = pX; } +void RadioEntityType::setCountry(uint16_t pX) { _country = pX; } unsigned char RadioEntityType::getCategory() const { return _category; } @@ -36,11 +36,11 @@ void RadioEntityType::setNomenclatureVersion(unsigned char pX) { _nomenclatureVersion = pX; } -unsigned short RadioEntityType::getNomenclature() const { +uint16_t RadioEntityType::getNomenclature() const { return _nomenclature; } -void RadioEntityType::setNomenclature(unsigned short pX) { _nomenclature = pX; } +void RadioEntityType::setNomenclature(uint16_t pX) { _nomenclature = pX; } void RadioEntityType::marshal(DataStream& dataStream) const { dataStream << _entityKind; diff --git a/src/dis6/RadioEntityType.h b/src/dis6/RadioEntityType.h index 304cb5f0..fcb87309 100644 --- a/src/dis6/RadioEntityType.h +++ b/src/dis6/RadioEntityType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.25. Identifies the type of radio @@ -20,7 +20,7 @@ class OPENDIS6_EXPORT RadioEntityType { unsigned char _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ unsigned char _category; @@ -28,7 +28,7 @@ class OPENDIS6_EXPORT RadioEntityType { /** specific info based on subcategory field */ unsigned char _nomenclatureVersion; - unsigned short _nomenclature; + uint16_t _nomenclature; public: RadioEntityType(); @@ -43,8 +43,8 @@ class OPENDIS6_EXPORT RadioEntityType { unsigned char getDomain() const; void setDomain(unsigned char pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); unsigned char getCategory() const; void setCategory(unsigned char pX); @@ -52,8 +52,8 @@ class OPENDIS6_EXPORT RadioEntityType { unsigned char getNomenclatureVersion() const; void setNomenclatureVersion(unsigned char pX); - unsigned short getNomenclature() const; - void setNomenclature(unsigned short pX); + uint16_t getNomenclature() const; + void setNomenclature(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/ReceiverPdu.cpp b/src/dis6/ReceiverPdu.cpp index eb6f2be6..245e9617 100644 --- a/src/dis6/ReceiverPdu.cpp +++ b/src/dis6/ReceiverPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ReceiverPdu.h" using namespace DIS; @@ -14,13 +14,13 @@ ReceiverPdu::ReceiverPdu() ReceiverPdu::~ReceiverPdu() {} -unsigned short ReceiverPdu::getReceiverState() const { return _receiverState; } +uint16_t ReceiverPdu::getReceiverState() const { return _receiverState; } -void ReceiverPdu::setReceiverState(unsigned short pX) { _receiverState = pX; } +void ReceiverPdu::setReceiverState(uint16_t pX) { _receiverState = pX; } -unsigned short ReceiverPdu::getPadding1() const { return _padding1; } +uint16_t ReceiverPdu::getPadding1() const { return _padding1; } -void ReceiverPdu::setPadding1(unsigned short pX) { _padding1 = pX; } +void ReceiverPdu::setPadding1(uint16_t pX) { _padding1 = pX; } float ReceiverPdu::getReceivedPower() const { return _receivedPower; } @@ -36,11 +36,11 @@ void ReceiverPdu::setTransmitterEntityId(const EntityID& pX) { _transmitterEntityId = pX; } -unsigned short ReceiverPdu::getTransmitterRadioId() const { +uint16_t ReceiverPdu::getTransmitterRadioId() const { return _transmitterRadioId; } -void ReceiverPdu::setTransmitterRadioId(unsigned short pX) { +void ReceiverPdu::setTransmitterRadioId(uint16_t pX) { _transmitterRadioId = pX; } diff --git a/src/dis6/ReceiverPdu.h b/src/dis6/ReceiverPdu.h index 1c19cede..0f3ab930 100644 --- a/src/dis6/ReceiverPdu.h +++ b/src/dis6/ReceiverPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/RadioCommunicationsFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.8.3. Communication of a receiver state. COMPLETE @@ -16,10 +16,10 @@ namespace DIS { class OPENDIS6_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { protected: /** encoding scheme used, and enumeration */ - unsigned short _receiverState; + uint16_t _receiverState; /** padding */ - unsigned short _padding1; + uint16_t _padding1; /** received power */ float _receivedPower; @@ -28,7 +28,7 @@ class OPENDIS6_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { EntityID _transmitterEntityId; /** ID of transmitting radio */ - unsigned short _transmitterRadioId; + uint16_t _transmitterRadioId; public: ReceiverPdu(); @@ -37,11 +37,11 @@ class OPENDIS6_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getReceiverState() const; - void setReceiverState(unsigned short pX); + uint16_t getReceiverState() const; + void setReceiverState(uint16_t pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + uint16_t getPadding1() const; + void setPadding1(uint16_t pX); float getReceivedPower() const; void setReceivedPower(float pX); @@ -50,8 +50,8 @@ class OPENDIS6_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { const EntityID& getTransmitterEntityId() const; void setTransmitterEntityId(const EntityID& pX); - unsigned short getTransmitterRadioId() const; - void setTransmitterRadioId(unsigned short pX); + uint16_t getTransmitterRadioId() const; + void setTransmitterRadioId(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RecordQueryReliablePdu.cpp b/src/dis6/RecordQueryReliablePdu.cpp index a1f88f9a..fe514b99 100644 --- a/src/dis6/RecordQueryReliablePdu.cpp +++ b/src/dis6/RecordQueryReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RecordQueryReliablePdu.h" using namespace DIS; @@ -28,19 +28,19 @@ void RecordQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short RecordQueryReliablePdu::getPad1() const { return _pad1; } +uint16_t RecordQueryReliablePdu::getPad1() const { return _pad1; } -void RecordQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void RecordQueryReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char RecordQueryReliablePdu::getPad2() const { return _pad2; } void RecordQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } -unsigned short RecordQueryReliablePdu::getEventType() const { +uint16_t RecordQueryReliablePdu::getEventType() const { return _eventType; } -void RecordQueryReliablePdu::setEventType(unsigned short pX) { +void RecordQueryReliablePdu::setEventType(uint16_t pX) { _eventType = pX; } @@ -135,7 +135,7 @@ int RecordQueryReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _time marshalSize = marshalSize + 4; // _numberOfRecords - for (unsigned long long idx = 0; idx < _recordIDs.size(); idx++) { + for (uint64_t idx = 0; idx < _recordIDs.size(); idx++) { FourByteChunk listElement = _recordIDs[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/RecordQueryReliablePdu.h b/src/dis6/RecordQueryReliablePdu.h index fc4483fe..45d4e109 100644 --- a/src/dis6/RecordQueryReliablePdu.h +++ b/src/dis6/RecordQueryReliablePdu.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis6/FourByteChunk.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.13: A request for one or more records of data from an entity. @@ -26,13 +26,13 @@ class OPENDIS6_EXPORT RecordQueryReliablePdu unsigned char _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; /** event type */ - unsigned short _eventType; + uint16_t _eventType; /** time */ unsigned int _time; @@ -56,14 +56,14 @@ class OPENDIS6_EXPORT RecordQueryReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + uint16_t getEventType() const; + void setEventType(uint16_t pX); unsigned int getTime() const; void setTime(unsigned int pX); diff --git a/src/dis6/RecordSet.cpp b/src/dis6/RecordSet.cpp index dcc3881d..c9f7ee41 100644 --- a/src/dis6/RecordSet.cpp +++ b/src/dis6/RecordSet.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RecordSet.h" using namespace DIS; @@ -24,17 +24,17 @@ void RecordSet::setRecordSetSerialNumber(unsigned int pX) { _recordSetSerialNumber = pX; } -unsigned short RecordSet::getRecordLength() const { return _recordLength; } +uint16_t RecordSet::getRecordLength() const { return _recordLength; } -void RecordSet::setRecordLength(unsigned short pX) { _recordLength = pX; } +void RecordSet::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned short RecordSet::getRecordCount() const { return _recordCount; } +uint16_t RecordSet::getRecordCount() const { return _recordCount; } -void RecordSet::setRecordCount(unsigned short pX) { _recordCount = pX; } +void RecordSet::setRecordCount(uint16_t pX) { _recordCount = pX; } -unsigned short RecordSet::getRecordValues() const { return _recordValues; } +uint16_t RecordSet::getRecordValues() const { return _recordValues; } -void RecordSet::setRecordValues(unsigned short pX) { _recordValues = pX; } +void RecordSet::setRecordValues(uint16_t pX) { _recordValues = pX; } unsigned char RecordSet::getPad4() const { return _pad4; } diff --git a/src/dis6/RecordSet.h b/src/dis6/RecordSet.h index eef81df0..3ef1beb7 100644 --- a/src/dis6/RecordSet.h +++ b/src/dis6/RecordSet.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Record sets, used in transfer control request PDU @@ -20,13 +20,13 @@ class OPENDIS6_EXPORT RecordSet { unsigned int _recordSetSerialNumber; /** record length */ - unsigned short _recordLength; + uint16_t _recordLength; /** record count */ - unsigned short _recordCount; + uint16_t _recordCount; /** ^^^This is wrong--variable sized data records */ - unsigned short _recordValues; + uint16_t _recordValues; /** ^^^This is wrong--variable sized padding */ unsigned char _pad4; @@ -44,14 +44,14 @@ class OPENDIS6_EXPORT RecordSet { unsigned int getRecordSetSerialNumber() const; void setRecordSetSerialNumber(unsigned int pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned short getRecordCount() const; - void setRecordCount(unsigned short pX); + uint16_t getRecordCount() const; + void setRecordCount(uint16_t pX); - unsigned short getRecordValues() const; - void setRecordValues(unsigned short pX); + uint16_t getRecordValues() const; + void setRecordValues(uint16_t pX); unsigned char getPad4() const; void setPad4(unsigned char pX); diff --git a/src/dis6/Relationship.cpp b/src/dis6/Relationship.cpp index 01c5afbb..6cf46eb5 100644 --- a/src/dis6/Relationship.cpp +++ b/src/dis6/Relationship.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/Relationship.h" using namespace DIS; @@ -6,13 +6,13 @@ Relationship::Relationship() : _nature(0), _position(0) {} Relationship::~Relationship() {} -unsigned short Relationship::getNature() const { return _nature; } +uint16_t Relationship::getNature() const { return _nature; } -void Relationship::setNature(unsigned short pX) { _nature = pX; } +void Relationship::setNature(uint16_t pX) { _nature = pX; } -unsigned short Relationship::getPosition() const { return _position; } +uint16_t Relationship::getPosition() const { return _position; } -void Relationship::setPosition(unsigned short pX) { _position = pX; } +void Relationship::setPosition(uint16_t pX) { _position = pX; } void Relationship::marshal(DataStream& dataStream) const { dataStream << _nature; diff --git a/src/dis6/Relationship.h b/src/dis6/Relationship.h index e0a5b2a4..a35f4e9d 100644 --- a/src/dis6/Relationship.h +++ b/src/dis6/Relationship.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.56. Purpose for joinging two entities @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT Relationship { protected: /** Nature of join */ - unsigned short _nature; + uint16_t _nature; /** position of join */ - unsigned short _position; + uint16_t _position; public: Relationship(); @@ -26,11 +26,11 @@ class OPENDIS6_EXPORT Relationship { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getNature() const; - void setNature(unsigned short pX); + uint16_t getNature() const; + void setNature(uint16_t pX); - unsigned short getPosition() const; - void setPosition(unsigned short pX); + uint16_t getPosition() const; + void setPosition(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RemoveEntityPdu.cpp b/src/dis6/RemoveEntityPdu.cpp index 41dece63..c726344d 100644 --- a/src/dis6/RemoveEntityPdu.cpp +++ b/src/dis6/RemoveEntityPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RemoveEntityPdu.h" using namespace DIS; diff --git a/src/dis6/RemoveEntityPdu.h b/src/dis6/RemoveEntityPdu.h index c89a9ef9..da235134 100644 --- a/src/dis6/RemoveEntityPdu.h +++ b/src/dis6/RemoveEntityPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.2. Remove an entity. COMPLETE diff --git a/src/dis6/RemoveEntityReliablePdu.cpp b/src/dis6/RemoveEntityReliablePdu.cpp index 8b41d2cd..08b34ead 100644 --- a/src/dis6/RemoveEntityReliablePdu.cpp +++ b/src/dis6/RemoveEntityReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RemoveEntityReliablePdu.h" using namespace DIS; @@ -21,9 +21,9 @@ void RemoveEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short RemoveEntityReliablePdu::getPad1() const { return _pad1; } +uint16_t RemoveEntityReliablePdu::getPad1() const { return _pad1; } -void RemoveEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void RemoveEntityReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char RemoveEntityReliablePdu::getPad2() const { return _pad2; } diff --git a/src/dis6/RemoveEntityReliablePdu.h b/src/dis6/RemoveEntityReliablePdu.h index 37e6ad3f..03b9aab4 100644 --- a/src/dis6/RemoveEntityReliablePdu.h +++ b/src/dis6/RemoveEntityReliablePdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.2: Removal of an entity , reliable. COMPLETE @@ -19,7 +19,7 @@ class OPENDIS6_EXPORT RemoveEntityReliablePdu unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -37,8 +37,8 @@ class OPENDIS6_EXPORT RemoveEntityReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/RepairCompletePdu.cpp b/src/dis6/RepairCompletePdu.cpp index 6c2f2013..25dfd163 100644 --- a/src/dis6/RepairCompletePdu.cpp +++ b/src/dis6/RepairCompletePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RepairCompletePdu.h" using namespace DIS; @@ -37,13 +37,13 @@ void RepairCompletePdu::setRepairingEntityID(const EntityID& pX) { _repairingEntityID = pX; } -unsigned short RepairCompletePdu::getRepair() const { return _repair; } +uint16_t RepairCompletePdu::getRepair() const { return _repair; } -void RepairCompletePdu::setRepair(unsigned short pX) { _repair = pX; } +void RepairCompletePdu::setRepair(uint16_t pX) { _repair = pX; } -short RepairCompletePdu::getPadding2() const { return _padding2; } +int16_t RepairCompletePdu::getPadding2() const { return _padding2; } -void RepairCompletePdu::setPadding2(short pX) { _padding2 = pX; } +void RepairCompletePdu::setPadding2(int16_t pX) { _padding2 = pX; } void RepairCompletePdu::marshal(DataStream& dataStream) const { LogisticsFamilyPdu::marshal( diff --git a/src/dis6/RepairCompletePdu.h b/src/dis6/RepairCompletePdu.h index a5c12ec6..084fbfe6 100644 --- a/src/dis6/RepairCompletePdu.h +++ b/src/dis6/RepairCompletePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/LogisticsFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.5.5. Repair is complete. COMPLETE @@ -22,10 +22,10 @@ class OPENDIS6_EXPORT RepairCompletePdu : public LogisticsFamilyPdu { EntityID _repairingEntityID; /** Enumeration for type of repair */ - unsigned short _repair; + uint16_t _repair; /** padding, number prevents conflict with superclass ivar name */ - short _padding2; + int16_t _padding2; public: RepairCompletePdu(); @@ -42,11 +42,11 @@ class OPENDIS6_EXPORT RepairCompletePdu : public LogisticsFamilyPdu { const EntityID& getRepairingEntityID() const; void setRepairingEntityID(const EntityID& pX); - unsigned short getRepair() const; - void setRepair(unsigned short pX); + uint16_t getRepair() const; + void setRepair(uint16_t pX); - short getPadding2() const; - void setPadding2(short pX); + int16_t getPadding2() const; + void setPadding2(int16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RepairResponsePdu.cpp b/src/dis6/RepairResponsePdu.cpp index 8335ec88..1ee095be 100644 --- a/src/dis6/RepairResponsePdu.cpp +++ b/src/dis6/RepairResponsePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/RepairResponsePdu.h" using namespace DIS; @@ -46,9 +46,9 @@ void RepairResponsePdu::setRepairResult(unsigned char pX) { _repairResult = pX; } -short RepairResponsePdu::getPadding1() const { return _padding1; } +int16_t RepairResponsePdu::getPadding1() const { return _padding1; } -void RepairResponsePdu::setPadding1(short pX) { _padding1 = pX; } +void RepairResponsePdu::setPadding1(int16_t pX) { _padding1 = pX; } char RepairResponsePdu::getPadding2() const { return _padding2; } diff --git a/src/dis6/RepairResponsePdu.h b/src/dis6/RepairResponsePdu.h index 2d677b5c..f45112f6 100644 --- a/src/dis6/RepairResponsePdu.h +++ b/src/dis6/RepairResponsePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/LogisticsFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.5.6. Sent after repair complete PDU. COMPLETE @@ -25,7 +25,7 @@ class OPENDIS6_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { unsigned char _repairResult; /** padding */ - short _padding1; + int16_t _padding1; /** padding */ char _padding2; @@ -48,8 +48,8 @@ class OPENDIS6_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { unsigned char getRepairResult() const; void setRepairResult(unsigned char pX); - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis6/ResupplyCancelPdu.cpp b/src/dis6/ResupplyCancelPdu.cpp index 9a6adfa4..5ac83482 100644 --- a/src/dis6/ResupplyCancelPdu.cpp +++ b/src/dis6/ResupplyCancelPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ResupplyCancelPdu.h" using namespace DIS; diff --git a/src/dis6/ResupplyCancelPdu.h b/src/dis6/ResupplyCancelPdu.h index 427fcb2c..7e0a2d45 100644 --- a/src/dis6/ResupplyCancelPdu.h +++ b/src/dis6/ResupplyCancelPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/LogisticsFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.5.4. Cancel of resupply by either the receiving or supplying diff --git a/src/dis6/ResupplyOfferPdu.cpp b/src/dis6/ResupplyOfferPdu.cpp index d47e0bdf..af3d4724 100644 --- a/src/dis6/ResupplyOfferPdu.cpp +++ b/src/dis6/ResupplyOfferPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ResupplyOfferPdu.h" using namespace DIS; @@ -42,9 +42,9 @@ unsigned char ResupplyOfferPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } -short ResupplyOfferPdu::getPadding1() const { return _padding1; } +int16_t ResupplyOfferPdu::getPadding1() const { return _padding1; } -void ResupplyOfferPdu::setPadding1(short pX) { _padding1 = pX; } +void ResupplyOfferPdu::setPadding1(int16_t pX) { _padding1 = pX; } char ResupplyOfferPdu::getPadding2() const { return _padding2; } @@ -123,7 +123,7 @@ int ResupplyOfferPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _padding1 marshalSize = marshalSize + 1; // _padding2 - for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + for (uint64_t idx = 0; idx < _supplies.size(); idx++) { SupplyQuantity listElement = _supplies[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ResupplyOfferPdu.h b/src/dis6/ResupplyOfferPdu.h index 5445086a..ed10d803 100644 --- a/src/dis6/ResupplyOfferPdu.h +++ b/src/dis6/ResupplyOfferPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/LogisticsFamilyPdu.h" +#include "dis6/SupplyQuantity.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.5.2. Information about a request for supplies. COMPLETE @@ -28,7 +28,7 @@ class OPENDIS6_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { unsigned char _numberOfSupplyTypes; /** padding */ - short _padding1; + int16_t _padding1; /** padding */ char _padding2; @@ -52,8 +52,8 @@ class OPENDIS6_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { unsigned char getNumberOfSupplyTypes() const; - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis6/ResupplyReceivedPdu.cpp b/src/dis6/ResupplyReceivedPdu.cpp index b6dfba8f..09697cb5 100644 --- a/src/dis6/ResupplyReceivedPdu.cpp +++ b/src/dis6/ResupplyReceivedPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ResupplyReceivedPdu.h" using namespace DIS; @@ -42,9 +42,9 @@ unsigned char ResupplyReceivedPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } -short ResupplyReceivedPdu::getPadding1() const { return _padding1; } +int16_t ResupplyReceivedPdu::getPadding1() const { return _padding1; } -void ResupplyReceivedPdu::setPadding1(short pX) { _padding1 = pX; } +void ResupplyReceivedPdu::setPadding1(int16_t pX) { _padding1 = pX; } char ResupplyReceivedPdu::getPadding2() const { return _padding2; } @@ -123,7 +123,7 @@ int ResupplyReceivedPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _padding1 marshalSize = marshalSize + 1; // _padding2 - for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + for (uint64_t idx = 0; idx < _supplies.size(); idx++) { SupplyQuantity listElement = _supplies[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ResupplyReceivedPdu.h b/src/dis6/ResupplyReceivedPdu.h index ad1b59c9..88a4405f 100644 --- a/src/dis6/ResupplyReceivedPdu.h +++ b/src/dis6/ResupplyReceivedPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/LogisticsFamilyPdu.h" +#include "dis6/SupplyQuantity.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.5.3. Receipt of supplies is communiated. COMPLETE @@ -28,7 +28,7 @@ class OPENDIS6_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { unsigned char _numberOfSupplyTypes; /** padding */ - short _padding1; + int16_t _padding1; /** padding */ char _padding2; @@ -52,8 +52,8 @@ class OPENDIS6_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { unsigned char getNumberOfSupplyTypes() const; - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis6/SeesPdu.cpp b/src/dis6/SeesPdu.cpp index cef93f84..333cb700 100644 --- a/src/dis6/SeesPdu.cpp +++ b/src/dis6/SeesPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SeesPdu.h" using namespace DIS; @@ -28,37 +28,37 @@ void SeesPdu::setOrginatingEntityID(const EntityID& pX) { _orginatingEntityID = pX; } -unsigned short SeesPdu::getInfraredSignatureRepresentationIndex() const { +uint16_t SeesPdu::getInfraredSignatureRepresentationIndex() const { return _infraredSignatureRepresentationIndex; } -void SeesPdu::setInfraredSignatureRepresentationIndex(unsigned short pX) { +void SeesPdu::setInfraredSignatureRepresentationIndex(uint16_t pX) { _infraredSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getAcousticSignatureRepresentationIndex() const { +uint16_t SeesPdu::getAcousticSignatureRepresentationIndex() const { return _acousticSignatureRepresentationIndex; } -void SeesPdu::setAcousticSignatureRepresentationIndex(unsigned short pX) { +void SeesPdu::setAcousticSignatureRepresentationIndex(uint16_t pX) { _acousticSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() +uint16_t SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() const { return _radarCrossSectionSignatureRepresentationIndex; } void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex( - unsigned short pX) { + uint16_t pX) { _radarCrossSectionSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getNumberOfPropulsionSystems() const { +uint16_t SeesPdu::getNumberOfPropulsionSystems() const { return _propulsionSystemData.size(); } -unsigned short SeesPdu::getNumberOfVectoringNozzleSystems() const { +uint16_t SeesPdu::getNumberOfVectoringNozzleSystems() const { return _vectoringSystemData.size(); } @@ -97,8 +97,8 @@ void SeesPdu::marshal(DataStream& dataStream) const { dataStream << _infraredSignatureRepresentationIndex; dataStream << _acousticSignatureRepresentationIndex; dataStream << _radarCrossSectionSignatureRepresentationIndex; - dataStream << (unsigned short)_propulsionSystemData.size(); - dataStream << (unsigned short)_vectoringSystemData.size(); + dataStream << (uint16_t)_propulsionSystemData.size(); + dataStream << (uint16_t)_vectoringSystemData.size(); for (size_t idx = 0; idx < _propulsionSystemData.size(); idx++) { PropulsionSystemData x = _propulsionSystemData[idx]; @@ -178,12 +178,12 @@ int SeesPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _numberOfPropulsionSystems marshalSize = marshalSize + 2; // _numberOfVectoringNozzleSystems - for (unsigned long long idx = 0; idx < _propulsionSystemData.size(); idx++) { + for (uint64_t idx = 0; idx < _propulsionSystemData.size(); idx++) { PropulsionSystemData listElement = _propulsionSystemData[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _vectoringSystemData.size(); idx++) { + for (uint64_t idx = 0; idx < _vectoringSystemData.size(); idx++) { VectoringNozzleSystemData listElement = _vectoringSystemData[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/SeesPdu.h b/src/dis6/SeesPdu.h index 0d87ea40..3f18ffa4 100644 --- a/src/dis6/SeesPdu.h +++ b/src/dis6/SeesPdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis6/DistributedEmissionsFamilyPdu.h" +#include "dis6/EntityID.h" +#include "dis6/PropulsionSystemData.h" +#include "dis6/VectoringNozzleSystemData.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.7.5. SEES PDU, supplemental emissions entity state information. @@ -24,19 +24,19 @@ class OPENDIS6_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu { EntityID _orginatingEntityID; /** IR Signature representation index */ - unsigned short _infraredSignatureRepresentationIndex; + uint16_t _infraredSignatureRepresentationIndex; /** acoustic Signature representation index */ - unsigned short _acousticSignatureRepresentationIndex; + uint16_t _acousticSignatureRepresentationIndex; /** radar cross section representation index */ - unsigned short _radarCrossSectionSignatureRepresentationIndex; + uint16_t _radarCrossSectionSignatureRepresentationIndex; /** how many propulsion systems */ - unsigned short _numberOfPropulsionSystems; + uint16_t _numberOfPropulsionSystems; /** how many vectoring nozzle systems */ - unsigned short _numberOfVectoringNozzleSystems; + uint16_t _numberOfVectoringNozzleSystems; /** variable length list of propulsion system data */ std::vector _propulsionSystemData; @@ -55,18 +55,18 @@ class OPENDIS6_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu { const EntityID& getOrginatingEntityID() const; void setOrginatingEntityID(const EntityID& pX); - unsigned short getInfraredSignatureRepresentationIndex() const; - void setInfraredSignatureRepresentationIndex(unsigned short pX); + uint16_t getInfraredSignatureRepresentationIndex() const; + void setInfraredSignatureRepresentationIndex(uint16_t pX); - unsigned short getAcousticSignatureRepresentationIndex() const; - void setAcousticSignatureRepresentationIndex(unsigned short pX); + uint16_t getAcousticSignatureRepresentationIndex() const; + void setAcousticSignatureRepresentationIndex(uint16_t pX); - unsigned short getRadarCrossSectionSignatureRepresentationIndex() const; - void setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX); + uint16_t getRadarCrossSectionSignatureRepresentationIndex() const; + void setRadarCrossSectionSignatureRepresentationIndex(uint16_t pX); - unsigned short getNumberOfPropulsionSystems() const; + uint16_t getNumberOfPropulsionSystems() const; - unsigned short getNumberOfVectoringNozzleSystems() const; + uint16_t getNumberOfVectoringNozzleSystems() const; std::vector& getPropulsionSystemData(); const std::vector& getPropulsionSystemData() const; diff --git a/src/dis6/ServiceRequestPdu.cpp b/src/dis6/ServiceRequestPdu.cpp index 13d11050..c3789ef3 100644 --- a/src/dis6/ServiceRequestPdu.cpp +++ b/src/dis6/ServiceRequestPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ServiceRequestPdu.h" using namespace DIS; @@ -50,11 +50,11 @@ unsigned char ServiceRequestPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } -short ServiceRequestPdu::getServiceRequestPadding() const { +int16_t ServiceRequestPdu::getServiceRequestPadding() const { return _serviceRequestPadding; } -void ServiceRequestPdu::setServiceRequestPadding(short pX) { +void ServiceRequestPdu::setServiceRequestPadding(int16_t pX) { _serviceRequestPadding = pX; } @@ -132,7 +132,7 @@ int ServiceRequestPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfSupplyTypes marshalSize = marshalSize + 2; // _serviceRequestPadding - for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + for (uint64_t idx = 0; idx < _supplies.size(); idx++) { SupplyQuantity listElement = _supplies[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/ServiceRequestPdu.h b/src/dis6/ServiceRequestPdu.h index 517bd750..a772bb7f 100644 --- a/src/dis6/ServiceRequestPdu.h +++ b/src/dis6/ServiceRequestPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/LogisticsFamilyPdu.h" +#include "dis6/SupplyQuantity.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.5.1. Information about a request for supplies. COMPLETE @@ -31,7 +31,7 @@ class OPENDIS6_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { unsigned char _numberOfSupplyTypes; /** padding */ - short _serviceRequestPadding; + int16_t _serviceRequestPadding; std::vector _supplies; @@ -55,8 +55,8 @@ class OPENDIS6_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { unsigned char getNumberOfSupplyTypes() const; - short getServiceRequestPadding() const; - void setServiceRequestPadding(short pX); + int16_t getServiceRequestPadding() const; + void setServiceRequestPadding(int16_t pX); std::vector& getSupplies(); const std::vector& getSupplies() const; diff --git a/src/dis6/SetDataPdu.cpp b/src/dis6/SetDataPdu.cpp index 21dd1332..8ca9590a 100644 --- a/src/dis6/SetDataPdu.cpp +++ b/src/dis6/SetDataPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SetDataPdu.h" using namespace DIS; @@ -124,12 +124,12 @@ int SetDataPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/SetDataPdu.h b/src/dis6/SetDataPdu.h index 92fbc715..4483fd41 100644 --- a/src/dis6/SetDataPdu.h +++ b/src/dis6/SetDataPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6.9. Change state information with the data contained in this. diff --git a/src/dis6/SetDataReliablePdu.cpp b/src/dis6/SetDataReliablePdu.cpp index b253de94..75ca6b09 100644 --- a/src/dis6/SetDataReliablePdu.cpp +++ b/src/dis6/SetDataReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SetDataReliablePdu.h" using namespace DIS; @@ -26,9 +26,9 @@ void SetDataReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short SetDataReliablePdu::getPad1() const { return _pad1; } +uint16_t SetDataReliablePdu::getPad1() const { return _pad1; } -void SetDataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void SetDataReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char SetDataReliablePdu::getPad2() const { return _pad2; } @@ -156,12 +156,12 @@ int SetDataReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/SetDataReliablePdu.h b/src/dis6/SetDataReliablePdu.h index c9a60a99..bb1b32f0 100644 --- a/src/dis6/SetDataReliablePdu.h +++ b/src/dis6/SetDataReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/FixedDatum.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/VariableDatum.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.9: initializing or chaning internal state information, @@ -25,7 +25,7 @@ class OPENDIS6_EXPORT SetDataReliablePdu unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -55,8 +55,8 @@ class OPENDIS6_EXPORT SetDataReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/SetRecordReliablePdu.cpp b/src/dis6/SetRecordReliablePdu.cpp index 5fa4a8a8..2cacff37 100644 --- a/src/dis6/SetRecordReliablePdu.cpp +++ b/src/dis6/SetRecordReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SetRecordReliablePdu.h" using namespace DIS; @@ -26,9 +26,9 @@ void SetRecordReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short SetRecordReliablePdu::getPad1() const { return _pad1; } +uint16_t SetRecordReliablePdu::getPad1() const { return _pad1; } -void SetRecordReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void SetRecordReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char SetRecordReliablePdu::getPad2() const { return _pad2; } @@ -111,7 +111,7 @@ int SetRecordReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _pad2 marshalSize = marshalSize + 4; // _numberOfRecordSets - for (unsigned long long idx = 0; idx < _recordSets.size(); idx++) { + for (uint64_t idx = 0; idx < _recordSets.size(); idx++) { RecordSet listElement = _recordSets[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/SetRecordReliablePdu.h b/src/dis6/SetRecordReliablePdu.h index 222295f6..0ca29c75 100644 --- a/src/dis6/SetRecordReliablePdu.h +++ b/src/dis6/SetRecordReliablePdu.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis6/RecordSet.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.14: Initializing or changing internal parameter info. Needs @@ -26,7 +26,7 @@ class OPENDIS6_EXPORT SetRecordReliablePdu unsigned char _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -50,8 +50,8 @@ class OPENDIS6_EXPORT SetRecordReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/ShaftRPMs.cpp b/src/dis6/ShaftRPMs.cpp index 2e757fc6..b89a7f12 100644 --- a/src/dis6/ShaftRPMs.cpp +++ b/src/dis6/ShaftRPMs.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/ShaftRPMs.h" using namespace DIS; @@ -7,13 +7,13 @@ ShaftRPMs::ShaftRPMs() ShaftRPMs::~ShaftRPMs() {} -short ShaftRPMs::getCurrentShaftRPMs() const { return _currentShaftRPMs; } +int16_t ShaftRPMs::getCurrentShaftRPMs() const { return _currentShaftRPMs; } -void ShaftRPMs::setCurrentShaftRPMs(short pX) { _currentShaftRPMs = pX; } +void ShaftRPMs::setCurrentShaftRPMs(int16_t pX) { _currentShaftRPMs = pX; } -short ShaftRPMs::getOrderedShaftRPMs() const { return _orderedShaftRPMs; } +int16_t ShaftRPMs::getOrderedShaftRPMs() const { return _orderedShaftRPMs; } -void ShaftRPMs::setOrderedShaftRPMs(short pX) { _orderedShaftRPMs = pX; } +void ShaftRPMs::setOrderedShaftRPMs(int16_t pX) { _orderedShaftRPMs = pX; } float ShaftRPMs::getShaftRPMRateOfChange() const { return _shaftRPMRateOfChange; diff --git a/src/dis6/ShaftRPMs.h b/src/dis6/ShaftRPMs.h index 55745d2a..a1b485e9 100644 --- a/src/dis6/ShaftRPMs.h +++ b/src/dis6/ShaftRPMs.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Shaft RPMs, used in underwater acoustic clacluations. @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT ShaftRPMs { protected: /** Current shaft RPMs */ - short _currentShaftRPMs; + int16_t _currentShaftRPMs; /** ordered shaft rpms */ - short _orderedShaftRPMs; + int16_t _orderedShaftRPMs; /** rate of change of shaft RPMs */ float _shaftRPMRateOfChange; @@ -29,11 +29,11 @@ class OPENDIS6_EXPORT ShaftRPMs { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - short getCurrentShaftRPMs() const; - void setCurrentShaftRPMs(short pX); + int16_t getCurrentShaftRPMs() const; + void setCurrentShaftRPMs(int16_t pX); - short getOrderedShaftRPMs() const; - void setOrderedShaftRPMs(short pX); + int16_t getOrderedShaftRPMs() const; + void setOrderedShaftRPMs(int16_t pX); float getShaftRPMRateOfChange() const; void setShaftRPMRateOfChange(float pX); diff --git a/src/dis6/SignalPdu.cpp b/src/dis6/SignalPdu.cpp index 2eecad3d..08b0353e 100644 --- a/src/dis6/SignalPdu.cpp +++ b/src/dis6/SignalPdu.cpp @@ -14,23 +14,23 @@ SignalPdu::SignalPdu() SignalPdu::~SignalPdu() { _data.clear(); } -unsigned short SignalPdu::getEncodingScheme() const { return _encodingScheme; } +uint16_t SignalPdu::getEncodingScheme() const { return _encodingScheme; } -void SignalPdu::setEncodingScheme(unsigned short pX) { _encodingScheme = pX; } +void SignalPdu::setEncodingScheme(uint16_t pX) { _encodingScheme = pX; } -unsigned short SignalPdu::getTdlType() const { return _tdlType; } +uint16_t SignalPdu::getTdlType() const { return _tdlType; } -void SignalPdu::setTdlType(unsigned short pX) { _tdlType = pX; } +void SignalPdu::setTdlType(uint16_t pX) { _tdlType = pX; } unsigned int SignalPdu::getSampleRate() const { return _sampleRate; } void SignalPdu::setSampleRate(unsigned int pX) { _sampleRate = pX; } -short SignalPdu::getDataLength() const { return _data.size(); } +int16_t SignalPdu::getDataLength() const { return _data.size(); } -short SignalPdu::getSamples() const { return _samples; } +int16_t SignalPdu::getSamples() const { return _samples; } -void SignalPdu::setSamples(short pX) { _samples = pX; } +void SignalPdu::setSamples(int16_t pX) { _samples = pX; } std::vector& SignalPdu::getData() { return _data; } @@ -44,7 +44,7 @@ void SignalPdu::marshal(DataStream& dataStream) const { dataStream << _encodingScheme; dataStream << _tdlType; dataStream << _sampleRate; - dataStream << (short)_data.size(); + dataStream << (int16_t)_data.size(); dataStream << _samples; for (auto byte : _data) { dataStream << byte; diff --git a/src/dis6/SignalPdu.h b/src/dis6/SignalPdu.h index f6f9202d..274d92aa 100644 --- a/src/dis6/SignalPdu.h +++ b/src/dis6/SignalPdu.h @@ -21,19 +21,19 @@ namespace DIS { class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { protected: /** encoding scheme used, and enumeration */ - unsigned short _encodingScheme; + uint16_t _encodingScheme; /** tdl type */ - unsigned short _tdlType; + uint16_t _tdlType; /** sample rate */ unsigned int _sampleRate; /** length od data */ - short _dataLength; + int16_t _dataLength; /** number of samples */ - short _samples; + int16_t _samples; /** list of eight bit values */ std::vector _data; @@ -45,19 +45,19 @@ class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getEncodingScheme() const; - void setEncodingScheme(unsigned short pX); + uint16_t getEncodingScheme() const; + void setEncodingScheme(uint16_t pX); - unsigned short getTdlType() const; - void setTdlType(unsigned short pX); + uint16_t getTdlType() const; + void setTdlType(uint16_t pX); unsigned int getSampleRate() const; void setSampleRate(unsigned int pX); - short getDataLength() const; + int16_t getDataLength() const; - short getSamples() const; - void setSamples(short pX); + int16_t getSamples() const; + void setSamples(int16_t pX); std::vector& getData(); const std::vector& getData() const; diff --git a/src/dis6/SimulationAddress.cpp b/src/dis6/SimulationAddress.cpp index be8258bf..83d89104 100644 --- a/src/dis6/SimulationAddress.cpp +++ b/src/dis6/SimulationAddress.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SimulationAddress.h" using namespace DIS; @@ -6,15 +6,15 @@ SimulationAddress::SimulationAddress() : _site(0), _application(0) {} SimulationAddress::~SimulationAddress() {} -unsigned short SimulationAddress::getSite() const { return _site; } +uint16_t SimulationAddress::getSite() const { return _site; } -void SimulationAddress::setSite(unsigned short pX) { _site = pX; } +void SimulationAddress::setSite(uint16_t pX) { _site = pX; } -unsigned short SimulationAddress::getApplication() const { +uint16_t SimulationAddress::getApplication() const { return _application; } -void SimulationAddress::setApplication(unsigned short pX) { _application = pX; } +void SimulationAddress::setApplication(uint16_t pX) { _application = pX; } void SimulationAddress::marshal(DataStream& dataStream) const { dataStream << _site; diff --git a/src/dis6/SimulationAddress.h b/src/dis6/SimulationAddress.h index 8210adee..596a4be2 100644 --- a/src/dis6/SimulationAddress.h +++ b/src/dis6/SimulationAddress.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.14.1. A Simulation Address record shall consist of the Site @@ -15,10 +15,10 @@ namespace DIS { class OPENDIS6_EXPORT SimulationAddress { protected: /** The site ID */ - unsigned short _site; + uint16_t _site; /** The application ID */ - unsigned short _application; + uint16_t _application; public: SimulationAddress(); @@ -27,11 +27,11 @@ class OPENDIS6_EXPORT SimulationAddress { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + uint16_t getSite() const; + void setSite(uint16_t pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + uint16_t getApplication() const; + void setApplication(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/SimulationManagementFamilyPdu.cpp b/src/dis6/SimulationManagementFamilyPdu.cpp index 74feb4ef..4c760cf2 100644 --- a/src/dis6/SimulationManagementFamilyPdu.cpp +++ b/src/dis6/SimulationManagementFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SimulationManagementFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/SimulationManagementFamilyPdu.h b/src/dis6/SimulationManagementFamilyPdu.h index ac97aa5e..f438f73b 100644 --- a/src/dis6/SimulationManagementFamilyPdu.h +++ b/src/dis6/SimulationManagementFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.6. Abstract superclass for PDUs relating to the simulation diff --git a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp index 870bed47..67bcecec 100644 --- a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp +++ b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h index 7c2252ab..d83620b6 100644 --- a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h +++ b/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12: Abstract superclass for reliable simulation management PDUs diff --git a/src/dis6/SixByteChunk.cpp b/src/dis6/SixByteChunk.cpp index f175d33f..8d47d10e 100644 --- a/src/dis6/SixByteChunk.cpp +++ b/src/dis6/SixByteChunk.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SixByteChunk.h" using namespace DIS; diff --git a/src/dis6/SixByteChunk.h b/src/dis6/SixByteChunk.h index f948b40c..52ebc10f 100644 --- a/src/dis6/SixByteChunk.h +++ b/src/dis6/SixByteChunk.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 48 bit piece of data diff --git a/src/dis6/SphericalHarmonicAntennaPattern.cpp b/src/dis6/SphericalHarmonicAntennaPattern.cpp index ecd99760..c2281971 100644 --- a/src/dis6/SphericalHarmonicAntennaPattern.cpp +++ b/src/dis6/SphericalHarmonicAntennaPattern.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SphericalHarmonicAntennaPattern.h" using namespace DIS; diff --git a/src/dis6/SphericalHarmonicAntennaPattern.h b/src/dis6/SphericalHarmonicAntennaPattern.h index 9e6d848c..39544270 100644 --- a/src/dis6/SphericalHarmonicAntennaPattern.h +++ b/src/dis6/SphericalHarmonicAntennaPattern.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is diff --git a/src/dis6/StartResumePdu.cpp b/src/dis6/StartResumePdu.cpp index d424699a..941e3fff 100644 --- a/src/dis6/StartResumePdu.cpp +++ b/src/dis6/StartResumePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/StartResumePdu.h" using namespace DIS; diff --git a/src/dis6/StartResumePdu.h b/src/dis6/StartResumePdu.h index f391c6bf..13aed820 100644 --- a/src/dis6/StartResumePdu.h +++ b/src/dis6/StartResumePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/ClockTime.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.6.3. Start or resume an exercise. COMPLETE diff --git a/src/dis6/StartResumeReliablePdu.cpp b/src/dis6/StartResumeReliablePdu.cpp index 16c37c92..a140ca69 100644 --- a/src/dis6/StartResumeReliablePdu.cpp +++ b/src/dis6/StartResumeReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/StartResumeReliablePdu.h" using namespace DIS; @@ -45,9 +45,9 @@ void StartResumeReliablePdu::setRequiredReliabilityService(unsigned char pX) { _requiredReliabilityService = pX; } -unsigned short StartResumeReliablePdu::getPad1() const { return _pad1; } +uint16_t StartResumeReliablePdu::getPad1() const { return _pad1; } -void StartResumeReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void StartResumeReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } unsigned char StartResumeReliablePdu::getPad2() const { return _pad2; } diff --git a/src/dis6/StartResumeReliablePdu.h b/src/dis6/StartResumeReliablePdu.h index caecd565..9f23b441 100644 --- a/src/dis6/StartResumeReliablePdu.h +++ b/src/dis6/StartResumeReliablePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/ClockTime.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.3: Start resume simulation, relaible. COMPLETE @@ -26,7 +26,7 @@ class OPENDIS6_EXPORT StartResumeReliablePdu unsigned char _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ unsigned char _pad2; @@ -52,8 +52,8 @@ class OPENDIS6_EXPORT StartResumeReliablePdu unsigned char getRequiredReliabilityService() const; void setRequiredReliabilityService(unsigned char pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); unsigned char getPad2() const; void setPad2(unsigned char pX); diff --git a/src/dis6/StopFreezePdu.cpp b/src/dis6/StopFreezePdu.cpp index abad49bd..0dc06040 100644 --- a/src/dis6/StopFreezePdu.cpp +++ b/src/dis6/StopFreezePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/StopFreezePdu.h" using namespace DIS; @@ -36,9 +36,9 @@ void StopFreezePdu::setFrozenBehavior(unsigned char pX) { _frozenBehavior = pX; } -short StopFreezePdu::getPadding1() const { return _padding1; } +int16_t StopFreezePdu::getPadding1() const { return _padding1; } -void StopFreezePdu::setPadding1(short pX) { _padding1 = pX; } +void StopFreezePdu::setPadding1(int16_t pX) { _padding1 = pX; } unsigned int StopFreezePdu::getRequestID() const { return _requestID; } diff --git a/src/dis6/StopFreezePdu.h b/src/dis6/StopFreezePdu.h index 21a838bb..bf199bb0 100644 --- a/src/dis6/StopFreezePdu.h +++ b/src/dis6/StopFreezePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/ClockTime.h" +#include "dis6/SimulationManagementFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.3.4. Stop or freeze an exercise. COMPLETE @@ -26,7 +26,7 @@ class OPENDIS6_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { unsigned char _frozenBehavior; /** padding */ - short _padding1; + int16_t _padding1; /** Request ID that is unique */ unsigned int _requestID; @@ -48,8 +48,8 @@ class OPENDIS6_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { unsigned char getFrozenBehavior() const; void setFrozenBehavior(unsigned char pX); - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); unsigned int getRequestID() const; void setRequestID(unsigned int pX); diff --git a/src/dis6/StopFreezeReliablePdu.cpp b/src/dis6/StopFreezeReliablePdu.cpp index 44af0965..b43a04fd 100644 --- a/src/dis6/StopFreezeReliablePdu.cpp +++ b/src/dis6/StopFreezeReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/StopFreezeReliablePdu.h" using namespace DIS; diff --git a/src/dis6/StopFreezeReliablePdu.h b/src/dis6/StopFreezeReliablePdu.h index 05f45f67..ec283324 100644 --- a/src/dis6/StopFreezeReliablePdu.h +++ b/src/dis6/StopFreezeReliablePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/ClockTime.h" +#include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE diff --git a/src/dis6/SupplyQuantity.cpp b/src/dis6/SupplyQuantity.cpp index bfc01101..56acaaaf 100644 --- a/src/dis6/SupplyQuantity.cpp +++ b/src/dis6/SupplyQuantity.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SupplyQuantity.h" using namespace DIS; diff --git a/src/dis6/SupplyQuantity.h b/src/dis6/SupplyQuantity.h index d748debb..6b35ed3d 100644 --- a/src/dis6/SupplyQuantity.h +++ b/src/dis6/SupplyQuantity.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/EntityType.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.30. A supply, and the amount of that supply. Similar to an entity diff --git a/src/dis6/SyntheticEnvironmentFamilyPdu.cpp b/src/dis6/SyntheticEnvironmentFamilyPdu.cpp index 5f986f64..b937921b 100644 --- a/src/dis6/SyntheticEnvironmentFamilyPdu.cpp +++ b/src/dis6/SyntheticEnvironmentFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SyntheticEnvironmentFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/SyntheticEnvironmentFamilyPdu.h b/src/dis6/SyntheticEnvironmentFamilyPdu.h index 68dea8cb..1b680617 100644 --- a/src/dis6/SyntheticEnvironmentFamilyPdu.h +++ b/src/dis6/SyntheticEnvironmentFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.11: Abstract superclass for synthetic environment PDUs diff --git a/src/dis6/SystemID.cpp b/src/dis6/SystemID.cpp index 71a9824b..819b74ba 100644 --- a/src/dis6/SystemID.cpp +++ b/src/dis6/SystemID.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/SystemID.h" using namespace DIS; @@ -7,13 +7,13 @@ SystemID::SystemID() SystemID::~SystemID() {} -unsigned short SystemID::getSystemType() const { return _systemType; } +uint16_t SystemID::getSystemType() const { return _systemType; } -void SystemID::setSystemType(unsigned short pX) { _systemType = pX; } +void SystemID::setSystemType(uint16_t pX) { _systemType = pX; } -unsigned short SystemID::getSystemName() const { return _systemName; } +uint16_t SystemID::getSystemName() const { return _systemName; } -void SystemID::setSystemName(unsigned short pX) { _systemName = pX; } +void SystemID::setSystemName(uint16_t pX) { _systemName = pX; } unsigned char SystemID::getSystemMode() const { return _systemMode; } diff --git a/src/dis6/SystemID.h b/src/dis6/SystemID.h index 26159894..bfd8d6b0 100644 --- a/src/dis6/SystemID.h +++ b/src/dis6/SystemID.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 5.2.58. Used in IFF ATC PDU @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT SystemID { protected: /** System Type */ - unsigned short _systemType; + uint16_t _systemType; /** System name, an enumeration */ - unsigned short _systemName; + uint16_t _systemName; /** System mode */ unsigned char _systemMode; @@ -32,11 +32,11 @@ class OPENDIS6_EXPORT SystemID { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSystemType() const; - void setSystemType(unsigned short pX); + uint16_t getSystemType() const; + void setSystemType(uint16_t pX); - unsigned short getSystemName() const; - void setSystemName(unsigned short pX); + uint16_t getSystemName() const; + void setSystemName(uint16_t pX); unsigned char getSystemMode() const; void setSystemMode(unsigned char pX); diff --git a/src/dis6/TrackJamTarget.cpp b/src/dis6/TrackJamTarget.cpp index 0eef5e35..92baa9b8 100644 --- a/src/dis6/TrackJamTarget.cpp +++ b/src/dis6/TrackJamTarget.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/TrackJamTarget.h" using namespace DIS; diff --git a/src/dis6/TrackJamTarget.h b/src/dis6/TrackJamTarget.h index 154b440f..5fea4bce 100644 --- a/src/dis6/TrackJamTarget.h +++ b/src/dis6/TrackJamTarget.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // One track/jam target diff --git a/src/dis6/TransferControlRequestPdu.cpp b/src/dis6/TransferControlRequestPdu.cpp index 7571c536..fa3048f5 100644 --- a/src/dis6/TransferControlRequestPdu.cpp +++ b/src/dis6/TransferControlRequestPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/TransferControlRequestPdu.h" using namespace DIS; @@ -166,7 +166,7 @@ int TransferControlRequestPdu::getMarshalledSize() const { marshalSize + _transferEntityID.getMarshalledSize(); // _transferEntityID marshalSize = marshalSize + 1; // _numberOfRecordSets - for (unsigned long long idx = 0; idx < _recordSets.size(); idx++) { + for (uint64_t idx = 0; idx < _recordSets.size(); idx++) { RecordSet listElement = _recordSets[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/TransferControlRequestPdu.h b/src/dis6/TransferControlRequestPdu.h index 1cf0fe2e..15d1c8db 100644 --- a/src/dis6/TransferControlRequestPdu.h +++ b/src/dis6/TransferControlRequestPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/EntityManagementFamilyPdu.h" +#include "dis6/RecordSet.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.9.3 Information initiating the dyanic allocation and control of diff --git a/src/dis6/TransmitterPdu.cpp b/src/dis6/TransmitterPdu.cpp index f5982bdc..b0a24c41 100644 --- a/src/dis6/TransmitterPdu.cpp +++ b/src/dis6/TransmitterPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/TransmitterPdu.h" using namespace DIS; @@ -51,9 +51,9 @@ unsigned char TransmitterPdu::getInputSource() const { return _inputSource; } void TransmitterPdu::setInputSource(unsigned char pX) { _inputSource = pX; } -unsigned short TransmitterPdu::getPadding1() const { return _padding1; } +uint16_t TransmitterPdu::getPadding1() const { return _padding1; } -void TransmitterPdu::setPadding1(unsigned short pX) { _padding1 = pX; } +void TransmitterPdu::setPadding1(uint16_t pX) { _padding1 = pX; } Vector3Double& TransmitterPdu::getAntennaLocation() { return _antennaLocation; } @@ -77,21 +77,21 @@ void TransmitterPdu::setRelativeAntennaLocation(const Vector3Float& pX) { _relativeAntennaLocation = pX; } -unsigned short TransmitterPdu::getAntennaPatternType() const { +uint16_t TransmitterPdu::getAntennaPatternType() const { return _antennaPatternType; } -void TransmitterPdu::setAntennaPatternType(unsigned short pX) { +void TransmitterPdu::setAntennaPatternType(uint16_t pX) { _antennaPatternType = pX; } -unsigned short TransmitterPdu::getAntennaPatternCount() const { +uint16_t TransmitterPdu::getAntennaPatternCount() const { return _antennaPatternList.size(); } -unsigned long long TransmitterPdu::getFrequency() const { return _frequency; } +uint64_t TransmitterPdu::getFrequency() const { return _frequency; } -void TransmitterPdu::setFrequency(unsigned long long pX) { _frequency = pX; } +void TransmitterPdu::setFrequency(uint64_t pX) { _frequency = pX; } float TransmitterPdu::getTransmitFrequencyBandwidth() const { return _transmitFrequencyBandwidth; @@ -115,21 +115,21 @@ void TransmitterPdu::setModulationType(const ModulationType& pX) { _modulationType = pX; } -unsigned short TransmitterPdu::getCryptoSystem() const { return _cryptoSystem; } +uint16_t TransmitterPdu::getCryptoSystem() const { return _cryptoSystem; } -void TransmitterPdu::setCryptoSystem(unsigned short pX) { _cryptoSystem = pX; } +void TransmitterPdu::setCryptoSystem(uint16_t pX) { _cryptoSystem = pX; } -unsigned short TransmitterPdu::getCryptoKeyId() const { return _cryptoKeyId; } +uint16_t TransmitterPdu::getCryptoKeyId() const { return _cryptoKeyId; } -void TransmitterPdu::setCryptoKeyId(unsigned short pX) { _cryptoKeyId = pX; } +void TransmitterPdu::setCryptoKeyId(uint16_t pX) { _cryptoKeyId = pX; } unsigned char TransmitterPdu::getModulationParameterCount() const { return _modulationParametersList.size(); } -unsigned short TransmitterPdu::getPadding2() const { return _padding2; } +uint16_t TransmitterPdu::getPadding2() const { return _padding2; } -void TransmitterPdu::setPadding2(unsigned short pX) { _padding2 = pX; } +void TransmitterPdu::setPadding2(uint16_t pX) { _padding2 = pX; } unsigned char TransmitterPdu::getPadding3() const { return _padding3; } @@ -172,7 +172,7 @@ void TransmitterPdu::marshal(DataStream& dataStream) const { _antennaLocation.marshal(dataStream); _relativeAntennaLocation.marshal(dataStream); dataStream << _antennaPatternType; - dataStream << (unsigned short)_antennaPatternList.size(); + dataStream << (uint16_t)_antennaPatternList.size(); dataStream << _frequency; dataStream << _transmitFrequencyBandwidth; dataStream << _power; @@ -293,13 +293,13 @@ int TransmitterPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _padding2 marshalSize = marshalSize + 1; // _padding3 - for (unsigned long long idx = 0; idx < _modulationParametersList.size(); + for (uint64_t idx = 0; idx < _modulationParametersList.size(); idx++) { Vector3Float listElement = _modulationParametersList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _antennaPatternList.size(); idx++) { + for (uint64_t idx = 0; idx < _antennaPatternList.size(); idx++) { Vector3Float listElement = _antennaPatternList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/TransmitterPdu.h b/src/dis6/TransmitterPdu.h index aba507c4..95ce3c26 100644 --- a/src/dis6/TransmitterPdu.h +++ b/src/dis6/TransmitterPdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/ModulationType.h" +#include "dis6/RadioCommunicationsFamilyPdu.h" +#include "dis6/RadioEntityType.h" +#include "dis6/Vector3Double.h" +#include "dis6/Vector3Float.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.8.1. Detailed information about a radio transmitter. This PDU @@ -32,7 +32,7 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { unsigned char _inputSource; /** padding */ - unsigned short _padding1; + uint16_t _padding1; /** Location of antenna */ Vector3Double _antennaLocation; @@ -41,13 +41,13 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { Vector3Float _relativeAntennaLocation; /** antenna pattern type */ - unsigned short _antennaPatternType; + uint16_t _antennaPatternType; /** atenna pattern length */ - unsigned short _antennaPatternCount; + uint16_t _antennaPatternCount; /** frequency */ - unsigned long long _frequency; + uint64_t _frequency; /** transmit frequency Bandwidth */ float _transmitFrequencyBandwidth; @@ -59,16 +59,16 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { ModulationType _modulationType; /** crypto system enumeration */ - unsigned short _cryptoSystem; + uint16_t _cryptoSystem; /** crypto system key identifer */ - unsigned short _cryptoKeyId; + uint16_t _cryptoKeyId; /** how many modulation parameters we have */ unsigned char _modulationParameterCount; /** padding2 */ - unsigned short _padding2; + uint16_t _padding2; /** padding3 */ unsigned char _padding3; @@ -96,8 +96,8 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { unsigned char getInputSource() const; void setInputSource(unsigned char pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + uint16_t getPadding1() const; + void setPadding1(uint16_t pX); Vector3Double& getAntennaLocation(); const Vector3Double& getAntennaLocation() const; @@ -107,13 +107,13 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { const Vector3Float& getRelativeAntennaLocation() const; void setRelativeAntennaLocation(const Vector3Float& pX); - unsigned short getAntennaPatternType() const; - void setAntennaPatternType(unsigned short pX); + uint16_t getAntennaPatternType() const; + void setAntennaPatternType(uint16_t pX); - unsigned short getAntennaPatternCount() const; + uint16_t getAntennaPatternCount() const; - unsigned long long getFrequency() const; - void setFrequency(unsigned long long pX); + uint64_t getFrequency() const; + void setFrequency(uint64_t pX); float getTransmitFrequencyBandwidth() const; void setTransmitFrequencyBandwidth(float pX); @@ -125,16 +125,16 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { const ModulationType& getModulationType() const; void setModulationType(const ModulationType& pX); - unsigned short getCryptoSystem() const; - void setCryptoSystem(unsigned short pX); + uint16_t getCryptoSystem() const; + void setCryptoSystem(uint16_t pX); - unsigned short getCryptoKeyId() const; - void setCryptoKeyId(unsigned short pX); + uint16_t getCryptoKeyId() const; + void setCryptoKeyId(uint16_t pX); unsigned char getModulationParameterCount() const; - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + uint16_t getPadding2() const; + void setPadding2(uint16_t pX); unsigned char getPadding3() const; void setPadding3(unsigned char pX); diff --git a/src/dis6/TwoByteChunk.cpp b/src/dis6/TwoByteChunk.cpp index 2e3e0d8b..bffb78c2 100644 --- a/src/dis6/TwoByteChunk.cpp +++ b/src/dis6/TwoByteChunk.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/TwoByteChunk.h" using namespace DIS; diff --git a/src/dis6/TwoByteChunk.h b/src/dis6/TwoByteChunk.h index 34de345d..f82c7be4 100644 --- a/src/dis6/TwoByteChunk.h +++ b/src/dis6/TwoByteChunk.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // 16 bit piece of data diff --git a/src/dis6/UaPdu.cpp b/src/dis6/UaPdu.cpp index 0c67a0e3..b45c0750 100644 --- a/src/dis6/UaPdu.cpp +++ b/src/dis6/UaPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/UaPdu.h" using namespace DIS; @@ -42,11 +42,11 @@ char UaPdu::getPad() const { return _pad; } void UaPdu::setPad(char pX) { _pad = pX; } -unsigned short UaPdu::getPassiveParameterIndex() const { +uint16_t UaPdu::getPassiveParameterIndex() const { return _passiveParameterIndex; } -void UaPdu::setPassiveParameterIndex(unsigned short pX) { +void UaPdu::setPassiveParameterIndex(uint16_t pX) { _passiveParameterIndex = pX; } @@ -199,17 +199,17 @@ int UaPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfAPAs marshalSize = marshalSize + 1; // _numberOfUAEmitterSystems - for (unsigned long long idx = 0; idx < _shaftRPMs.size(); idx++) { + for (uint64_t idx = 0; idx < _shaftRPMs.size(); idx++) { ShaftRPMs listElement = _shaftRPMs[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _apaData.size(); idx++) { + for (uint64_t idx = 0; idx < _apaData.size(); idx++) { ApaData listElement = _apaData[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _emitterSystems.size(); idx++) { + for (uint64_t idx = 0; idx < _emitterSystems.size(); idx++) { AcousticEmitterSystemData listElement = _emitterSystems[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis6/UaPdu.h b/src/dis6/UaPdu.h index 32e6f56f..cb262800 100644 --- a/src/dis6/UaPdu.h +++ b/src/dis6/UaPdu.h @@ -2,14 +2,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/AcousticEmitterSystemData.h" +#include "dis6/ApaData.h" +#include "dis6/DistributedEmissionsFamilyPdu.h" +#include "dis6/EntityID.h" +#include "dis6/EventID.h" +#include "dis6/ShaftRPMs.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.7.3. Information about underwater acoustic emmissions. This @@ -42,7 +42,7 @@ class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { * The indicated database record (or file) shall define all noise generated * as a function of propulsion plant configurations and associated * auxiliaries. */ - unsigned short _passiveParameterIndex; + uint16_t _passiveParameterIndex; /** This field shall specify the entity propulsion plant configuration. This * field is used to determine the passive signature characteristics of an @@ -89,8 +89,8 @@ class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { char getPad() const; void setPad(char pX); - unsigned short getPassiveParameterIndex() const; - void setPassiveParameterIndex(unsigned short pX); + uint16_t getPassiveParameterIndex() const; + void setPassiveParameterIndex(uint16_t pX); unsigned char getPropulsionPlantConfiguration() const; void setPropulsionPlantConfiguration(unsigned char pX); diff --git a/src/dis6/VariableDatum.cpp b/src/dis6/VariableDatum.cpp index 517bc949..4fe56348 100644 --- a/src/dis6/VariableDatum.cpp +++ b/src/dis6/VariableDatum.cpp @@ -1,6 +1,6 @@ #include -#include +#include "dis6/VariableDatum.h" using namespace DIS; @@ -8,7 +8,7 @@ VariableDatum::VariableDatum() : _variableDatumID(0), _variableDatumLength(0), _variableDatums(static_cast(STATIC_ARRAY_LENGTH), - char(0)), // can (theoretically) throw + static_cast(0)), // can (theoretically) throw _arrayLength(0) {} VariableDatum::~VariableDatum() { @@ -56,10 +56,10 @@ void VariableDatum::setVariableDatums(const char* x, // datum? if (_variableDatums.size() < length) _variableDatums.resize(length); - for (unsigned int i = 0; i < length; i++) { + for (auto i = 0; i < length; i++) { _variableDatums[i] = x[i]; } - for (unsigned long i = length; i < _variableDatums.size(); i++) { + for (auto i = length; i < _variableDatums.size(); i++) { _variableDatums[i] = 0; } } @@ -68,7 +68,7 @@ void VariableDatum::marshal(DataStream& dataStream) const { dataStream << _variableDatumID; dataStream << _variableDatumLength; - for (unsigned int idx = 0; idx < _arrayLength; idx++) { + for (auto idx = 0; idx < _arrayLength; idx++) { dataStream << _variableDatums[idx]; } } @@ -95,8 +95,7 @@ void VariableDatum::unmarshal(DataStream& dataStream) { // std::cout << (int)_variableDatums[idx] << " "; } // std::cout << std::endl; - for (unsigned long long idx = _arrayLength; idx < _variableDatums.size(); - idx++) { + for (uint64_t idx = _arrayLength; idx < _variableDatums.size(); idx++) { _variableDatums[idx] = 0; } // std::cout << " Created and copied data to new _variableDatums array" << diff --git a/src/dis6/VariableDatum.h b/src/dis6/VariableDatum.h index 8b5df1da..794bc2b8 100644 --- a/src/dis6/VariableDatum.h +++ b/src/dis6/VariableDatum.h @@ -2,8 +2,8 @@ #include -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" // length in bytes for the variable data. This should be a dynamically allocated // array. diff --git a/src/dis6/Vector3Double.cpp b/src/dis6/Vector3Double.cpp index 24d6d22c..7787a7cc 100644 --- a/src/dis6/Vector3Double.cpp +++ b/src/dis6/Vector3Double.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/Vector3Double.h" using namespace DIS; diff --git a/src/dis6/Vector3Double.h b/src/dis6/Vector3Double.h index aed484d0..eefa5a8f 100644 --- a/src/dis6/Vector3Double.h +++ b/src/dis6/Vector3Double.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.34. Three double precision floating point values, x, y, and z diff --git a/src/dis6/Vector3Float.cpp b/src/dis6/Vector3Float.cpp index 4ad36c71..a8abc0a9 100644 --- a/src/dis6/Vector3Float.cpp +++ b/src/dis6/Vector3Float.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/Vector3Float.h" using namespace DIS; diff --git a/src/dis6/Vector3Float.h b/src/dis6/Vector3Float.h index c603ab28..c2fcb857 100644 --- a/src/dis6/Vector3Float.h +++ b/src/dis6/Vector3Float.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.2.33. Three floating point values, x, y, and z diff --git a/src/dis6/VectoringNozzleSystemData.cpp b/src/dis6/VectoringNozzleSystemData.cpp index 8fefa072..0a09e928 100644 --- a/src/dis6/VectoringNozzleSystemData.cpp +++ b/src/dis6/VectoringNozzleSystemData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/VectoringNozzleSystemData.h" using namespace DIS; diff --git a/src/dis6/VectoringNozzleSystemData.h b/src/dis6/VectoringNozzleSystemData.h index 70045d54..fb0ab2c5 100644 --- a/src/dis6/VectoringNozzleSystemData.h +++ b/src/dis6/VectoringNozzleSystemData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Data about a vectoring nozzle system diff --git a/src/dis6/WarfareFamilyPdu.cpp b/src/dis6/WarfareFamilyPdu.cpp index 7aa37326..c9226a08 100644 --- a/src/dis6/WarfareFamilyPdu.cpp +++ b/src/dis6/WarfareFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis6/WarfareFamilyPdu.h" using namespace DIS; diff --git a/src/dis6/WarfareFamilyPdu.h b/src/dis6/WarfareFamilyPdu.h index 556721ae..962579c7 100644 --- a/src/dis6/WarfareFamilyPdu.h +++ b/src/dis6/WarfareFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis6/EntityID.h" +#include "dis6/Pdu.h" +#include "dis6/opendis6_export.h" +#include "dis6/utils/DataStream.h" namespace DIS { // Section 5.3.4. abstract superclass for fire and detonation pdus that have diff --git a/src/dis6/symbolic_names.h b/src/dis6/symbolic_names.h index 0e1b08d4..b117fd0c 100644 --- a/src/dis6/symbolic_names.h +++ b/src/dis6/symbolic_names.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "dis6/EntityID.h" /** * Symbolic names as defined in 5.1.4 @@ -8,11 +8,11 @@ namespace DIS { const unsigned int AGG_HRT_BEAT_TIMER = 30U; // s const unsigned int AGG_RESPONSE_DFLT = 10U; // s -const unsigned short ALL_AGGS = 0xFFFFU; -const unsigned short ALL_APPLIC = 0xFFFFU; -const unsigned short ALL_ENTITIES = 0xFFFFU; -const unsigned short ALL_OBJECTS = 0xFFFFU; -const unsigned short ALL_SITES = 0xFFFFU; +const uint16_t ALL_AGGS = 0xFFFFU; +const uint16_t ALL_APPLIC = 0xFFFFU; +const uint16_t ALL_ENTITIES = 0xFFFFU; +const uint16_t ALL_OBJECTS = 0xFFFFU; +const uint16_t ALL_SITES = 0xFFFFU; const unsigned int APPEAR_HRT_BEAT_TIMER = 60U; // se const unsigned int COLLISION_ELASTIC_TO = 5U; // s const unsigned int COLLISION_THRSH_DFLT = 1U; // m/s @@ -23,7 +23,7 @@ const unsigned int EE_AZ_THRSH_DFLT = 1U; // degrees const unsigned int EE_EL_THRSH_DFLT = 1U; // degrees const unsigned int EP_DIMENSION_THRSH_DFLT = 1U; // m -const unsigned short EP_NO_SEQUENCE = 0xFFFFU; +const uint16_t EP_NO_SEQUENCE = 0xFFFFU; const unsigned int EP_POS_THRSH_DFLT = 1U; // m shift const unsigned int EP_STATE_THRSH_DFLT = 10U; //% const unsigned int GD_HRT_BEAT_TIMER = 15U; // min @@ -39,14 +39,14 @@ const unsigned int MINEFIELD_DATA_TIMEOUT_DLFT = 5U; // s const unsigned int MINEFIELD_DFLT = 5U; // s const unsigned int MINEFIELD_RESPONSE_DFLT = 1U; // s -const unsigned short NO_AGG = 0U; -const unsigned short NO_APPLIC = 0U; -const unsigned short NO_ENTITY = 0U; +const uint16_t NO_AGG = 0U; +const uint16_t NO_APPLIC = 0U; +const uint16_t NO_ENTITY = 0U; const unsigned int NO_FIRE_MISSION = 0U; -const unsigned short NO_OBJECT = 0U; -const unsigned short NO_SITE = 0U; +const uint16_t NO_OBJECT = 0U; +const uint16_t NO_SITE = 0U; const unsigned int REPAR_REC_T1_DFLT = 5U; // s const unsigned int REPAR_SUP_T1_DFLT = 12U; // s @@ -54,7 +54,7 @@ const unsigned int REPAR_SUP_T2_DFLT = 12U; // s const unsigned int RESUP_REC_T1_DFLT = 5U; // s const unsigned int RESUP_REC_T2_DFLT = 55U; // s const unsigned int RESUP_SUP_T1_DFLT = 1U; // min -const unsigned short RQST_ASSIGN_ID = 0xFFFEU; +const uint16_t RQST_ASSIGN_ID = 0xFFFEU; const unsigned int SEES_NDA_THRSH_DFLT = 2U; // degrees in the axis of deflection const unsigned int SEES_PS_THRSH_DFLT = @@ -80,8 +80,8 @@ const unsigned int UA_SRPM_ROC_CHANGE_DELTA = const unsigned int UA_STATE_UPDATE_HRT_BEAT_TIMER = 3U; // min /** If you want to have the EntityID constants below, you - * need to add the constructor EntityID(unsigned short,unsigned short,unsigned - * short) and recompile open-dis + * need to add the constructor EntityID(uint16_t,uint16_t,unsigned + * int16_t) and recompile open-dis * */ /* diff --git a/src/dis6/utils/DataStream.cpp b/src/dis6/utils/DataStream.cpp index 7a5bb6b3..f129325b 100644 --- a/src/dis6/utils/DataStream.cpp +++ b/src/dis6/utils/DataStream.cpp @@ -10,7 +10,7 @@ DataStream::DataStream(Endian stream) _write_pos(0), _stream_endian(stream), _machine_endian(LITTLE) { - long one(1); + int32_t one(1); char e = (reinterpret_cast(&one))[0]; if (e == (char)1) { @@ -26,7 +26,7 @@ DataStream::DataStream(const char* buffer, size_t length, Endian stream) _write_pos(0), _stream_endian(stream), _machine_endian(LITTLE) { - long one(1); + int32_t one(1); char e = (reinterpret_cast(&one))[0]; if (e == (char)1) { @@ -153,22 +153,22 @@ DataStream& DataStream::operator<<(unsigned int d) { return *this; } -DataStream& DataStream::operator<<(long long d) { +DataStream& DataStream::operator<<(int64_t d) { WriteAlgorithm(d); return *this; } -DataStream& DataStream::operator<<(unsigned long long d) { +DataStream& DataStream::operator<<(uint64_t d) { WriteAlgorithm(d); return *this; } -DataStream& DataStream::operator<<(unsigned short d) { +DataStream& DataStream::operator<<(uint16_t d) { WriteAlgorithm(d); return *this; } -DataStream& DataStream::operator<<(short d) { +DataStream& DataStream::operator<<(int16_t d) { WriteAlgorithm(d); return *this; } @@ -204,22 +204,22 @@ DataStream& DataStream::operator>>(unsigned int& d) { return *this; } -DataStream& DataStream::operator>>(long long& d) { +DataStream& DataStream::operator>>(int64_t& d) { ReadAlgorithm(d); return *this; } -DataStream& DataStream::operator>>(unsigned long long& d) { +DataStream& DataStream::operator>>(uint64_t& d) { ReadAlgorithm(d); return *this; } -DataStream& DataStream::operator>>(unsigned short& d) { +DataStream& DataStream::operator>>(uint16_t& d) { ReadAlgorithm(d); return *this; } -DataStream& DataStream::operator>>(short& d) { +DataStream& DataStream::operator>>(int16_t& d) { ReadAlgorithm(d); return *this; } diff --git a/src/dis6/utils/DataStream.h b/src/dis6/utils/DataStream.h index 4d3c6ffe..b9a4f15a 100644 --- a/src/dis6/utils/DataStream.h +++ b/src/dis6/utils/DataStream.h @@ -54,10 +54,10 @@ class OPENDIS6_EXPORT DataStream { DataStream& operator<<(double c); DataStream& operator<<(int c); DataStream& operator<<(unsigned int c); - DataStream& operator<<(long long c); - DataStream& operator<<(unsigned long long c); - DataStream& operator<<(unsigned short c); - DataStream& operator<<(short c); + DataStream& operator<<(int64_t c); + DataStream& operator<<(uint64_t c); + DataStream& operator<<(uint16_t c); + DataStream& operator<<(int16_t c); // read operations DataStream& operator>>(bool& c); @@ -67,10 +67,10 @@ class OPENDIS6_EXPORT DataStream { DataStream& operator>>(double& c); DataStream& operator>>(int& c); DataStream& operator>>(unsigned int& c); - DataStream& operator>>(long long& c); - DataStream& operator>>(unsigned long long& c); - DataStream& operator>>(unsigned short& c); - DataStream& operator>>(short& c); + DataStream& operator>>(int64_t& c); + DataStream& operator>>(uint64_t& c); + DataStream& operator>>(uint16_t& c); + DataStream& operator>>(int16_t& c); Endian GetStreamEndian() const; Endian GetMachineEndian() const; From 5e25186a1d41f80dc10bcee12c8f4c690018eb0b Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Thu, 27 Apr 2023 02:05:46 +0000 Subject: [PATCH 04/22] Fixed build error, converted more primitive types to more modern 'cstdint' types --- src/dis6/AcknowledgePdu.cpp | 4 +- src/dis6/AcknowledgePdu.h | 6 +- src/dis6/AcknowledgeReliablePdu.cpp | 4 +- src/dis6/AcknowledgeReliablePdu.h | 6 +- src/dis6/AcousticBeamData.cpp | 4 +- src/dis6/AcousticBeamData.h | 6 +- src/dis6/AcousticEmitter.cpp | 8 +- src/dis6/AcousticEmitter.h | 12 +-- src/dis6/AcousticEmitterSystem.cpp | 8 +- src/dis6/AcousticEmitterSystem.h | 12 +-- src/dis6/AcousticEmitterSystemData.cpp | 8 +- src/dis6/AcousticEmitterSystemData.h | 10 +- src/dis6/ActionRequestPdu.cpp | 16 ++-- src/dis6/ActionRequestPdu.h | 20 ++-- src/dis6/ActionRequestReliablePdu.cpp | 24 ++--- src/dis6/ActionRequestReliablePdu.h | 32 +++---- src/dis6/ActionResponsePdu.cpp | 16 ++-- src/dis6/ActionResponsePdu.h | 20 ++-- src/dis6/ActionResponseReliablePdu.cpp | 16 ++-- src/dis6/ActionResponseReliablePdu.h | 20 ++-- src/dis6/AggregateMarking.cpp | 6 +- src/dis6/AggregateMarking.h | 6 +- src/dis6/AggregateStatePdu.cpp | 20 ++-- src/dis6/AggregateStatePdu.h | 28 +++--- src/dis6/AggregateType.cpp | 24 ++--- src/dis6/AggregateType.h | 36 +++---- src/dis6/ArealObjectStatePdu.cpp | 8 +- src/dis6/ArealObjectStatePdu.h | 12 +-- src/dis6/ArticulationParameter.cpp | 8 +- src/dis6/ArticulationParameter.h | 12 +-- src/dis6/ClockTime.cpp | 4 +- src/dis6/ClockTime.h | 6 +- src/dis6/CollisionPdu.cpp | 4 +- src/dis6/CollisionPdu.h | 6 +- src/dis6/CommentPdu.cpp | 8 +- src/dis6/CommentPdu.h | 8 +- src/dis6/CommentReliablePdu.cpp | 8 +- src/dis6/CommentReliablePdu.h | 8 +- src/dis6/CreateEntityPdu.cpp | 4 +- src/dis6/CreateEntityPdu.h | 6 +- src/dis6/CreateEntityReliablePdu.cpp | 12 +-- src/dis6/CreateEntityReliablePdu.h | 18 ++-- src/dis6/DataPdu.cpp | 16 ++-- src/dis6/DataPdu.h | 20 ++-- src/dis6/DataQueryPdu.cpp | 16 ++-- src/dis6/DataQueryPdu.h | 20 ++-- src/dis6/DataQueryReliablePdu.cpp | 24 ++--- src/dis6/DataQueryReliablePdu.h | 32 +++---- src/dis6/DataReliablePdu.cpp | 20 ++-- src/dis6/DataReliablePdu.h | 26 ++--- src/dis6/DeadReckoningParameter.cpp | 6 +- src/dis6/DeadReckoningParameter.h | 6 +- src/dis6/DetonationPdu.cpp | 8 +- src/dis6/DetonationPdu.h | 10 +- src/dis6/EightByteChunk.cpp | 2 +- src/dis6/ElectromagneticEmissionBeamData.cpp | 28 +++--- src/dis6/ElectromagneticEmissionBeamData.h | 40 ++++---- .../ElectromagneticEmissionSystemData.cpp | 8 +- src/dis6/ElectromagneticEmissionSystemData.h | 10 +- src/dis6/ElectromagneticEmissionsPdu.cpp | 8 +- src/dis6/ElectromagneticEmissionsPdu.h | 10 +- src/dis6/EmitterSystem.cpp | 8 +- src/dis6/EmitterSystem.h | 12 +-- src/dis6/EntityID.h | 2 +- src/dis6/EntityStatePdu.cpp | 4 +- src/dis6/EntityStatePdu.h | 6 +- src/dis6/EntityStateUpdatePdu.cpp | 4 +- src/dis6/EntityStateUpdatePdu.h | 4 +- src/dis6/EntityType.cpp | 24 ++--- src/dis6/EntityType.h | 36 +++---- src/dis6/Environment.cpp | 24 ++--- src/dis6/Environment.h | 36 +++---- src/dis6/EnvironmentalProcessPdu.cpp | 12 +-- src/dis6/EnvironmentalProcessPdu.h | 16 ++-- src/dis6/EventReportPdu.cpp | 16 ++-- src/dis6/EventReportPdu.h | 20 ++-- src/dis6/EventReportReliablePdu.cpp | 12 +-- src/dis6/EventReportReliablePdu.h | 14 +-- src/dis6/FastEntityStatePdu.cpp | 64 ++++++------- src/dis6/FastEntityStatePdu.h | 88 ++++++++--------- src/dis6/FixedDatum.cpp | 8 +- src/dis6/FixedDatum.h | 12 +-- src/dis6/FourByteChunk.cpp | 2 +- src/dis6/FundamentalParameterDataIff.cpp | 12 +-- src/dis6/FundamentalParameterDataIff.h | 18 ++-- src/dis6/GriddedDataPdu.cpp | 20 ++-- src/dis6/GriddedDataPdu.h | 30 +++--- src/dis6/IffFundamentalData.cpp | 16 ++-- src/dis6/IffFundamentalData.h | 24 ++--- src/dis6/IntercomCommunicationsParameters.cpp | 4 +- src/dis6/IntercomCommunicationsParameters.h | 6 +- src/dis6/IntercomControlPdu.cpp | 32 +++---- src/dis6/IntercomControlPdu.h | 46 ++++----- src/dis6/IntercomSignalPdu.cpp | 4 +- src/dis6/IntercomSignalPdu.h | 6 +- src/dis6/IsGroupOfPdu.cpp | 12 +-- src/dis6/IsGroupOfPdu.h | 16 ++-- src/dis6/LayerHeader.cpp | 8 +- src/dis6/LayerHeader.h | 12 +-- src/dis6/LinearObjectStatePdu.cpp | 8 +- src/dis6/LinearObjectStatePdu.h | 10 +- src/dis6/LinearSegmentParameter.cpp | 8 +- src/dis6/LinearSegmentParameter.h | 12 +-- src/dis6/Marking.cpp | 6 +- src/dis6/Marking.h | 6 +- src/dis6/MinefieldDataPdu.cpp | 32 +++---- src/dis6/MinefieldDataPdu.h | 44 ++++----- src/dis6/MinefieldQueryPdu.cpp | 20 ++-- src/dis6/MinefieldQueryPdu.h | 26 ++--- src/dis6/MinefieldResponseNackPdu.cpp | 8 +- src/dis6/MinefieldResponseNackPdu.h | 10 +- src/dis6/MinefieldStatePdu.cpp | 8 +- src/dis6/MinefieldStatePdu.h | 10 +- src/dis6/ObjectType.cpp | 16 ++-- src/dis6/ObjectType.h | 24 ++--- src/dis6/Pdu.cpp | 20 ++-- src/dis6/Pdu.h | 30 +++--- src/dis6/PointObjectStatePdu.cpp | 12 +-- src/dis6/PointObjectStatePdu.h | 18 ++-- src/dis6/RadioEntityType.cpp | 16 ++-- src/dis6/RadioEntityType.h | 24 ++--- src/dis6/RecordQueryReliablePdu.cpp | 20 ++-- src/dis6/RecordQueryReliablePdu.h | 28 +++--- src/dis6/RecordSet.cpp | 12 +-- src/dis6/RecordSet.h | 18 ++-- src/dis6/RemoveEntityPdu.cpp | 4 +- src/dis6/RemoveEntityPdu.h | 6 +- src/dis6/RemoveEntityReliablePdu.cpp | 12 +-- src/dis6/RemoveEntityReliablePdu.h | 18 ++-- src/dis6/RepairResponsePdu.cpp | 4 +- src/dis6/RepairResponsePdu.h | 6 +- src/dis6/ResupplyOfferPdu.cpp | 4 +- src/dis6/ResupplyOfferPdu.h | 4 +- src/dis6/ResupplyReceivedPdu.cpp | 4 +- src/dis6/ResupplyReceivedPdu.h | 4 +- src/dis6/ServiceRequestPdu.cpp | 8 +- src/dis6/ServiceRequestPdu.h | 10 +- src/dis6/SetDataPdu.cpp | 16 ++-- src/dis6/SetDataPdu.h | 20 ++-- src/dis6/SetDataReliablePdu.cpp | 20 ++-- src/dis6/SetDataReliablePdu.h | 26 ++--- src/dis6/SetRecordReliablePdu.cpp | 16 ++-- src/dis6/SetRecordReliablePdu.h | 22 ++--- src/dis6/SignalPdu.cpp | 4 +- src/dis6/SignalPdu.h | 6 +- src/dis6/SixByteChunk.cpp | 2 +- src/dis6/StartResumePdu.cpp | 4 +- src/dis6/StartResumePdu.h | 6 +- src/dis6/StartResumeReliablePdu.cpp | 12 +-- src/dis6/StartResumeReliablePdu.h | 18 ++-- src/dis6/StopFreezePdu.cpp | 12 +-- src/dis6/StopFreezePdu.h | 18 ++-- src/dis6/StopFreezeReliablePdu.cpp | 20 ++-- src/dis6/StopFreezeReliablePdu.h | 30 +++--- src/dis6/SupplyQuantity.cpp | 4 +- src/dis6/SupplyQuantity.h | 6 +- src/dis6/SystemID.cpp | 8 +- src/dis6/SystemID.h | 12 +-- src/dis6/TrackJamTarget.cpp | 8 +- src/dis6/TrackJamTarget.h | 12 +-- src/dis6/TransferControlRequestPdu.cpp | 16 ++-- src/dis6/TransferControlRequestPdu.h | 22 ++--- src/dis6/TransmitterPdu.cpp | 16 ++-- src/dis6/TransmitterPdu.h | 22 ++--- src/dis6/TwoByteChunk.cpp | 2 +- src/dis6/UaPdu.cpp | 16 ++-- src/dis6/UaPdu.h | 18 ++-- src/dis6/VariableDatum.cpp | 18 ++-- src/dis6/VariableDatum.h | 18 ++-- src/dis6/symbolic_names.h | 94 +++++++++---------- src/dis6/utils/Conversion.cpp | 2 +- src/dis6/utils/Conversion.h | 5 +- src/dis6/utils/DataStream.cpp | 16 ++-- src/dis6/utils/DataStream.h | 10 +- src/dis6/utils/IBufferProcessor.h | 2 +- src/dis6/utils/IPduBank.h | 2 +- src/dis6/utils/IncomingMessage.cpp | 18 ++-- src/dis6/utils/IncomingMessage.h | 18 ++-- src/dis6/utils/Masks.h | 4 +- src/dis6/utils/PDUBank.h | 2 +- src/dis6/utils/PacketFactory.cpp | 4 +- src/dis6/utils/PacketFactory.h | 8 +- src/dis6/utils/StreamUtils.cpp | 10 +- 183 files changed, 1341 insertions(+), 1338 deletions(-) diff --git a/src/dis6/AcknowledgePdu.cpp b/src/dis6/AcknowledgePdu.cpp index 7fd9dd81..84e6a42f 100644 --- a/src/dis6/AcknowledgePdu.cpp +++ b/src/dis6/AcknowledgePdu.cpp @@ -24,9 +24,9 @@ uint16_t AcknowledgePdu::getResponseFlag() const { return _responseFlag; } void AcknowledgePdu::setResponseFlag(uint16_t pX) { _responseFlag = pX; } -unsigned int AcknowledgePdu::getRequestID() const { return _requestID; } +uint32_t AcknowledgePdu::getRequestID() const { return _requestID; } -void AcknowledgePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void AcknowledgePdu::setRequestID(uint32_t pX) { _requestID = pX; } void AcknowledgePdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis6/AcknowledgePdu.h b/src/dis6/AcknowledgePdu.h index d39f91ff..1d1a0c33 100644 --- a/src/dis6/AcknowledgePdu.h +++ b/src/dis6/AcknowledgePdu.h @@ -22,7 +22,7 @@ class OPENDIS6_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { uint16_t _responseFlag; /** Request ID that is unique */ - unsigned int _requestID; + uint32_t _requestID; public: AcknowledgePdu(); @@ -37,8 +37,8 @@ class OPENDIS6_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { uint16_t getResponseFlag() const; void setResponseFlag(uint16_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/AcknowledgeReliablePdu.cpp b/src/dis6/AcknowledgeReliablePdu.cpp index 572917fd..6069fd2e 100644 --- a/src/dis6/AcknowledgeReliablePdu.cpp +++ b/src/dis6/AcknowledgeReliablePdu.cpp @@ -28,9 +28,9 @@ void AcknowledgeReliablePdu::setResponseFlag(uint16_t pX) { _responseFlag = pX; } -unsigned int AcknowledgeReliablePdu::getRequestID() const { return _requestID; } +uint32_t AcknowledgeReliablePdu::getRequestID() const { return _requestID; } -void AcknowledgeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void AcknowledgeReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void AcknowledgeReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis6/AcknowledgeReliablePdu.h b/src/dis6/AcknowledgeReliablePdu.h index 432aaa6d..3515965e 100644 --- a/src/dis6/AcknowledgeReliablePdu.h +++ b/src/dis6/AcknowledgeReliablePdu.h @@ -23,7 +23,7 @@ class OPENDIS6_EXPORT AcknowledgeReliablePdu uint16_t _responseFlag; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: AcknowledgeReliablePdu(); @@ -38,8 +38,8 @@ class OPENDIS6_EXPORT AcknowledgeReliablePdu uint16_t getResponseFlag() const; void setResponseFlag(uint16_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/AcousticBeamData.cpp b/src/dis6/AcousticBeamData.cpp index 6c7b645d..ace917b3 100644 --- a/src/dis6/AcousticBeamData.cpp +++ b/src/dis6/AcousticBeamData.cpp @@ -18,11 +18,11 @@ void AcousticBeamData::setBeamDataLength(uint16_t pX) { _beamDataLength = pX; } -unsigned char AcousticBeamData::getBeamIDNumber() const { +uint8_t AcousticBeamData::getBeamIDNumber() const { return _beamIDNumber; } -void AcousticBeamData::setBeamIDNumber(unsigned char pX) { _beamIDNumber = pX; } +void AcousticBeamData::setBeamIDNumber(uint8_t pX) { _beamIDNumber = pX; } uint16_t AcousticBeamData::getPad2() const { return _pad2; } diff --git a/src/dis6/AcousticBeamData.h b/src/dis6/AcousticBeamData.h index a299fba8..644e9518 100644 --- a/src/dis6/AcousticBeamData.h +++ b/src/dis6/AcousticBeamData.h @@ -18,7 +18,7 @@ class OPENDIS6_EXPORT AcousticBeamData { uint16_t _beamDataLength; /** beamIDNumber */ - unsigned char _beamIDNumber; + uint8_t _beamIDNumber; /** padding */ uint16_t _pad2; @@ -36,8 +36,8 @@ class OPENDIS6_EXPORT AcousticBeamData { uint16_t getBeamDataLength() const; void setBeamDataLength(uint16_t pX); - unsigned char getBeamIDNumber() const; - void setBeamIDNumber(unsigned char pX); + uint8_t getBeamIDNumber() const; + void setBeamIDNumber(uint8_t pX); uint16_t getPad2() const; void setPad2(uint16_t pX); diff --git a/src/dis6/AcousticEmitter.cpp b/src/dis6/AcousticEmitter.cpp index b36693dc..6be2188a 100644 --- a/src/dis6/AcousticEmitter.cpp +++ b/src/dis6/AcousticEmitter.cpp @@ -13,15 +13,15 @@ uint16_t AcousticEmitter::getAcousticName() const { void AcousticEmitter::setAcousticName(uint16_t pX) { _acousticName = pX; } -unsigned char AcousticEmitter::getFunction() const { return _function; } +uint8_t AcousticEmitter::getFunction() const { return _function; } -void AcousticEmitter::setFunction(unsigned char pX) { _function = pX; } +void AcousticEmitter::setFunction(uint8_t pX) { _function = pX; } -unsigned char AcousticEmitter::getAcousticIdNumber() const { +uint8_t AcousticEmitter::getAcousticIdNumber() const { return _acousticIdNumber; } -void AcousticEmitter::setAcousticIdNumber(unsigned char pX) { +void AcousticEmitter::setAcousticIdNumber(uint8_t pX) { _acousticIdNumber = pX; } diff --git a/src/dis6/AcousticEmitter.h b/src/dis6/AcousticEmitter.h index 4bac344b..ae2b878c 100644 --- a/src/dis6/AcousticEmitter.h +++ b/src/dis6/AcousticEmitter.h @@ -17,10 +17,10 @@ class OPENDIS6_EXPORT AcousticEmitter { uint16_t _acousticName; /** The function of the acoustic system */ - unsigned char _function; + uint8_t _function; /** The UA emitter identification number relative to a specific system */ - unsigned char _acousticIdNumber; + uint8_t _acousticIdNumber; public: AcousticEmitter(); @@ -32,11 +32,11 @@ class OPENDIS6_EXPORT AcousticEmitter { uint16_t getAcousticName() const; void setAcousticName(uint16_t pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + uint8_t getFunction() const; + void setFunction(uint8_t pX); - unsigned char getAcousticIdNumber() const; - void setAcousticIdNumber(unsigned char pX); + uint8_t getAcousticIdNumber() const; + void setAcousticIdNumber(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/AcousticEmitterSystem.cpp b/src/dis6/AcousticEmitterSystem.cpp index 104aa2e4..3e3511dc 100644 --- a/src/dis6/AcousticEmitterSystem.cpp +++ b/src/dis6/AcousticEmitterSystem.cpp @@ -15,19 +15,19 @@ void AcousticEmitterSystem::setAcousticName(uint16_t pX) { _acousticName = pX; } -unsigned char AcousticEmitterSystem::getAcousticFunction() const { +uint8_t AcousticEmitterSystem::getAcousticFunction() const { return _acousticFunction; } -void AcousticEmitterSystem::setAcousticFunction(unsigned char pX) { +void AcousticEmitterSystem::setAcousticFunction(uint8_t pX) { _acousticFunction = pX; } -unsigned char AcousticEmitterSystem::getAcousticID() const { +uint8_t AcousticEmitterSystem::getAcousticID() const { return _acousticID; } -void AcousticEmitterSystem::setAcousticID(unsigned char pX) { +void AcousticEmitterSystem::setAcousticID(uint8_t pX) { _acousticID = pX; } diff --git a/src/dis6/AcousticEmitterSystem.h b/src/dis6/AcousticEmitterSystem.h index 4d6a0997..b3e7814a 100644 --- a/src/dis6/AcousticEmitterSystem.h +++ b/src/dis6/AcousticEmitterSystem.h @@ -19,7 +19,7 @@ class OPENDIS6_EXPORT AcousticEmitterSystem { uint16_t _acousticName; /** This field shall describe the function of the acoustic system. */ - unsigned char _acousticFunction; + uint8_t _acousticFunction; /** This field shall specify the UA emitter identification number relative to * a specific system. This field shall be represented by an 8-bit unsigned @@ -27,7 +27,7 @@ class OPENDIS6_EXPORT AcousticEmitterSystem { * entity, even if in some instances two or more of the systems may be * identical UA emitter types. Numbering of systems shall begin with the * value 1. */ - unsigned char _acousticID; + uint8_t _acousticID; public: AcousticEmitterSystem(); @@ -39,11 +39,11 @@ class OPENDIS6_EXPORT AcousticEmitterSystem { uint16_t getAcousticName() const; void setAcousticName(uint16_t pX); - unsigned char getAcousticFunction() const; - void setAcousticFunction(unsigned char pX); + uint8_t getAcousticFunction() const; + void setAcousticFunction(uint8_t pX); - unsigned char getAcousticID() const; - void setAcousticID(unsigned char pX); + uint8_t getAcousticID() const; + void setAcousticID(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/AcousticEmitterSystemData.cpp b/src/dis6/AcousticEmitterSystemData.cpp index 1f762ef6..24faebe4 100644 --- a/src/dis6/AcousticEmitterSystemData.cpp +++ b/src/dis6/AcousticEmitterSystemData.cpp @@ -13,15 +13,15 @@ AcousticEmitterSystemData::~AcousticEmitterSystemData() { _beamRecords.clear(); } -unsigned char AcousticEmitterSystemData::getEmitterSystemDataLength() const { +uint8_t AcousticEmitterSystemData::getEmitterSystemDataLength() const { return _emitterSystemDataLength; } -void AcousticEmitterSystemData::setEmitterSystemDataLength(unsigned char pX) { +void AcousticEmitterSystemData::setEmitterSystemDataLength(uint8_t pX) { _emitterSystemDataLength = pX; } -unsigned char AcousticEmitterSystemData::getNumberOfBeams() const { +uint8_t AcousticEmitterSystemData::getNumberOfBeams() const { return _beamRecords.size(); } @@ -71,7 +71,7 @@ void AcousticEmitterSystemData::setBeamRecords( void AcousticEmitterSystemData::marshal(DataStream& dataStream) const { dataStream << _emitterSystemDataLength; - dataStream << (unsigned char)_beamRecords.size(); + dataStream << (uint8_t)_beamRecords.size(); dataStream << _pad2; _acousticEmitterSystem.marshal(dataStream); _emitterLocation.marshal(dataStream); diff --git a/src/dis6/AcousticEmitterSystemData.h b/src/dis6/AcousticEmitterSystemData.h index 935ed8ab..09fee175 100644 --- a/src/dis6/AcousticEmitterSystemData.h +++ b/src/dis6/AcousticEmitterSystemData.h @@ -20,10 +20,10 @@ namespace DIS { class OPENDIS6_EXPORT AcousticEmitterSystemData { protected: /** Length of emitter system data */ - unsigned char _emitterSystemDataLength; + uint8_t _emitterSystemDataLength; /** Number of beams */ - unsigned char _numberOfBeams; + uint8_t _numberOfBeams; /** padding */ uint16_t _pad2; @@ -46,10 +46,10 @@ class OPENDIS6_EXPORT AcousticEmitterSystemData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getEmitterSystemDataLength() const; - void setEmitterSystemDataLength(unsigned char pX); + uint8_t getEmitterSystemDataLength() const; + void setEmitterSystemDataLength(uint8_t pX); - unsigned char getNumberOfBeams() const; + uint8_t getNumberOfBeams() const; uint16_t getPad2() const; void setPad2(uint16_t pX); diff --git a/src/dis6/ActionRequestPdu.cpp b/src/dis6/ActionRequestPdu.cpp index a634fc49..feaa9db7 100644 --- a/src/dis6/ActionRequestPdu.cpp +++ b/src/dis6/ActionRequestPdu.cpp @@ -16,19 +16,19 @@ ActionRequestPdu::~ActionRequestPdu() { _variableDatums.clear(); } -unsigned int ActionRequestPdu::getRequestID() const { return _requestID; } +uint32_t ActionRequestPdu::getRequestID() const { return _requestID; } -void ActionRequestPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void ActionRequestPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionRequestPdu::getActionID() const { return _actionID; } +uint32_t ActionRequestPdu::getActionID() const { return _actionID; } -void ActionRequestPdu::setActionID(unsigned int pX) { _actionID = pX; } +void ActionRequestPdu::setActionID(uint32_t pX) { _actionID = pX; } -unsigned int ActionRequestPdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionRequestPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int ActionRequestPdu::getNumberOfVariableDatumRecords() const { +uint32_t ActionRequestPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -61,8 +61,8 @@ void ActionRequestPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _actionID; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; diff --git a/src/dis6/ActionRequestPdu.h b/src/dis6/ActionRequestPdu.h index 8c41c6b8..09512c98 100644 --- a/src/dis6/ActionRequestPdu.h +++ b/src/dis6/ActionRequestPdu.h @@ -19,16 +19,16 @@ namespace DIS { class OPENDIS6_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu { protected: /** Request ID that is unique */ - unsigned int _requestID; + uint32_t _requestID; /** identifies the action being requested */ - unsigned int _actionID; + uint32_t _actionID; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -43,15 +43,15 @@ class OPENDIS6_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + uint32_t getActionID() const; + void setActionID(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis6/ActionRequestReliablePdu.cpp b/src/dis6/ActionRequestReliablePdu.cpp index 55e53061..13caaa1e 100644 --- a/src/dis6/ActionRequestReliablePdu.cpp +++ b/src/dis6/ActionRequestReliablePdu.cpp @@ -19,11 +19,11 @@ ActionRequestReliablePdu::~ActionRequestReliablePdu() { _variableDatumRecords.clear(); } -unsigned char ActionRequestReliablePdu::getRequiredReliabilityService() const { +uint8_t ActionRequestReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void ActionRequestReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void ActionRequestReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -31,27 +31,27 @@ uint16_t ActionRequestReliablePdu::getPad1() const { return _pad1; } void ActionRequestReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char ActionRequestReliablePdu::getPad2() const { return _pad2; } +uint8_t ActionRequestReliablePdu::getPad2() const { return _pad2; } -void ActionRequestReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void ActionRequestReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int ActionRequestReliablePdu::getRequestID() const { +uint32_t ActionRequestReliablePdu::getRequestID() const { return _requestID; } -void ActionRequestReliablePdu::setRequestID(unsigned int pX) { +void ActionRequestReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionRequestReliablePdu::getActionID() const { return _actionID; } +uint32_t ActionRequestReliablePdu::getActionID() const { return _actionID; } -void ActionRequestReliablePdu::setActionID(unsigned int pX) { _actionID = pX; } +void ActionRequestReliablePdu::setActionID(uint32_t pX) { _actionID = pX; } -unsigned int ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -92,8 +92,8 @@ void ActionRequestReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad2; dataStream << _requestID; dataStream << _actionID; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; diff --git a/src/dis6/ActionRequestReliablePdu.h b/src/dis6/ActionRequestReliablePdu.h index 1039887f..6b0dc60e 100644 --- a/src/dis6/ActionRequestReliablePdu.h +++ b/src/dis6/ActionRequestReliablePdu.h @@ -21,25 +21,25 @@ class OPENDIS6_EXPORT ActionRequestReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** request ID */ - unsigned int _actionID; + uint32_t _actionID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -54,24 +54,24 @@ class OPENDIS6_EXPORT ActionRequestReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + uint32_t getActionID() const; + void setActionID(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis6/ActionResponsePdu.cpp b/src/dis6/ActionResponsePdu.cpp index f07455bb..e04944db 100644 --- a/src/dis6/ActionResponsePdu.cpp +++ b/src/dis6/ActionResponsePdu.cpp @@ -16,23 +16,23 @@ ActionResponsePdu::~ActionResponsePdu() { _variableDatums.clear(); } -unsigned int ActionResponsePdu::getRequestID() const { return _requestID; } +uint32_t ActionResponsePdu::getRequestID() const { return _requestID; } -void ActionResponsePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void ActionResponsePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionResponsePdu::getRequestStatus() const { +uint32_t ActionResponsePdu::getRequestStatus() const { return _requestStatus; } -void ActionResponsePdu::setRequestStatus(unsigned int pX) { +void ActionResponsePdu::setRequestStatus(uint32_t pX) { _requestStatus = pX; } -unsigned int ActionResponsePdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionResponsePdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int ActionResponsePdu::getNumberOfVariableDatumRecords() const { +uint32_t ActionResponsePdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -66,8 +66,8 @@ void ActionResponsePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _requestStatus; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; diff --git a/src/dis6/ActionResponsePdu.h b/src/dis6/ActionResponsePdu.h index 3b382a7f..9dcdeab5 100644 --- a/src/dis6/ActionResponsePdu.h +++ b/src/dis6/ActionResponsePdu.h @@ -19,16 +19,16 @@ namespace DIS { class OPENDIS6_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu { protected: /** Request ID that is unique */ - unsigned int _requestID; + uint32_t _requestID; /** Status of response */ - unsigned int _requestStatus; + uint32_t _requestStatus; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -43,15 +43,15 @@ class OPENDIS6_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getRequestStatus() const; - void setRequestStatus(unsigned int pX); + uint32_t getRequestStatus() const; + void setRequestStatus(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis6/ActionResponseReliablePdu.cpp b/src/dis6/ActionResponseReliablePdu.cpp index 2b35ef96..4a51ccfc 100644 --- a/src/dis6/ActionResponseReliablePdu.cpp +++ b/src/dis6/ActionResponseReliablePdu.cpp @@ -16,27 +16,27 @@ ActionResponseReliablePdu::~ActionResponseReliablePdu() { _variableDatumRecords.clear(); } -unsigned int ActionResponseReliablePdu::getRequestID() const { +uint32_t ActionResponseReliablePdu::getRequestID() const { return _requestID; } -void ActionResponseReliablePdu::setRequestID(unsigned int pX) { +void ActionResponseReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionResponseReliablePdu::getResponseStatus() const { +uint32_t ActionResponseReliablePdu::getResponseStatus() const { return _responseStatus; } -void ActionResponseReliablePdu::setResponseStatus(unsigned int pX) { +void ActionResponseReliablePdu::setResponseStatus(uint32_t pX) { _responseStatus = pX; } -unsigned int ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int ActionResponseReliablePdu::getNumberOfVariableDatumRecords() +uint32_t ActionResponseReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -75,8 +75,8 @@ void ActionResponseReliablePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _responseStatus; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; diff --git a/src/dis6/ActionResponseReliablePdu.h b/src/dis6/ActionResponseReliablePdu.h index cdd48744..c05c1955 100644 --- a/src/dis6/ActionResponseReliablePdu.h +++ b/src/dis6/ActionResponseReliablePdu.h @@ -20,16 +20,16 @@ class OPENDIS6_EXPORT ActionResponseReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** status of response */ - unsigned int _responseStatus; + uint32_t _responseStatus; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -44,15 +44,15 @@ class OPENDIS6_EXPORT ActionResponseReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getResponseStatus() const; - void setResponseStatus(unsigned int pX); + uint32_t getResponseStatus() const; + void setResponseStatus(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis6/AggregateMarking.cpp b/src/dis6/AggregateMarking.cpp index 93cb7668..cacf373b 100644 --- a/src/dis6/AggregateMarking.cpp +++ b/src/dis6/AggregateMarking.cpp @@ -11,11 +11,11 @@ AggregateMarking::AggregateMarking() : _characterSet(0) { AggregateMarking::~AggregateMarking() {} -unsigned char AggregateMarking::getCharacterSet() const { +uint8_t AggregateMarking::getCharacterSet() const { return _characterSet; } -void AggregateMarking::setCharacterSet(unsigned char pX) { _characterSet = pX; } +void AggregateMarking::setCharacterSet(uint8_t pX) { _characterSet = pX; } char* AggregateMarking::getCharacters() { return _characters; } @@ -48,7 +48,7 @@ bool AggregateMarking::operator==(const AggregateMarking& rhs) const { if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 31; idx++) { + for (uint8_t idx = 0; idx < 31; idx++) { if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; } diff --git a/src/dis6/AggregateMarking.h b/src/dis6/AggregateMarking.h index 66884a7f..712f6f97 100644 --- a/src/dis6/AggregateMarking.h +++ b/src/dis6/AggregateMarking.h @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS6_EXPORT AggregateMarking { protected: /** The character set */ - unsigned char _characterSet; + uint8_t _characterSet; /** The characters */ char _characters[31]; @@ -27,8 +27,8 @@ class OPENDIS6_EXPORT AggregateMarking { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + uint8_t getCharacterSet() const; + void setCharacterSet(uint8_t pX); char* getCharacters(); const char* getCharacters() const; diff --git a/src/dis6/AggregateStatePdu.cpp b/src/dis6/AggregateStatePdu.cpp index e1d9580f..56748a76 100644 --- a/src/dis6/AggregateStatePdu.cpp +++ b/src/dis6/AggregateStatePdu.cpp @@ -41,15 +41,15 @@ void AggregateStatePdu::setAggregateID(const EntityID& pX) { _aggregateID = pX; } -unsigned char AggregateStatePdu::getForceID() const { return _forceID; } +uint8_t AggregateStatePdu::getForceID() const { return _forceID; } -void AggregateStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void AggregateStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char AggregateStatePdu::getAggregateState() const { +uint8_t AggregateStatePdu::getAggregateState() const { return _aggregateState; } -void AggregateStatePdu::setAggregateState(unsigned char pX) { +void AggregateStatePdu::setAggregateState(uint8_t pX) { _aggregateState = pX; } @@ -63,9 +63,9 @@ void AggregateStatePdu::setAggregateType(const EntityType& pX) { _aggregateType = pX; } -unsigned int AggregateStatePdu::getFormation() const { return _formation; } +uint32_t AggregateStatePdu::getFormation() const { return _formation; } -void AggregateStatePdu::setFormation(unsigned int pX) { _formation = pX; } +void AggregateStatePdu::setFormation(uint32_t pX) { _formation = pX; } AggregateMarking& AggregateStatePdu::getAggregateMarking() { return _aggregateMarking; @@ -155,9 +155,9 @@ void AggregateStatePdu::setEntityIDList(const std::vector& pX) { _entityIDList = pX; } -unsigned char AggregateStatePdu::getPad2() const { return _pad2; } +uint8_t AggregateStatePdu::getPad2() const { return _pad2; } -void AggregateStatePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void AggregateStatePdu::setPad2(uint8_t pX) { _pad2 = pX; } std::vector& AggregateStatePdu::getSilentAggregateSystemList() { return _silentAggregateSystemList; @@ -187,7 +187,7 @@ void AggregateStatePdu::setSilentEntitySystemList( _silentEntitySystemList = pX; } -unsigned int AggregateStatePdu::getNumberOfVariableDatumRecords() const { +uint32_t AggregateStatePdu::getNumberOfVariableDatumRecords() const { return _variableDatumList.size(); } @@ -245,7 +245,7 @@ void AggregateStatePdu::marshal(DataStream& dataStream) const { x.marshal(dataStream); } - dataStream << (unsigned int)_variableDatumList.size(); + dataStream << (uint32_t)_variableDatumList.size(); for (size_t idx = 0; idx < _variableDatumList.size(); idx++) { VariableDatum x = _variableDatumList[idx]; diff --git a/src/dis6/AggregateStatePdu.h b/src/dis6/AggregateStatePdu.h index b9b7c0a2..943beea8 100644 --- a/src/dis6/AggregateStatePdu.h +++ b/src/dis6/AggregateStatePdu.h @@ -32,16 +32,16 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { EntityID _aggregateID; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** state of aggregate */ - unsigned char _aggregateState; + uint8_t _aggregateState; /** entity type of the aggregated entities */ EntityType _aggregateType; /** formation of aggregated entities */ - unsigned int _formation; + uint32_t _formation; /** marking for aggregate; first char is charset type, rest is char data */ AggregateMarking _aggregateMarking; @@ -79,7 +79,7 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { /** ^^^padding to put the start of the next list on a 32 bit boundary. This * needs to be fixed */ - unsigned char _pad2; + uint8_t _pad2; /** silent entity types */ std::vector _silentAggregateSystemList; @@ -88,7 +88,7 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { std::vector _silentEntitySystemList; /** number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variableDatums */ std::vector _variableDatumList; @@ -104,18 +104,18 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { const EntityID& getAggregateID() const; void setAggregateID(const EntityID& pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getAggregateState() const; - void setAggregateState(unsigned char pX); + uint8_t getAggregateState() const; + void setAggregateState(uint8_t pX); EntityType& getAggregateType(); const EntityType& getAggregateType() const; void setAggregateType(const EntityType& pX); - unsigned int getFormation() const; - void setFormation(unsigned int pX); + uint32_t getFormation() const; + void setFormation(uint32_t pX); AggregateMarking& getAggregateMarking(); const AggregateMarking& getAggregateMarking() const; @@ -153,8 +153,8 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { const std::vector& getEntityIDList() const; void setEntityIDList(const std::vector& pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); std::vector& getSilentAggregateSystemList(); const std::vector& getSilentAggregateSystemList() const; @@ -164,7 +164,7 @@ class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { const std::vector& getSilentEntitySystemList() const; void setSilentEntitySystemList(const std::vector& pX); - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getVariableDatumList(); const std::vector& getVariableDatumList() const; diff --git a/src/dis6/AggregateType.cpp b/src/dis6/AggregateType.cpp index f78aae3f..1ba16a34 100644 --- a/src/dis6/AggregateType.cpp +++ b/src/dis6/AggregateType.cpp @@ -13,33 +13,33 @@ AggregateType::AggregateType() AggregateType::~AggregateType() {} -unsigned char AggregateType::getAggregateKind() const { return _aggregateKind; } +uint8_t AggregateType::getAggregateKind() const { return _aggregateKind; } -void AggregateType::setAggregateKind(unsigned char pX) { _aggregateKind = pX; } +void AggregateType::setAggregateKind(uint8_t pX) { _aggregateKind = pX; } -unsigned char AggregateType::getDomain() const { return _domain; } +uint8_t AggregateType::getDomain() const { return _domain; } -void AggregateType::setDomain(unsigned char pX) { _domain = pX; } +void AggregateType::setDomain(uint8_t pX) { _domain = pX; } uint16_t AggregateType::getCountry() const { return _country; } void AggregateType::setCountry(uint16_t pX) { _country = pX; } -unsigned char AggregateType::getCategory() const { return _category; } +uint8_t AggregateType::getCategory() const { return _category; } -void AggregateType::setCategory(unsigned char pX) { _category = pX; } +void AggregateType::setCategory(uint8_t pX) { _category = pX; } -unsigned char AggregateType::getSubcategory() const { return _subcategory; } +uint8_t AggregateType::getSubcategory() const { return _subcategory; } -void AggregateType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void AggregateType::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char AggregateType::getSpecific() const { return _specific; } +uint8_t AggregateType::getSpecific() const { return _specific; } -void AggregateType::setSpecific(unsigned char pX) { _specific = pX; } +void AggregateType::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char AggregateType::getExtra() const { return _extra; } +uint8_t AggregateType::getExtra() const { return _extra; } -void AggregateType::setExtra(unsigned char pX) { _extra = pX; } +void AggregateType::setExtra(uint8_t pX) { _extra = pX; } void AggregateType::marshal(DataStream& dataStream) const { dataStream << _aggregateKind; diff --git a/src/dis6/AggregateType.h b/src/dis6/AggregateType.h index 84ecfde8..227ae188 100644 --- a/src/dis6/AggregateType.h +++ b/src/dis6/AggregateType.h @@ -15,24 +15,24 @@ namespace DIS { class OPENDIS6_EXPORT AggregateType { protected: /** Kind of entity */ - unsigned char _aggregateKind; + uint8_t _aggregateKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; public: AggregateType(); @@ -41,26 +41,26 @@ class OPENDIS6_EXPORT AggregateType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getAggregateKind() const; - void setAggregateKind(unsigned char pX); + uint8_t getAggregateKind() const; + void setAggregateKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); uint16_t getCountry() const; void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/ArealObjectStatePdu.cpp b/src/dis6/ArealObjectStatePdu.cpp index 702d0f0b..43bf0242 100644 --- a/src/dis6/ArealObjectStatePdu.cpp +++ b/src/dis6/ArealObjectStatePdu.cpp @@ -45,15 +45,15 @@ void ArealObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } -unsigned char ArealObjectStatePdu::getForceID() const { return _forceID; } +uint8_t ArealObjectStatePdu::getForceID() const { return _forceID; } -void ArealObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void ArealObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char ArealObjectStatePdu::getModifications() const { +uint8_t ArealObjectStatePdu::getModifications() const { return _modifications; } -void ArealObjectStatePdu::setModifications(unsigned char pX) { +void ArealObjectStatePdu::setModifications(uint8_t pX) { _modifications = pX; } diff --git a/src/dis6/ArealObjectStatePdu.h b/src/dis6/ArealObjectStatePdu.h index 613437cc..7c99d1c3 100644 --- a/src/dis6/ArealObjectStatePdu.h +++ b/src/dis6/ArealObjectStatePdu.h @@ -34,10 +34,10 @@ class OPENDIS6_EXPORT ArealObjectStatePdu uint16_t _updateNumber; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** modifications enumeration */ - unsigned char _modifications; + uint8_t _modifications; /** Object type */ EntityType _objectType; @@ -75,11 +75,11 @@ class OPENDIS6_EXPORT ArealObjectStatePdu uint16_t getUpdateNumber() const; void setUpdateNumber(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + uint8_t getModifications() const; + void setModifications(uint8_t pX); EntityType& getObjectType(); const EntityType& getObjectType() const; diff --git a/src/dis6/ArticulationParameter.cpp b/src/dis6/ArticulationParameter.cpp index a38dd523..157446c2 100644 --- a/src/dis6/ArticulationParameter.cpp +++ b/src/dis6/ArticulationParameter.cpp @@ -11,19 +11,19 @@ ArticulationParameter::ArticulationParameter() ArticulationParameter::~ArticulationParameter() {} -unsigned char ArticulationParameter::getParameterTypeDesignator() const { +uint8_t ArticulationParameter::getParameterTypeDesignator() const { return _parameterTypeDesignator; } -void ArticulationParameter::setParameterTypeDesignator(unsigned char pX) { +void ArticulationParameter::setParameterTypeDesignator(uint8_t pX) { _parameterTypeDesignator = pX; } -unsigned char ArticulationParameter::getChangeIndicator() const { +uint8_t ArticulationParameter::getChangeIndicator() const { return _changeIndicator; } -void ArticulationParameter::setChangeIndicator(unsigned char pX) { +void ArticulationParameter::setChangeIndicator(uint8_t pX) { _changeIndicator = pX; } diff --git a/src/dis6/ArticulationParameter.h b/src/dis6/ArticulationParameter.h index ecb96b03..180f74fa 100644 --- a/src/dis6/ArticulationParameter.h +++ b/src/dis6/ArticulationParameter.h @@ -16,9 +16,9 @@ namespace DIS { class OPENDIS6_EXPORT ArticulationParameter { protected: - unsigned char _parameterTypeDesignator; + uint8_t _parameterTypeDesignator; - unsigned char _changeIndicator; + uint8_t _changeIndicator; uint16_t _partAttachedTo; @@ -33,11 +33,11 @@ class OPENDIS6_EXPORT ArticulationParameter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getParameterTypeDesignator() const; - void setParameterTypeDesignator(unsigned char pX); + uint8_t getParameterTypeDesignator() const; + void setParameterTypeDesignator(uint8_t pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + uint8_t getChangeIndicator() const; + void setChangeIndicator(uint8_t pX); uint16_t getPartAttachedTo() const; void setPartAttachedTo(uint16_t pX); diff --git a/src/dis6/ClockTime.cpp b/src/dis6/ClockTime.cpp index 07292cd6..6a3f5b5a 100644 --- a/src/dis6/ClockTime.cpp +++ b/src/dis6/ClockTime.cpp @@ -10,9 +10,9 @@ int ClockTime::getHour() const { return _hour; } void ClockTime::setHour(int pX) { _hour = pX; } -unsigned int ClockTime::getTimePastHour() const { return _timePastHour; } +uint32_t ClockTime::getTimePastHour() const { return _timePastHour; } -void ClockTime::setTimePastHour(unsigned int pX) { _timePastHour = pX; } +void ClockTime::setTimePastHour(uint32_t pX) { _timePastHour = pX; } void ClockTime::marshal(DataStream& dataStream) const { dataStream << _hour; diff --git a/src/dis6/ClockTime.h b/src/dis6/ClockTime.h index 03c1a39f..a376431a 100644 --- a/src/dis6/ClockTime.h +++ b/src/dis6/ClockTime.h @@ -18,7 +18,7 @@ class OPENDIS6_EXPORT ClockTime { int _hour; /** Time past the hour */ - unsigned int _timePastHour; + uint32_t _timePastHour; public: ClockTime(); @@ -30,8 +30,8 @@ class OPENDIS6_EXPORT ClockTime { int getHour() const; void setHour(int pX); - unsigned int getTimePastHour() const; - void setTimePastHour(unsigned int pX); + uint32_t getTimePastHour() const; + void setTimePastHour(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/CollisionPdu.cpp b/src/dis6/CollisionPdu.cpp index 37e93618..ecc3d640 100644 --- a/src/dis6/CollisionPdu.cpp +++ b/src/dis6/CollisionPdu.cpp @@ -44,9 +44,9 @@ const EventID& CollisionPdu::getEventID() const { return _eventID; } void CollisionPdu::setEventID(const EventID& pX) { _eventID = pX; } -unsigned char CollisionPdu::getCollisionType() const { return _collisionType; } +uint8_t CollisionPdu::getCollisionType() const { return _collisionType; } -void CollisionPdu::setCollisionType(unsigned char pX) { _collisionType = pX; } +void CollisionPdu::setCollisionType(uint8_t pX) { _collisionType = pX; } char CollisionPdu::getPad() const { return _pad; } diff --git a/src/dis6/CollisionPdu.h b/src/dis6/CollisionPdu.h index 0e9e66e2..0fc2913a 100644 --- a/src/dis6/CollisionPdu.h +++ b/src/dis6/CollisionPdu.h @@ -27,7 +27,7 @@ class OPENDIS6_EXPORT CollisionPdu : public EntityInformationFamilyPdu { EventID _eventID; /** ID of event */ - unsigned char _collisionType; + uint8_t _collisionType; /** some padding */ char _pad; @@ -60,8 +60,8 @@ class OPENDIS6_EXPORT CollisionPdu : public EntityInformationFamilyPdu { const EventID& getEventID() const; void setEventID(const EventID& pX); - unsigned char getCollisionType() const; - void setCollisionType(unsigned char pX); + uint8_t getCollisionType() const; + void setCollisionType(uint8_t pX); char getPad() const; void setPad(char pX); diff --git a/src/dis6/CommentPdu.cpp b/src/dis6/CommentPdu.cpp index 92ba1782..10bbc6f3 100644 --- a/src/dis6/CommentPdu.cpp +++ b/src/dis6/CommentPdu.cpp @@ -14,11 +14,11 @@ CommentPdu::~CommentPdu() { _variableDatums.clear(); } -unsigned int CommentPdu::getNumberOfFixedDatumRecords() const { +uint32_t CommentPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int CommentPdu::getNumberOfVariableDatumRecords() const { +uint32_t CommentPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -47,8 +47,8 @@ void CommentPdu::setVariableDatums(const std::vector& pX) { void CommentPdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( dataStream); // Marshal information in superclass first - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; diff --git a/src/dis6/CommentPdu.h b/src/dis6/CommentPdu.h index 97bbd10e..9036ba50 100644 --- a/src/dis6/CommentPdu.h +++ b/src/dis6/CommentPdu.h @@ -20,10 +20,10 @@ namespace DIS { class OPENDIS6_EXPORT CommentPdu : public SimulationManagementFamilyPdu { protected: /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -38,9 +38,9 @@ class OPENDIS6_EXPORT CommentPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis6/CommentReliablePdu.cpp b/src/dis6/CommentReliablePdu.cpp index a8760994..84764418 100644 --- a/src/dis6/CommentReliablePdu.cpp +++ b/src/dis6/CommentReliablePdu.cpp @@ -14,11 +14,11 @@ CommentReliablePdu::~CommentReliablePdu() { _variableDatumRecords.clear(); } -unsigned int CommentReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t CommentReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int CommentReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t CommentReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -53,8 +53,8 @@ void CommentReliablePdu::setVariableDatumRecords( void CommentReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( dataStream); // Marshal information in superclass first - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; diff --git a/src/dis6/CommentReliablePdu.h b/src/dis6/CommentReliablePdu.h index a55e13bc..81c298bc 100644 --- a/src/dis6/CommentReliablePdu.h +++ b/src/dis6/CommentReliablePdu.h @@ -21,10 +21,10 @@ class OPENDIS6_EXPORT CommentReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -39,9 +39,9 @@ class OPENDIS6_EXPORT CommentReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis6/CreateEntityPdu.cpp b/src/dis6/CreateEntityPdu.cpp index 5b0654df..3089c738 100644 --- a/src/dis6/CreateEntityPdu.cpp +++ b/src/dis6/CreateEntityPdu.cpp @@ -9,9 +9,9 @@ CreateEntityPdu::CreateEntityPdu() CreateEntityPdu::~CreateEntityPdu() {} -unsigned int CreateEntityPdu::getRequestID() const { return _requestID; } +uint32_t CreateEntityPdu::getRequestID() const { return _requestID; } -void CreateEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void CreateEntityPdu::setRequestID(uint32_t pX) { _requestID = pX; } void CreateEntityPdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis6/CreateEntityPdu.h b/src/dis6/CreateEntityPdu.h index 16bfb4cc..390c53af 100644 --- a/src/dis6/CreateEntityPdu.h +++ b/src/dis6/CreateEntityPdu.h @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS6_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu { protected: /** Identifier for the request */ - unsigned int _requestID; + uint32_t _requestID; public: CreateEntityPdu(); @@ -24,8 +24,8 @@ class OPENDIS6_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/CreateEntityReliablePdu.cpp b/src/dis6/CreateEntityReliablePdu.cpp index ad4e65bc..c7e02d73 100644 --- a/src/dis6/CreateEntityReliablePdu.cpp +++ b/src/dis6/CreateEntityReliablePdu.cpp @@ -13,11 +13,11 @@ CreateEntityReliablePdu::CreateEntityReliablePdu() CreateEntityReliablePdu::~CreateEntityReliablePdu() {} -unsigned char CreateEntityReliablePdu::getRequiredReliabilityService() const { +uint8_t CreateEntityReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void CreateEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void CreateEntityReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -25,15 +25,15 @@ uint16_t CreateEntityReliablePdu::getPad1() const { return _pad1; } void CreateEntityReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char CreateEntityReliablePdu::getPad2() const { return _pad2; } +uint8_t CreateEntityReliablePdu::getPad2() const { return _pad2; } -void CreateEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void CreateEntityReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int CreateEntityReliablePdu::getRequestID() const { +uint32_t CreateEntityReliablePdu::getRequestID() const { return _requestID; } -void CreateEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void CreateEntityReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void CreateEntityReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis6/CreateEntityReliablePdu.h b/src/dis6/CreateEntityReliablePdu.h index 5fd62768..f811dbd9 100644 --- a/src/dis6/CreateEntityReliablePdu.h +++ b/src/dis6/CreateEntityReliablePdu.h @@ -16,16 +16,16 @@ class OPENDIS6_EXPORT CreateEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: CreateEntityReliablePdu(); @@ -34,17 +34,17 @@ class OPENDIS6_EXPORT CreateEntityReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/DataPdu.cpp b/src/dis6/DataPdu.cpp index 35b253d1..1c5483b4 100644 --- a/src/dis6/DataPdu.cpp +++ b/src/dis6/DataPdu.cpp @@ -16,19 +16,19 @@ DataPdu::~DataPdu() { _variableDatums.clear(); } -unsigned int DataPdu::getRequestID() const { return _requestID; } +uint32_t DataPdu::getRequestID() const { return _requestID; } -void DataPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int DataPdu::getPadding1() const { return _padding1; } +uint32_t DataPdu::getPadding1() const { return _padding1; } -void DataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } +void DataPdu::setPadding1(uint32_t pX) { _padding1 = pX; } -unsigned int DataPdu::getNumberOfFixedDatumRecords() const { +uint32_t DataPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int DataPdu::getNumberOfVariableDatumRecords() const { +uint32_t DataPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -59,8 +59,8 @@ void DataPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _padding1; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; diff --git a/src/dis6/DataPdu.h b/src/dis6/DataPdu.h index b676392c..d89f37cb 100644 --- a/src/dis6/DataPdu.h +++ b/src/dis6/DataPdu.h @@ -20,16 +20,16 @@ namespace DIS { class OPENDIS6_EXPORT DataPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ - unsigned int _requestID; + uint32_t _requestID; /** padding */ - unsigned int _padding1; + uint32_t _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -44,15 +44,15 @@ class OPENDIS6_EXPORT DataPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + uint32_t getPadding1() const; + void setPadding1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis6/DataQueryPdu.cpp b/src/dis6/DataQueryPdu.cpp index 87d05e1d..8702e016 100644 --- a/src/dis6/DataQueryPdu.cpp +++ b/src/dis6/DataQueryPdu.cpp @@ -16,19 +16,19 @@ DataQueryPdu::~DataQueryPdu() { _variableDatums.clear(); } -unsigned int DataQueryPdu::getRequestID() const { return _requestID; } +uint32_t DataQueryPdu::getRequestID() const { return _requestID; } -void DataQueryPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataQueryPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int DataQueryPdu::getTimeInterval() const { return _timeInterval; } +uint32_t DataQueryPdu::getTimeInterval() const { return _timeInterval; } -void DataQueryPdu::setTimeInterval(unsigned int pX) { _timeInterval = pX; } +void DataQueryPdu::setTimeInterval(uint32_t pX) { _timeInterval = pX; } -unsigned int DataQueryPdu::getNumberOfFixedDatumRecords() const { +uint32_t DataQueryPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int DataQueryPdu::getNumberOfVariableDatumRecords() const { +uint32_t DataQueryPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -59,8 +59,8 @@ void DataQueryPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _timeInterval; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; diff --git a/src/dis6/DataQueryPdu.h b/src/dis6/DataQueryPdu.h index 893e630c..04e67b17 100644 --- a/src/dis6/DataQueryPdu.h +++ b/src/dis6/DataQueryPdu.h @@ -19,16 +19,16 @@ namespace DIS { class OPENDIS6_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ - unsigned int _requestID; + uint32_t _requestID; /** time issues between issues of Data PDUs. Zero means send once only. */ - unsigned int _timeInterval; + uint32_t _timeInterval; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -43,15 +43,15 @@ class OPENDIS6_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + uint32_t getTimeInterval() const; + void setTimeInterval(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis6/DataQueryReliablePdu.cpp b/src/dis6/DataQueryReliablePdu.cpp index ba331f6a..3de84934 100644 --- a/src/dis6/DataQueryReliablePdu.cpp +++ b/src/dis6/DataQueryReliablePdu.cpp @@ -19,11 +19,11 @@ DataQueryReliablePdu::~DataQueryReliablePdu() { _variableDatumRecords.clear(); } -unsigned char DataQueryReliablePdu::getRequiredReliabilityService() const { +uint8_t DataQueryReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void DataQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void DataQueryReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -31,27 +31,27 @@ uint16_t DataQueryReliablePdu::getPad1() const { return _pad1; } void DataQueryReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char DataQueryReliablePdu::getPad2() const { return _pad2; } +uint8_t DataQueryReliablePdu::getPad2() const { return _pad2; } -void DataQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void DataQueryReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int DataQueryReliablePdu::getRequestID() const { return _requestID; } +uint32_t DataQueryReliablePdu::getRequestID() const { return _requestID; } -void DataQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataQueryReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int DataQueryReliablePdu::getTimeInterval() const { +uint32_t DataQueryReliablePdu::getTimeInterval() const { return _timeInterval; } -void DataQueryReliablePdu::setTimeInterval(unsigned int pX) { +void DataQueryReliablePdu::setTimeInterval(uint32_t pX) { _timeInterval = pX; } -unsigned int DataQueryReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t DataQueryReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int DataQueryReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t DataQueryReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -91,8 +91,8 @@ void DataQueryReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad2; dataStream << _requestID; dataStream << _timeInterval; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; diff --git a/src/dis6/DataQueryReliablePdu.h b/src/dis6/DataQueryReliablePdu.h index 7f1714c4..72b411ca 100644 --- a/src/dis6/DataQueryReliablePdu.h +++ b/src/dis6/DataQueryReliablePdu.h @@ -20,25 +20,25 @@ class OPENDIS6_EXPORT DataQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** time interval between issuing data query PDUs */ - unsigned int _timeInterval; + uint32_t _timeInterval; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -53,24 +53,24 @@ class OPENDIS6_EXPORT DataQueryReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + uint32_t getTimeInterval() const; + void setTimeInterval(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis6/DataReliablePdu.cpp b/src/dis6/DataReliablePdu.cpp index 7dc4be25..b8954e49 100644 --- a/src/dis6/DataReliablePdu.cpp +++ b/src/dis6/DataReliablePdu.cpp @@ -18,15 +18,15 @@ DataReliablePdu::~DataReliablePdu() { _variableDatumRecords.clear(); } -unsigned int DataReliablePdu::getRequestID() const { return _requestID; } +uint32_t DataReliablePdu::getRequestID() const { return _requestID; } -void DataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned char DataReliablePdu::getRequiredReliabilityService() const { +uint8_t DataReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void DataReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void DataReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -34,15 +34,15 @@ uint16_t DataReliablePdu::getPad1() const { return _pad1; } void DataReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char DataReliablePdu::getPad2() const { return _pad2; } +uint8_t DataReliablePdu::getPad2() const { return _pad2; } -void DataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void DataReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int DataReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t DataReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int DataReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t DataReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -79,8 +79,8 @@ void DataReliablePdu::marshal(DataStream& dataStream) const { dataStream << _requiredReliabilityService; dataStream << _pad1; dataStream << _pad2; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; diff --git a/src/dis6/DataReliablePdu.h b/src/dis6/DataReliablePdu.h index fb29dc60..095b6d7f 100644 --- a/src/dis6/DataReliablePdu.h +++ b/src/dis6/DataReliablePdu.h @@ -21,22 +21,22 @@ class OPENDIS6_EXPORT DataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -51,21 +51,21 @@ class OPENDIS6_EXPORT DataReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis6/DeadReckoningParameter.cpp b/src/dis6/DeadReckoningParameter.cpp index 282171f7..2b5c5f5e 100644 --- a/src/dis6/DeadReckoningParameter.cpp +++ b/src/dis6/DeadReckoningParameter.cpp @@ -15,11 +15,11 @@ DeadReckoningParameter::DeadReckoningParameter() DeadReckoningParameter::~DeadReckoningParameter() {} -unsigned char DeadReckoningParameter::getDeadReckoningAlgorithm() const { +uint8_t DeadReckoningParameter::getDeadReckoningAlgorithm() const { return _deadReckoningAlgorithm; } -void DeadReckoningParameter::setDeadReckoningAlgorithm(unsigned char pX) { +void DeadReckoningParameter::setDeadReckoningAlgorithm(uint8_t pX) { _deadReckoningAlgorithm = pX; } @@ -90,7 +90,7 @@ bool DeadReckoningParameter::operator==( if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 15; idx++) { + for (uint8_t idx = 0; idx < 15; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis6/DeadReckoningParameter.h b/src/dis6/DeadReckoningParameter.h index 412100c1..797fc880 100644 --- a/src/dis6/DeadReckoningParameter.h +++ b/src/dis6/DeadReckoningParameter.h @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS6_EXPORT DeadReckoningParameter { protected: /** enumeration of what dead reckoning algorighm to use */ - unsigned char _deadReckoningAlgorithm; + uint8_t _deadReckoningAlgorithm; /** other parameters to use in the dead reckoning algorithm */ char _otherParameters[15]; @@ -33,8 +33,8 @@ class OPENDIS6_EXPORT DeadReckoningParameter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + uint8_t getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(uint8_t pX); char* getOtherParameters(); const char* getOtherParameters() const; diff --git a/src/dis6/DetonationPdu.cpp b/src/dis6/DetonationPdu.cpp index 91f8ec89..7e11c161 100644 --- a/src/dis6/DetonationPdu.cpp +++ b/src/dis6/DetonationPdu.cpp @@ -72,15 +72,15 @@ void DetonationPdu::setLocationInEntityCoordinates(const Vector3Float& pX) { _locationInEntityCoordinates = pX; } -unsigned char DetonationPdu::getDetonationResult() const { +uint8_t DetonationPdu::getDetonationResult() const { return _detonationResult; } -void DetonationPdu::setDetonationResult(unsigned char pX) { +void DetonationPdu::setDetonationResult(uint8_t pX) { _detonationResult = pX; } -unsigned char DetonationPdu::getNumberOfArticulationParameters() const { +uint8_t DetonationPdu::getNumberOfArticulationParameters() const { return _articulationParameters.size(); } @@ -112,7 +112,7 @@ void DetonationPdu::marshal(DataStream& dataStream) const { _burstDescriptor.marshal(dataStream); _locationInEntityCoordinates.marshal(dataStream); dataStream << _detonationResult; - dataStream << (unsigned char)_articulationParameters.size(); + dataStream << (uint8_t)_articulationParameters.size(); dataStream << _pad; for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { diff --git a/src/dis6/DetonationPdu.h b/src/dis6/DetonationPdu.h index 25cb1b6c..4f437911 100644 --- a/src/dis6/DetonationPdu.h +++ b/src/dis6/DetonationPdu.h @@ -42,10 +42,10 @@ class OPENDIS6_EXPORT DetonationPdu : public WarfareFamilyPdu { Vector3Float _locationInEntityCoordinates; /** result of the explosion */ - unsigned char _detonationResult; + uint8_t _detonationResult; /** How many articulation parameters we have */ - unsigned char _numberOfArticulationParameters; + uint8_t _numberOfArticulationParameters; /** padding */ int16_t _pad; @@ -83,10 +83,10 @@ class OPENDIS6_EXPORT DetonationPdu : public WarfareFamilyPdu { const Vector3Float& getLocationInEntityCoordinates() const; void setLocationInEntityCoordinates(const Vector3Float& pX); - unsigned char getDetonationResult() const; - void setDetonationResult(unsigned char pX); + uint8_t getDetonationResult() const; + void setDetonationResult(uint8_t pX); - unsigned char getNumberOfArticulationParameters() const; + uint8_t getNumberOfArticulationParameters() const; int16_t getPad() const; void setPad(int16_t pX); diff --git a/src/dis6/EightByteChunk.cpp b/src/dis6/EightByteChunk.cpp index 0334ab2c..ebf634f7 100644 --- a/src/dis6/EightByteChunk.cpp +++ b/src/dis6/EightByteChunk.cpp @@ -39,7 +39,7 @@ void EightByteChunk::unmarshal(DataStream& dataStream) { bool EightByteChunk::operator==(const EightByteChunk& rhs) const { bool ivarsEqual = true; - for (unsigned char idx = 0; idx < 8; idx++) { + for (uint8_t idx = 0; idx < 8; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis6/ElectromagneticEmissionBeamData.cpp b/src/dis6/ElectromagneticEmissionBeamData.cpp index 327ec8ae..991e1813 100644 --- a/src/dis6/ElectromagneticEmissionBeamData.cpp +++ b/src/dis6/ElectromagneticEmissionBeamData.cpp @@ -17,19 +17,19 @@ ElectromagneticEmissionBeamData::~ElectromagneticEmissionBeamData() { _trackJamTargets.clear(); } -unsigned char ElectromagneticEmissionBeamData::getBeamDataLength() const { +uint8_t ElectromagneticEmissionBeamData::getBeamDataLength() const { return _beamDataLength; } -void ElectromagneticEmissionBeamData::setBeamDataLength(unsigned char pX) { +void ElectromagneticEmissionBeamData::setBeamDataLength(uint8_t pX) { _beamDataLength = pX; } -unsigned char ElectromagneticEmissionBeamData::getBeamIDNumber() const { +uint8_t ElectromagneticEmissionBeamData::getBeamIDNumber() const { return _beamIDNumber; } -void ElectromagneticEmissionBeamData::setBeamIDNumber(unsigned char pX) { +void ElectromagneticEmissionBeamData::setBeamIDNumber(uint8_t pX) { _beamIDNumber = pX; } @@ -56,36 +56,36 @@ void ElectromagneticEmissionBeamData::setFundamentalParameterData( _fundamentalParameterData = pX; } -unsigned char ElectromagneticEmissionBeamData::getBeamFunction() const { +uint8_t ElectromagneticEmissionBeamData::getBeamFunction() const { return _beamFunction; } -void ElectromagneticEmissionBeamData::setBeamFunction(unsigned char pX) { +void ElectromagneticEmissionBeamData::setBeamFunction(uint8_t pX) { _beamFunction = pX; } -unsigned char ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() +uint8_t ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() const { return _trackJamTargets.size(); } -unsigned char ElectromagneticEmissionBeamData::getHighDensityTrackJam() const { +uint8_t ElectromagneticEmissionBeamData::getHighDensityTrackJam() const { return _highDensityTrackJam; } -void ElectromagneticEmissionBeamData::setHighDensityTrackJam(unsigned char pX) { +void ElectromagneticEmissionBeamData::setHighDensityTrackJam(uint8_t pX) { _highDensityTrackJam = pX; } -unsigned char ElectromagneticEmissionBeamData::getPad4() const { return _pad4; } +uint8_t ElectromagneticEmissionBeamData::getPad4() const { return _pad4; } -void ElectromagneticEmissionBeamData::setPad4(unsigned char pX) { _pad4 = pX; } +void ElectromagneticEmissionBeamData::setPad4(uint8_t pX) { _pad4 = pX; } -unsigned int ElectromagneticEmissionBeamData::getJammingModeSequence() const { +uint32_t ElectromagneticEmissionBeamData::getJammingModeSequence() const { return _jammingModeSequence; } -void ElectromagneticEmissionBeamData::setJammingModeSequence(unsigned int pX) { +void ElectromagneticEmissionBeamData::setJammingModeSequence(uint32_t pX) { _jammingModeSequence = pX; } @@ -110,7 +110,7 @@ void ElectromagneticEmissionBeamData::marshal(DataStream& dataStream) const { dataStream << _beamParameterIndex; _fundamentalParameterData.marshal(dataStream); dataStream << _beamFunction; - dataStream << (unsigned char)_trackJamTargets.size(); + dataStream << (uint8_t)_trackJamTargets.size(); dataStream << _highDensityTrackJam; dataStream << _pad4; dataStream << _jammingModeSequence; diff --git a/src/dis6/ElectromagneticEmissionBeamData.h b/src/dis6/ElectromagneticEmissionBeamData.h index 073f4ef3..e0358f57 100644 --- a/src/dis6/ElectromagneticEmissionBeamData.h +++ b/src/dis6/ElectromagneticEmissionBeamData.h @@ -18,12 +18,12 @@ namespace DIS { class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { protected: /** This field shall specify the length of this beams data in 32 bit words */ - unsigned char _beamDataLength; + uint8_t _beamDataLength; /** This field shall specify a unique emitter database number assigned to * differentiate between otherwise similar or identical emitter beams within * an emitter system. */ - unsigned char _beamIDNumber; + uint8_t _beamIDNumber; /** This field shall specify a Beam Parameter Index number that shall be used * by receiving entities in conjunction with the Emitter Name field to provide @@ -35,20 +35,20 @@ class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { FundamentalParameterData _fundamentalParameterData; /** beam function of a particular beam */ - unsigned char _beamFunction; + uint8_t _beamFunction; /** Number of track/jam targets */ - unsigned char _numberOfTrackJamTargets; + uint8_t _numberOfTrackJamTargets; /** wheher or not the receiving simulation apps can assume all the targets in * the scan pattern are being tracked/jammed */ - unsigned char _highDensityTrackJam; + uint8_t _highDensityTrackJam; /** padding */ - unsigned char _pad4; + uint8_t _pad4; /** identify jamming techniques used */ - unsigned int _jammingModeSequence; + uint32_t _jammingModeSequence; /** variable length list of track/jam targets */ std::vector _trackJamTargets; @@ -60,11 +60,11 @@ class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getBeamDataLength() const; - void setBeamDataLength(unsigned char pX); + uint8_t getBeamDataLength() const; + void setBeamDataLength(uint8_t pX); - unsigned char getBeamIDNumber() const; - void setBeamIDNumber(unsigned char pX); + uint8_t getBeamIDNumber() const; + void setBeamIDNumber(uint8_t pX); uint16_t getBeamParameterIndex() const; void setBeamParameterIndex(uint16_t pX); @@ -73,19 +73,19 @@ class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { const FundamentalParameterData& getFundamentalParameterData() const; void setFundamentalParameterData(const FundamentalParameterData& pX); - unsigned char getBeamFunction() const; - void setBeamFunction(unsigned char pX); + uint8_t getBeamFunction() const; + void setBeamFunction(uint8_t pX); - unsigned char getNumberOfTrackJamTargets() const; + uint8_t getNumberOfTrackJamTargets() const; - unsigned char getHighDensityTrackJam() const; - void setHighDensityTrackJam(unsigned char pX); + uint8_t getHighDensityTrackJam() const; + void setHighDensityTrackJam(uint8_t pX); - unsigned char getPad4() const; - void setPad4(unsigned char pX); + uint8_t getPad4() const; + void setPad4(uint8_t pX); - unsigned int getJammingModeSequence() const; - void setJammingModeSequence(unsigned int pX); + uint32_t getJammingModeSequence() const; + void setJammingModeSequence(uint32_t pX); std::vector& getTrackJamTargets(); const std::vector& getTrackJamTargets() const; diff --git a/src/dis6/ElectromagneticEmissionSystemData.cpp b/src/dis6/ElectromagneticEmissionSystemData.cpp index 4e8dac89..d11e612f 100644 --- a/src/dis6/ElectromagneticEmissionSystemData.cpp +++ b/src/dis6/ElectromagneticEmissionSystemData.cpp @@ -13,15 +13,15 @@ ElectromagneticEmissionSystemData::~ElectromagneticEmissionSystemData() { _beamDataRecords.clear(); } -unsigned char ElectromagneticEmissionSystemData::getSystemDataLength() const { +uint8_t ElectromagneticEmissionSystemData::getSystemDataLength() const { return _systemDataLength; } -void ElectromagneticEmissionSystemData::setSystemDataLength(unsigned char pX) { +void ElectromagneticEmissionSystemData::setSystemDataLength(uint8_t pX) { _systemDataLength = pX; } -unsigned char ElectromagneticEmissionSystemData::getNumberOfBeams() const { +uint8_t ElectromagneticEmissionSystemData::getNumberOfBeams() const { return _beamDataRecords.size(); } @@ -77,7 +77,7 @@ void ElectromagneticEmissionSystemData::setBeamDataRecords( void ElectromagneticEmissionSystemData::marshal(DataStream& dataStream) const { dataStream << _systemDataLength; - dataStream << (unsigned char)_beamDataRecords.size(); + dataStream << (uint8_t)_beamDataRecords.size(); dataStream << _emissionsPadding2; _emitterSystem.marshal(dataStream); _location.marshal(dataStream); diff --git a/src/dis6/ElectromagneticEmissionSystemData.h b/src/dis6/ElectromagneticEmissionSystemData.h index ad576cb4..bd821dc6 100644 --- a/src/dis6/ElectromagneticEmissionSystemData.h +++ b/src/dis6/ElectromagneticEmissionSystemData.h @@ -21,11 +21,11 @@ class OPENDIS6_EXPORT ElectromagneticEmissionSystemData { /** This field shall specify the length of this emitter system�s data * (including beam data and its track/jam information) in 32-bit words. The * length shall include the System Data Length field. */ - unsigned char _systemDataLength; + uint8_t _systemDataLength; /** This field shall specify the number of beams being described in the * current PDU for the system being described. */ - unsigned char _numberOfBeams; + uint8_t _numberOfBeams; /** padding. */ uint16_t _emissionsPadding2; @@ -46,10 +46,10 @@ class OPENDIS6_EXPORT ElectromagneticEmissionSystemData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getSystemDataLength() const; - void setSystemDataLength(unsigned char pX); + uint8_t getSystemDataLength() const; + void setSystemDataLength(uint8_t pX); - unsigned char getNumberOfBeams() const; + uint8_t getNumberOfBeams() const; uint16_t getEmissionsPadding2() const; void setEmissionsPadding2(uint16_t pX); diff --git a/src/dis6/ElectromagneticEmissionsPdu.cpp b/src/dis6/ElectromagneticEmissionsPdu.cpp index 49427076..304cd974 100644 --- a/src/dis6/ElectromagneticEmissionsPdu.cpp +++ b/src/dis6/ElectromagneticEmissionsPdu.cpp @@ -39,15 +39,15 @@ void ElectromagneticEmissionsPdu::setEventID(const EventID& pX) { _eventID = pX; } -unsigned char ElectromagneticEmissionsPdu::getStateUpdateIndicator() const { +uint8_t ElectromagneticEmissionsPdu::getStateUpdateIndicator() const { return _stateUpdateIndicator; } -void ElectromagneticEmissionsPdu::setStateUpdateIndicator(unsigned char pX) { +void ElectromagneticEmissionsPdu::setStateUpdateIndicator(uint8_t pX) { _stateUpdateIndicator = pX; } -unsigned char ElectromagneticEmissionsPdu::getNumberOfSystems() const { +uint8_t ElectromagneticEmissionsPdu::getNumberOfSystems() const { return _systems.size(); } @@ -80,7 +80,7 @@ void ElectromagneticEmissionsPdu::marshal(DataStream& dataStream) const { _emittingEntityID.marshal(dataStream); _eventID.marshal(dataStream); dataStream << _stateUpdateIndicator; - dataStream << (unsigned char)_systems.size(); + dataStream << (uint8_t)_systems.size(); dataStream << _paddingForEmissionsPdu; for (size_t idx = 0; idx < _systems.size(); idx++) { diff --git a/src/dis6/ElectromagneticEmissionsPdu.h b/src/dis6/ElectromagneticEmissionsPdu.h index 68c6a7bb..c1618676 100644 --- a/src/dis6/ElectromagneticEmissionsPdu.h +++ b/src/dis6/ElectromagneticEmissionsPdu.h @@ -32,11 +32,11 @@ class OPENDIS6_EXPORT ElectromagneticEmissionsPdu * state update or just data that has changed since issuance of the last * Electromagnetic Emission PDU [relative to the identified entity and * emission system(s)]. */ - unsigned char _stateUpdateIndicator; + uint8_t _stateUpdateIndicator; /** This field shall specify the number of emission systems being described in * the current PDU. */ - unsigned char _numberOfSystems; + uint8_t _numberOfSystems; /** padding */ uint16_t _paddingForEmissionsPdu; @@ -59,10 +59,10 @@ class OPENDIS6_EXPORT ElectromagneticEmissionsPdu const EventID& getEventID() const; void setEventID(const EventID& pX); - unsigned char getStateUpdateIndicator() const; - void setStateUpdateIndicator(unsigned char pX); + uint8_t getStateUpdateIndicator() const; + void setStateUpdateIndicator(uint8_t pX); - unsigned char getNumberOfSystems() const; + uint8_t getNumberOfSystems() const; uint16_t getPaddingForEmissionsPdu() const; void setPaddingForEmissionsPdu(uint16_t pX); diff --git a/src/dis6/EmitterSystem.cpp b/src/dis6/EmitterSystem.cpp index b81f0822..777c5165 100644 --- a/src/dis6/EmitterSystem.cpp +++ b/src/dis6/EmitterSystem.cpp @@ -11,15 +11,15 @@ uint16_t EmitterSystem::getEmitterName() const { return _emitterName; } void EmitterSystem::setEmitterName(uint16_t pX) { _emitterName = pX; } -unsigned char EmitterSystem::getFunction() const { return _function; } +uint8_t EmitterSystem::getFunction() const { return _function; } -void EmitterSystem::setFunction(unsigned char pX) { _function = pX; } +void EmitterSystem::setFunction(uint8_t pX) { _function = pX; } -unsigned char EmitterSystem::getEmitterIdNumber() const { +uint8_t EmitterSystem::getEmitterIdNumber() const { return _emitterIdNumber; } -void EmitterSystem::setEmitterIdNumber(unsigned char pX) { +void EmitterSystem::setEmitterIdNumber(uint8_t pX) { _emitterIdNumber = pX; } diff --git a/src/dis6/EmitterSystem.h b/src/dis6/EmitterSystem.h index 286c467a..cd0d8142 100644 --- a/src/dis6/EmitterSystem.h +++ b/src/dis6/EmitterSystem.h @@ -18,10 +18,10 @@ class OPENDIS6_EXPORT EmitterSystem { uint16_t _emitterName; /** function of the emitter, 8 bit enumeration */ - unsigned char _function; + uint8_t _function; /** emitter ID, 8 bit enumeration */ - unsigned char _emitterIdNumber; + uint8_t _emitterIdNumber; public: EmitterSystem(); @@ -33,11 +33,11 @@ class OPENDIS6_EXPORT EmitterSystem { uint16_t getEmitterName() const; void setEmitterName(uint16_t pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + uint8_t getFunction() const; + void setFunction(uint8_t pX); - unsigned char getEmitterIdNumber() const; - void setEmitterIdNumber(unsigned char pX); + uint8_t getEmitterIdNumber() const; + void setEmitterIdNumber(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/EntityID.h b/src/dis6/EntityID.h index 2c9a1983..9b08abc8 100644 --- a/src/dis6/EntityID.h +++ b/src/dis6/EntityID.h @@ -11,7 +11,7 @@ namespace DIS { // exhausted. No entity shall have an entity identifier number of NO_ENTITY, // ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden- tifier number need not be // registered or retained for future exercises. The entity identifier number -// shall be specified by a 16-bit unsigned integer. An entity identifier +// shall be specified by a 16-bit uint32_teger. An entity identifier // number equal to zero with valid site and application identification shall // address a simulation application. An entity identifier number equal to // ALL_ENTITIES shall mean all entities within the specified site and diff --git a/src/dis6/EntityStatePdu.cpp b/src/dis6/EntityStatePdu.cpp index 3dec7744..9b4974f3 100644 --- a/src/dis6/EntityStatePdu.cpp +++ b/src/dis6/EntityStatePdu.cpp @@ -27,9 +27,9 @@ const EntityID& EntityStatePdu::getEntityID() const { return _entityID; } void EntityStatePdu::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned char EntityStatePdu::getForceId() const { return _forceId; } +uint8_t EntityStatePdu::getForceId() const { return _forceId; } -void EntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } +void EntityStatePdu::setForceId(uint8_t pX) { _forceId = pX; } char EntityStatePdu::getNumberOfArticulationParameters() const { return _articulationParameters.size(); diff --git a/src/dis6/EntityStatePdu.h b/src/dis6/EntityStatePdu.h index 4b8bef8b..50d90acc 100644 --- a/src/dis6/EntityStatePdu.h +++ b/src/dis6/EntityStatePdu.h @@ -29,7 +29,7 @@ class OPENDIS6_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { EntityID _entityID; /** What force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + uint8_t _forceId; /** How many articulation parameters are in the variable length list */ char _numberOfArticulationParameters; @@ -76,8 +76,8 @@ class OPENDIS6_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { const EntityID& getEntityID() const; void setEntityID(const EntityID& pX); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + uint8_t getForceId() const; + void setForceId(uint8_t pX); char getNumberOfArticulationParameters() const; diff --git a/src/dis6/EntityStateUpdatePdu.cpp b/src/dis6/EntityStateUpdatePdu.cpp index f86fe4db..c050777d 100644 --- a/src/dis6/EntityStateUpdatePdu.cpp +++ b/src/dis6/EntityStateUpdatePdu.cpp @@ -29,7 +29,7 @@ char EntityStateUpdatePdu::getPadding1() const { return _padding1; } void EntityStateUpdatePdu::setPadding1(char pX) { _padding1 = pX; } -unsigned char EntityStateUpdatePdu::getNumberOfArticulationParameters() const { +uint8_t EntityStateUpdatePdu::getNumberOfArticulationParameters() const { return _articulationParameters.size(); } @@ -97,7 +97,7 @@ void EntityStateUpdatePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _entityID.marshal(dataStream); dataStream << _padding1; - dataStream << (unsigned char)_articulationParameters.size(); + dataStream << (uint8_t)_articulationParameters.size(); _entityLinearVelocity.marshal(dataStream); _entityLocation.marshal(dataStream); _entityOrientation.marshal(dataStream); diff --git a/src/dis6/EntityStateUpdatePdu.h b/src/dis6/EntityStateUpdatePdu.h index 65a6b532..f70e6002 100644 --- a/src/dis6/EntityStateUpdatePdu.h +++ b/src/dis6/EntityStateUpdatePdu.h @@ -29,7 +29,7 @@ class OPENDIS6_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { char _padding1; /** How many articulation parameters are in the variable length list */ - unsigned char _numberOfArticulationParameters; + uint8_t _numberOfArticulationParameters; /** Describes the speed of the entity in the world */ Vector3Float _entityLinearVelocity; @@ -60,7 +60,7 @@ class OPENDIS6_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { char getPadding1() const; void setPadding1(char pX); - unsigned char getNumberOfArticulationParameters() const; + uint8_t getNumberOfArticulationParameters() const; Vector3Float& getEntityLinearVelocity(); const Vector3Float& getEntityLinearVelocity() const; diff --git a/src/dis6/EntityType.cpp b/src/dis6/EntityType.cpp index 99e88480..9fd67152 100644 --- a/src/dis6/EntityType.cpp +++ b/src/dis6/EntityType.cpp @@ -13,33 +13,33 @@ EntityType::EntityType() EntityType::~EntityType() {} -unsigned char EntityType::getEntityKind() const { return _entityKind; } +uint8_t EntityType::getEntityKind() const { return _entityKind; } -void EntityType::setEntityKind(unsigned char pX) { _entityKind = pX; } +void EntityType::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char EntityType::getDomain() const { return _domain; } +uint8_t EntityType::getDomain() const { return _domain; } -void EntityType::setDomain(unsigned char pX) { _domain = pX; } +void EntityType::setDomain(uint8_t pX) { _domain = pX; } uint16_t EntityType::getCountry() const { return _country; } void EntityType::setCountry(uint16_t pX) { _country = pX; } -unsigned char EntityType::getCategory() const { return _category; } +uint8_t EntityType::getCategory() const { return _category; } -void EntityType::setCategory(unsigned char pX) { _category = pX; } +void EntityType::setCategory(uint8_t pX) { _category = pX; } -unsigned char EntityType::getSubcategory() const { return _subcategory; } +uint8_t EntityType::getSubcategory() const { return _subcategory; } -void EntityType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void EntityType::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char EntityType::getSpecific() const { return _specific; } +uint8_t EntityType::getSpecific() const { return _specific; } -void EntityType::setSpecific(unsigned char pX) { _specific = pX; } +void EntityType::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char EntityType::getExtra() const { return _extra; } +uint8_t EntityType::getExtra() const { return _extra; } -void EntityType::setExtra(unsigned char pX) { _extra = pX; } +void EntityType::setExtra(uint8_t pX) { _extra = pX; } void EntityType::marshal(DataStream& dataStream) const { dataStream << _entityKind; diff --git a/src/dis6/EntityType.h b/src/dis6/EntityType.h index 277f37d8..1db7bd20 100644 --- a/src/dis6/EntityType.h +++ b/src/dis6/EntityType.h @@ -15,24 +15,24 @@ namespace DIS { class OPENDIS6_EXPORT EntityType { protected: /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; public: EntityType(); @@ -41,26 +41,26 @@ class OPENDIS6_EXPORT EntityType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); uint16_t getCountry() const; void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/Environment.cpp b/src/dis6/Environment.cpp index 70bcb879..32d11aa8 100644 --- a/src/dis6/Environment.cpp +++ b/src/dis6/Environment.cpp @@ -12,31 +12,31 @@ Environment::Environment() Environment::~Environment() {} -unsigned int Environment::getEnvironmentType() const { +uint32_t Environment::getEnvironmentType() const { return _environmentType; } -void Environment::setEnvironmentType(unsigned int pX) { _environmentType = pX; } +void Environment::setEnvironmentType(uint32_t pX) { _environmentType = pX; } -unsigned char Environment::getLength() const { return _length; } +uint8_t Environment::getLength() const { return _length; } -void Environment::setLength(unsigned char pX) { _length = pX; } +void Environment::setLength(uint8_t pX) { _length = pX; } -unsigned char Environment::getIndex() const { return _index; } +uint8_t Environment::getIndex() const { return _index; } -void Environment::setIndex(unsigned char pX) { _index = pX; } +void Environment::setIndex(uint8_t pX) { _index = pX; } -unsigned char Environment::getPadding1() const { return _padding1; } +uint8_t Environment::getPadding1() const { return _padding1; } -void Environment::setPadding1(unsigned char pX) { _padding1 = pX; } +void Environment::setPadding1(uint8_t pX) { _padding1 = pX; } -unsigned char Environment::getGeometry() const { return _geometry; } +uint8_t Environment::getGeometry() const { return _geometry; } -void Environment::setGeometry(unsigned char pX) { _geometry = pX; } +void Environment::setGeometry(uint8_t pX) { _geometry = pX; } -unsigned char Environment::getPadding2() const { return _padding2; } +uint8_t Environment::getPadding2() const { return _padding2; } -void Environment::setPadding2(unsigned char pX) { _padding2 = pX; } +void Environment::setPadding2(uint8_t pX) { _padding2 = pX; } void Environment::marshal(DataStream& dataStream) const { dataStream << _environmentType; diff --git a/src/dis6/Environment.h b/src/dis6/Environment.h index 1c9abb01..44ee98cf 100644 --- a/src/dis6/Environment.h +++ b/src/dis6/Environment.h @@ -16,22 +16,22 @@ namespace DIS { class OPENDIS6_EXPORT Environment { protected: /** Record type */ - unsigned int _environmentType; + uint32_t _environmentType; /** length, in bits */ - unsigned char _length; + uint8_t _length; /** Identify the sequentially numbered record index */ - unsigned char _index; + uint8_t _index; /** padding */ - unsigned char _padding1; + uint8_t _padding1; /** Geometry or state record */ - unsigned char _geometry; + uint8_t _geometry; /** padding to bring the total size up to a 64 bit boundry */ - unsigned char _padding2; + uint8_t _padding2; public: Environment(); @@ -40,23 +40,23 @@ class OPENDIS6_EXPORT Environment { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getEnvironmentType() const; - void setEnvironmentType(unsigned int pX); + uint32_t getEnvironmentType() const; + void setEnvironmentType(uint32_t pX); - unsigned char getLength() const; - void setLength(unsigned char pX); + uint8_t getLength() const; + void setLength(uint8_t pX); - unsigned char getIndex() const; - void setIndex(unsigned char pX); + uint8_t getIndex() const; + void setIndex(uint8_t pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + uint8_t getPadding1() const; + void setPadding1(uint8_t pX); - unsigned char getGeometry() const; - void setGeometry(unsigned char pX); + uint8_t getGeometry() const; + void setGeometry(uint8_t pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + uint8_t getPadding2() const; + void setPadding2(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/EnvironmentalProcessPdu.cpp b/src/dis6/EnvironmentalProcessPdu.cpp index 172059a0..31dadb60 100644 --- a/src/dis6/EnvironmentalProcessPdu.cpp +++ b/src/dis6/EnvironmentalProcessPdu.cpp @@ -41,23 +41,23 @@ void EnvironmentalProcessPdu::setEnvironmentType(const EntityType& pX) { _environmentType = pX; } -unsigned char EnvironmentalProcessPdu::getModelType() const { +uint8_t EnvironmentalProcessPdu::getModelType() const { return _modelType; } -void EnvironmentalProcessPdu::setModelType(unsigned char pX) { +void EnvironmentalProcessPdu::setModelType(uint8_t pX) { _modelType = pX; } -unsigned char EnvironmentalProcessPdu::getEnvironmentStatus() const { +uint8_t EnvironmentalProcessPdu::getEnvironmentStatus() const { return _environmentStatus; } -void EnvironmentalProcessPdu::setEnvironmentStatus(unsigned char pX) { +void EnvironmentalProcessPdu::setEnvironmentStatus(uint8_t pX) { _environmentStatus = pX; } -unsigned char EnvironmentalProcessPdu::getNumberOfEnvironmentRecords() const { +uint8_t EnvironmentalProcessPdu::getNumberOfEnvironmentRecords() const { return _environmentRecords.size(); } @@ -90,7 +90,7 @@ void EnvironmentalProcessPdu::marshal(DataStream& dataStream) const { _environmentType.marshal(dataStream); dataStream << _modelType; dataStream << _environmentStatus; - dataStream << (unsigned char)_environmentRecords.size(); + dataStream << (uint8_t)_environmentRecords.size(); dataStream << _sequenceNumber; for (size_t idx = 0; idx < _environmentRecords.size(); idx++) { diff --git a/src/dis6/EnvironmentalProcessPdu.h b/src/dis6/EnvironmentalProcessPdu.h index 12609932..8c00ef1e 100644 --- a/src/dis6/EnvironmentalProcessPdu.h +++ b/src/dis6/EnvironmentalProcessPdu.h @@ -29,13 +29,13 @@ class OPENDIS6_EXPORT EnvironmentalProcessPdu EntityType _environmentType; /** model type */ - unsigned char _modelType; + uint8_t _modelType; /** Environment status */ - unsigned char _environmentStatus; + uint8_t _environmentStatus; /** number of environment records */ - unsigned char _numberOfEnvironmentRecords; + uint8_t _numberOfEnvironmentRecords; /** PDU sequence number for the environmentla process if pdu sequencing * required */ @@ -59,13 +59,13 @@ class OPENDIS6_EXPORT EnvironmentalProcessPdu const EntityType& getEnvironmentType() const; void setEnvironmentType(const EntityType& pX); - unsigned char getModelType() const; - void setModelType(unsigned char pX); + uint8_t getModelType() const; + void setModelType(uint8_t pX); - unsigned char getEnvironmentStatus() const; - void setEnvironmentStatus(unsigned char pX); + uint8_t getEnvironmentStatus() const; + void setEnvironmentStatus(uint8_t pX); - unsigned char getNumberOfEnvironmentRecords() const; + uint8_t getNumberOfEnvironmentRecords() const; uint16_t getSequenceNumber() const; void setSequenceNumber(uint16_t pX); diff --git a/src/dis6/EventReportPdu.cpp b/src/dis6/EventReportPdu.cpp index 1e2d6a3d..fb9a906b 100644 --- a/src/dis6/EventReportPdu.cpp +++ b/src/dis6/EventReportPdu.cpp @@ -16,19 +16,19 @@ EventReportPdu::~EventReportPdu() { _variableDatums.clear(); } -unsigned int EventReportPdu::getEventType() const { return _eventType; } +uint32_t EventReportPdu::getEventType() const { return _eventType; } -void EventReportPdu::setEventType(unsigned int pX) { _eventType = pX; } +void EventReportPdu::setEventType(uint32_t pX) { _eventType = pX; } -unsigned int EventReportPdu::getPadding1() const { return _padding1; } +uint32_t EventReportPdu::getPadding1() const { return _padding1; } -void EventReportPdu::setPadding1(unsigned int pX) { _padding1 = pX; } +void EventReportPdu::setPadding1(uint32_t pX) { _padding1 = pX; } -unsigned int EventReportPdu::getNumberOfFixedDatumRecords() const { +uint32_t EventReportPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int EventReportPdu::getNumberOfVariableDatumRecords() const { +uint32_t EventReportPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -61,8 +61,8 @@ void EventReportPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _eventType; dataStream << _padding1; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; diff --git a/src/dis6/EventReportPdu.h b/src/dis6/EventReportPdu.h index 4f65dbec..82d347d7 100644 --- a/src/dis6/EventReportPdu.h +++ b/src/dis6/EventReportPdu.h @@ -20,16 +20,16 @@ namespace DIS { class OPENDIS6_EXPORT EventReportPdu : public SimulationManagementFamilyPdu { protected: /** Type of event */ - unsigned int _eventType; + uint32_t _eventType; /** padding */ - unsigned int _padding1; + uint32_t _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -44,15 +44,15 @@ class OPENDIS6_EXPORT EventReportPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getEventType() const; - void setEventType(unsigned int pX); + uint32_t getEventType() const; + void setEventType(uint32_t pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + uint32_t getPadding1() const; + void setPadding1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis6/EventReportReliablePdu.cpp b/src/dis6/EventReportReliablePdu.cpp index 3bce49dc..71dc53e9 100644 --- a/src/dis6/EventReportReliablePdu.cpp +++ b/src/dis6/EventReportReliablePdu.cpp @@ -24,15 +24,15 @@ void EventReportReliablePdu::setEventType(uint16_t pX) { _eventType = pX; } -unsigned int EventReportReliablePdu::getPad1() const { return _pad1; } +uint32_t EventReportReliablePdu::getPad1() const { return _pad1; } -void EventReportReliablePdu::setPad1(unsigned int pX) { _pad1 = pX; } +void EventReportReliablePdu::setPad1(uint32_t pX) { _pad1 = pX; } -unsigned int EventReportReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t EventReportReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int EventReportReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t EventReportReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -69,8 +69,8 @@ void EventReportReliablePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _eventType; dataStream << _pad1; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; diff --git a/src/dis6/EventReportReliablePdu.h b/src/dis6/EventReportReliablePdu.h index 11481a30..1598026c 100644 --- a/src/dis6/EventReportReliablePdu.h +++ b/src/dis6/EventReportReliablePdu.h @@ -25,13 +25,13 @@ class OPENDIS6_EXPORT EventReportReliablePdu uint16_t _eventType; /** padding */ - unsigned int _pad1; + uint32_t _pad1; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -49,12 +49,12 @@ class OPENDIS6_EXPORT EventReportReliablePdu uint16_t getEventType() const; void setEventType(uint16_t pX); - unsigned int getPad1() const; - void setPad1(unsigned int pX); + uint32_t getPad1() const; + void setPad1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis6/FastEntityStatePdu.cpp b/src/dis6/FastEntityStatePdu.cpp index e1469f41..db955d6d 100644 --- a/src/dis6/FastEntityStatePdu.cpp +++ b/src/dis6/FastEntityStatePdu.cpp @@ -74,83 +74,83 @@ uint16_t FastEntityStatePdu::getEntity() const { return _entity; } void FastEntityStatePdu::setEntity(uint16_t pX) { _entity = pX; } -unsigned char FastEntityStatePdu::getForceId() const { return _forceId; } +uint8_t FastEntityStatePdu::getForceId() const { return _forceId; } -void FastEntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } +void FastEntityStatePdu::setForceId(uint8_t pX) { _forceId = pX; } -unsigned char FastEntityStatePdu::getNumberOfArticulationParameters() const { +uint8_t FastEntityStatePdu::getNumberOfArticulationParameters() const { return _articulationParameters.size(); } -unsigned char FastEntityStatePdu::getEntityKind() const { return _entityKind; } +uint8_t FastEntityStatePdu::getEntityKind() const { return _entityKind; } -void FastEntityStatePdu::setEntityKind(unsigned char pX) { _entityKind = pX; } +void FastEntityStatePdu::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char FastEntityStatePdu::getDomain() const { return _domain; } +uint8_t FastEntityStatePdu::getDomain() const { return _domain; } -void FastEntityStatePdu::setDomain(unsigned char pX) { _domain = pX; } +void FastEntityStatePdu::setDomain(uint8_t pX) { _domain = pX; } uint16_t FastEntityStatePdu::getCountry() const { return _country; } void FastEntityStatePdu::setCountry(uint16_t pX) { _country = pX; } -unsigned char FastEntityStatePdu::getCategory() const { return _category; } +uint8_t FastEntityStatePdu::getCategory() const { return _category; } -void FastEntityStatePdu::setCategory(unsigned char pX) { _category = pX; } +void FastEntityStatePdu::setCategory(uint8_t pX) { _category = pX; } -unsigned char FastEntityStatePdu::getSubcategory() const { +uint8_t FastEntityStatePdu::getSubcategory() const { return _subcategory; } -void FastEntityStatePdu::setSubcategory(unsigned char pX) { _subcategory = pX; } +void FastEntityStatePdu::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char FastEntityStatePdu::getSpecific() const { return _specific; } +uint8_t FastEntityStatePdu::getSpecific() const { return _specific; } -void FastEntityStatePdu::setSpecific(unsigned char pX) { _specific = pX; } +void FastEntityStatePdu::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char FastEntityStatePdu::getExtra() const { return _extra; } +uint8_t FastEntityStatePdu::getExtra() const { return _extra; } -void FastEntityStatePdu::setExtra(unsigned char pX) { _extra = pX; } +void FastEntityStatePdu::setExtra(uint8_t pX) { _extra = pX; } -unsigned char FastEntityStatePdu::getAltEntityKind() const { +uint8_t FastEntityStatePdu::getAltEntityKind() const { return _altEntityKind; } -void FastEntityStatePdu::setAltEntityKind(unsigned char pX) { +void FastEntityStatePdu::setAltEntityKind(uint8_t pX) { _altEntityKind = pX; } -unsigned char FastEntityStatePdu::getAltDomain() const { return _altDomain; } +uint8_t FastEntityStatePdu::getAltDomain() const { return _altDomain; } -void FastEntityStatePdu::setAltDomain(unsigned char pX) { _altDomain = pX; } +void FastEntityStatePdu::setAltDomain(uint8_t pX) { _altDomain = pX; } uint16_t FastEntityStatePdu::getAltCountry() const { return _altCountry; } void FastEntityStatePdu::setAltCountry(uint16_t pX) { _altCountry = pX; } -unsigned char FastEntityStatePdu::getAltCategory() const { +uint8_t FastEntityStatePdu::getAltCategory() const { return _altCategory; } -void FastEntityStatePdu::setAltCategory(unsigned char pX) { _altCategory = pX; } +void FastEntityStatePdu::setAltCategory(uint8_t pX) { _altCategory = pX; } -unsigned char FastEntityStatePdu::getAltSubcategory() const { +uint8_t FastEntityStatePdu::getAltSubcategory() const { return _altSubcategory; } -void FastEntityStatePdu::setAltSubcategory(unsigned char pX) { +void FastEntityStatePdu::setAltSubcategory(uint8_t pX) { _altSubcategory = pX; } -unsigned char FastEntityStatePdu::getAltSpecific() const { +uint8_t FastEntityStatePdu::getAltSpecific() const { return _altSpecific; } -void FastEntityStatePdu::setAltSpecific(unsigned char pX) { _altSpecific = pX; } +void FastEntityStatePdu::setAltSpecific(uint8_t pX) { _altSpecific = pX; } -unsigned char FastEntityStatePdu::getAltExtra() const { return _altExtra; } +uint8_t FastEntityStatePdu::getAltExtra() const { return _altExtra; } -void FastEntityStatePdu::setAltExtra(unsigned char pX) { _altExtra = pX; } +void FastEntityStatePdu::setAltExtra(uint8_t pX) { _altExtra = pX; } float FastEntityStatePdu::getXVelocity() const { return _xVelocity; } @@ -194,11 +194,11 @@ int FastEntityStatePdu::getEntityAppearance() const { void FastEntityStatePdu::setEntityAppearance(int pX) { _entityAppearance = pX; } -unsigned char FastEntityStatePdu::getDeadReckoningAlgorithm() const { +uint8_t FastEntityStatePdu::getDeadReckoningAlgorithm() const { return _deadReckoningAlgorithm; } -void FastEntityStatePdu::setDeadReckoningAlgorithm(unsigned char pX) { +void FastEntityStatePdu::setDeadReckoningAlgorithm(uint8_t pX) { _deadReckoningAlgorithm = pX; } @@ -395,7 +395,7 @@ void FastEntityStatePdu::unmarshal(DataStream& dataStream) { dataStream >> _capabilities; _articulationParameters.clear(); - for (unsigned char idx = 0; idx < _numberOfArticulationParameters; idx++) { + for (uint8_t idx = 0; idx < _numberOfArticulationParameters; idx++) { ArticulationParameter x; x.unmarshal(dataStream); _articulationParameters.push_back(x); @@ -438,7 +438,7 @@ bool FastEntityStatePdu::operator==(const FastEntityStatePdu& rhs) const { if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 15; idx++) { + for (uint8_t idx = 0; idx < 15; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } @@ -450,7 +450,7 @@ bool FastEntityStatePdu::operator==(const FastEntityStatePdu& rhs) const { if (!(_yAngularVelocity == rhs._yAngularVelocity)) ivarsEqual = false; if (!(_zAngularVelocity == rhs._zAngularVelocity)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 12; idx++) { + for (uint8_t idx = 0; idx < 12; idx++) { if (!(_marking[idx] == rhs._marking[idx])) ivarsEqual = false; } diff --git a/src/dis6/FastEntityStatePdu.h b/src/dis6/FastEntityStatePdu.h index 1800f17e..f8e68556 100644 --- a/src/dis6/FastEntityStatePdu.h +++ b/src/dis6/FastEntityStatePdu.h @@ -29,50 +29,50 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { uint16_t _entity; /** what force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + uint8_t _forceId; /** How many articulation parameters are in the variable length list */ - unsigned char _numberOfArticulationParameters; + uint8_t _numberOfArticulationParameters; /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; /** Kind of entity */ - unsigned char _altEntityKind; + uint8_t _altEntityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _altDomain; + uint8_t _altDomain; /** country to which the design of the entity is attributed */ uint16_t _altCountry; /** category of entity */ - unsigned char _altCategory; + uint8_t _altCategory; /** subcategory of entity */ - unsigned char _altSubcategory; + uint8_t _altSubcategory; /** specific info based on subcategory field */ - unsigned char _altSpecific; + uint8_t _altSpecific; - unsigned char _altExtra; + uint8_t _altExtra; /** X velo */ float _xVelocity; @@ -103,7 +103,7 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { int _entityAppearance; /** enumeration of what dead reckoning algorighm to use */ - unsigned char _deadReckoningAlgorithm; + uint8_t _deadReckoningAlgorithm; /** other parameters to use in the dead reckoning algorithm */ char _otherParameters[15]; @@ -152,52 +152,52 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { uint16_t getEntity() const; void setEntity(uint16_t pX); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + uint8_t getForceId() const; + void setForceId(uint8_t pX); - unsigned char getNumberOfArticulationParameters() const; + uint8_t getNumberOfArticulationParameters() const; - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); uint16_t getCountry() const; void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); - unsigned char getAltEntityKind() const; - void setAltEntityKind(unsigned char pX); + uint8_t getAltEntityKind() const; + void setAltEntityKind(uint8_t pX); - unsigned char getAltDomain() const; - void setAltDomain(unsigned char pX); + uint8_t getAltDomain() const; + void setAltDomain(uint8_t pX); uint16_t getAltCountry() const; void setAltCountry(uint16_t pX); - unsigned char getAltCategory() const; - void setAltCategory(unsigned char pX); + uint8_t getAltCategory() const; + void setAltCategory(uint8_t pX); - unsigned char getAltSubcategory() const; - void setAltSubcategory(unsigned char pX); + uint8_t getAltSubcategory() const; + void setAltSubcategory(uint8_t pX); - unsigned char getAltSpecific() const; - void setAltSpecific(unsigned char pX); + uint8_t getAltSpecific() const; + void setAltSpecific(uint8_t pX); - unsigned char getAltExtra() const; - void setAltExtra(unsigned char pX); + uint8_t getAltExtra() const; + void setAltExtra(uint8_t pX); float getXVelocity() const; void setXVelocity(float pX); @@ -229,8 +229,8 @@ class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { int getEntityAppearance() const; void setEntityAppearance(int pX); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + uint8_t getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(uint8_t pX); char* getOtherParameters(); const char* getOtherParameters() const; diff --git a/src/dis6/FixedDatum.cpp b/src/dis6/FixedDatum.cpp index 078c186e..9b7b7945 100644 --- a/src/dis6/FixedDatum.cpp +++ b/src/dis6/FixedDatum.cpp @@ -6,13 +6,13 @@ FixedDatum::FixedDatum() : _fixedDatumID(0), _fixedDatumValue(0) {} FixedDatum::~FixedDatum() {} -unsigned int FixedDatum::getFixedDatumID() const { return _fixedDatumID; } +uint32_t FixedDatum::getFixedDatumID() const { return _fixedDatumID; } -void FixedDatum::setFixedDatumID(unsigned int pX) { _fixedDatumID = pX; } +void FixedDatum::setFixedDatumID(uint32_t pX) { _fixedDatumID = pX; } -unsigned int FixedDatum::getFixedDatumValue() const { return _fixedDatumValue; } +uint32_t FixedDatum::getFixedDatumValue() const { return _fixedDatumValue; } -void FixedDatum::setFixedDatumValue(unsigned int pX) { _fixedDatumValue = pX; } +void FixedDatum::setFixedDatumValue(uint32_t pX) { _fixedDatumValue = pX; } void FixedDatum::marshal(DataStream& dataStream) const { dataStream << _fixedDatumID; diff --git a/src/dis6/FixedDatum.h b/src/dis6/FixedDatum.h index 1a34fbb5..813e4e05 100644 --- a/src/dis6/FixedDatum.h +++ b/src/dis6/FixedDatum.h @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT FixedDatum { protected: /** ID of the fixed datum */ - unsigned int _fixedDatumID; + uint32_t _fixedDatumID; /** Value for the fixed datum */ - unsigned int _fixedDatumValue; + uint32_t _fixedDatumValue; public: FixedDatum(); @@ -26,11 +26,11 @@ class OPENDIS6_EXPORT FixedDatum { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getFixedDatumID() const; - void setFixedDatumID(unsigned int pX); + uint32_t getFixedDatumID() const; + void setFixedDatumID(uint32_t pX); - unsigned int getFixedDatumValue() const; - void setFixedDatumValue(unsigned int pX); + uint32_t getFixedDatumValue() const; + void setFixedDatumValue(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/FourByteChunk.cpp b/src/dis6/FourByteChunk.cpp index 4265d0f2..933b1ee4 100644 --- a/src/dis6/FourByteChunk.cpp +++ b/src/dis6/FourByteChunk.cpp @@ -39,7 +39,7 @@ void FourByteChunk::unmarshal(DataStream& dataStream) { bool FourByteChunk::operator==(const FourByteChunk& rhs) const { bool ivarsEqual = true; - for (unsigned char idx = 0; idx < 4; idx++) { + for (uint8_t idx = 0; idx < 4; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis6/FundamentalParameterDataIff.cpp b/src/dis6/FundamentalParameterDataIff.cpp index 7b4180af..3139a9e0 100644 --- a/src/dis6/FundamentalParameterDataIff.cpp +++ b/src/dis6/FundamentalParameterDataIff.cpp @@ -30,19 +30,19 @@ float FundamentalParameterDataIff::getPulseWidth() const { return _pulseWidth; } void FundamentalParameterDataIff::setPulseWidth(float pX) { _pulseWidth = pX; } -unsigned int FundamentalParameterDataIff::getBurstLength() const { +uint32_t FundamentalParameterDataIff::getBurstLength() const { return _burstLength; } -void FundamentalParameterDataIff::setBurstLength(unsigned int pX) { +void FundamentalParameterDataIff::setBurstLength(uint32_t pX) { _burstLength = pX; } -unsigned char FundamentalParameterDataIff::getApplicableModes() const { +uint8_t FundamentalParameterDataIff::getApplicableModes() const { return _applicableModes; } -void FundamentalParameterDataIff::setApplicableModes(unsigned char pX) { +void FundamentalParameterDataIff::setApplicableModes(uint8_t pX) { _applicableModes = pX; } @@ -50,9 +50,9 @@ uint16_t FundamentalParameterDataIff::getPad2() const { return _pad2; } void FundamentalParameterDataIff::setPad2(uint16_t pX) { _pad2 = pX; } -unsigned char FundamentalParameterDataIff::getPad3() const { return _pad3; } +uint8_t FundamentalParameterDataIff::getPad3() const { return _pad3; } -void FundamentalParameterDataIff::setPad3(unsigned char pX) { _pad3 = pX; } +void FundamentalParameterDataIff::setPad3(uint8_t pX) { _pad3 = pX; } void FundamentalParameterDataIff::marshal(DataStream& dataStream) const { dataStream << _erp; diff --git a/src/dis6/FundamentalParameterDataIff.h b/src/dis6/FundamentalParameterDataIff.h index 9c512c6b..09dbe436 100644 --- a/src/dis6/FundamentalParameterDataIff.h +++ b/src/dis6/FundamentalParameterDataIff.h @@ -26,16 +26,16 @@ class OPENDIS6_EXPORT FundamentalParameterDataIff { float _pulseWidth; /** Burst length */ - unsigned int _burstLength; + uint32_t _burstLength; /** Applicable modes enumeration */ - unsigned char _applicableModes; + uint8_t _applicableModes; /** padding */ uint16_t _pad2; /** padding */ - unsigned char _pad3; + uint8_t _pad3; public: FundamentalParameterDataIff(); @@ -56,17 +56,17 @@ class OPENDIS6_EXPORT FundamentalParameterDataIff { float getPulseWidth() const; void setPulseWidth(float pX); - unsigned int getBurstLength() const; - void setBurstLength(unsigned int pX); + uint32_t getBurstLength() const; + void setBurstLength(uint32_t pX); - unsigned char getApplicableModes() const; - void setApplicableModes(unsigned char pX); + uint8_t getApplicableModes() const; + void setApplicableModes(uint8_t pX); uint16_t getPad2() const; void setPad2(uint16_t pX); - unsigned char getPad3() const; - void setPad3(unsigned char pX); + uint8_t getPad3() const; + void setPad3(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/GriddedDataPdu.cpp b/src/dis6/GriddedDataPdu.cpp index e4cb579a..6a0aee29 100644 --- a/src/dis6/GriddedDataPdu.cpp +++ b/src/dis6/GriddedDataPdu.cpp @@ -57,13 +57,13 @@ void GriddedDataPdu::setCoordinateSystem(uint16_t pX) { _coordinateSystem = pX; } -unsigned char GriddedDataPdu::getNumberOfGridAxes() const { +uint8_t GriddedDataPdu::getNumberOfGridAxes() const { return _gridDataList.size(); } -unsigned char GriddedDataPdu::getConstantGrid() const { return _constantGrid; } +uint8_t GriddedDataPdu::getConstantGrid() const { return _constantGrid; } -void GriddedDataPdu::setConstantGrid(unsigned char pX) { _constantGrid = pX; } +void GriddedDataPdu::setConstantGrid(uint8_t pX) { _constantGrid = pX; } EntityType& GriddedDataPdu::getEnvironmentType() { return _environmentType; } @@ -89,15 +89,15 @@ uint64_t GriddedDataPdu::getSampleTime() const { return _sampleTime; } void GriddedDataPdu::setSampleTime(uint64_t pX) { _sampleTime = pX; } -unsigned int GriddedDataPdu::getTotalValues() const { return _totalValues; } +uint32_t GriddedDataPdu::getTotalValues() const { return _totalValues; } -void GriddedDataPdu::setTotalValues(unsigned int pX) { _totalValues = pX; } +void GriddedDataPdu::setTotalValues(uint32_t pX) { _totalValues = pX; } -unsigned char GriddedDataPdu::getVectorDimension() const { +uint8_t GriddedDataPdu::getVectorDimension() const { return _vectorDimension; } -void GriddedDataPdu::setVectorDimension(unsigned char pX) { +void GriddedDataPdu::setVectorDimension(uint8_t pX) { _vectorDimension = pX; } @@ -105,9 +105,9 @@ uint16_t GriddedDataPdu::getPadding1() const { return _padding1; } void GriddedDataPdu::setPadding1(uint16_t pX) { _padding1 = pX; } -unsigned char GriddedDataPdu::getPadding2() const { return _padding2; } +uint8_t GriddedDataPdu::getPadding2() const { return _padding2; } -void GriddedDataPdu::setPadding2(unsigned char pX) { _padding2 = pX; } +void GriddedDataPdu::setPadding2(uint8_t pX) { _padding2 = pX; } std::vector& GriddedDataPdu::getGridDataList() { return _gridDataList; @@ -129,7 +129,7 @@ void GriddedDataPdu::marshal(DataStream& dataStream) const { dataStream << _pduNumber; dataStream << _pduTotal; dataStream << _coordinateSystem; - dataStream << (unsigned char)_gridDataList.size(); + dataStream << (uint8_t)_gridDataList.size(); dataStream << _constantGrid; _environmentType.marshal(dataStream); _orientation.marshal(dataStream); diff --git a/src/dis6/GriddedDataPdu.h b/src/dis6/GriddedDataPdu.h index 112872f1..4ab9f3a5 100644 --- a/src/dis6/GriddedDataPdu.h +++ b/src/dis6/GriddedDataPdu.h @@ -38,10 +38,10 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { uint16_t _coordinateSystem; /** number of grid axes for the environmental data */ - unsigned char _numberOfGridAxes; + uint8_t _numberOfGridAxes; /** are domain grid axes identidal to those of the priveious domain update? */ - unsigned char _constantGrid; + uint8_t _constantGrid; /** type of environment */ EntityType _environmentType; @@ -49,21 +49,21 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { /** orientation of the data grid */ Orientation _orientation; - /** valid time of the enviormental data sample, 64 bit unsigned int */ + /** valid time of the enviormental data sample, 64 bit uint32_t */ uint64_t _sampleTime; /** total number of all data values for all pdus for an environmental sample */ - unsigned int _totalValues; + uint32_t _totalValues; /** total number of data values at each grid point. */ - unsigned char _vectorDimension; + uint8_t _vectorDimension; /** padding */ uint16_t _padding1; /** padding */ - unsigned char _padding2; + uint8_t _padding2; /** Grid data ^^^This is wrong */ std::vector _gridDataList; @@ -91,10 +91,10 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { uint16_t getCoordinateSystem() const; void setCoordinateSystem(uint16_t pX); - unsigned char getNumberOfGridAxes() const; + uint8_t getNumberOfGridAxes() const; - unsigned char getConstantGrid() const; - void setConstantGrid(unsigned char pX); + uint8_t getConstantGrid() const; + void setConstantGrid(uint8_t pX); EntityType& getEnvironmentType(); const EntityType& getEnvironmentType() const; @@ -107,17 +107,17 @@ class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { uint64_t getSampleTime() const; void setSampleTime(uint64_t pX); - unsigned int getTotalValues() const; - void setTotalValues(unsigned int pX); + uint32_t getTotalValues() const; + void setTotalValues(uint32_t pX); - unsigned char getVectorDimension() const; - void setVectorDimension(unsigned char pX); + uint8_t getVectorDimension() const; + void setVectorDimension(uint8_t pX); uint16_t getPadding1() const; void setPadding1(uint16_t pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + uint8_t getPadding2() const; + void setPadding2(uint8_t pX); std::vector& getGridDataList(); const std::vector& getGridDataList() const; diff --git a/src/dis6/IffFundamentalData.cpp b/src/dis6/IffFundamentalData.cpp index a5b70fb4..5450ea37 100644 --- a/src/dis6/IffFundamentalData.cpp +++ b/src/dis6/IffFundamentalData.cpp @@ -16,33 +16,33 @@ IffFundamentalData::IffFundamentalData() IffFundamentalData::~IffFundamentalData() {} -unsigned char IffFundamentalData::getSystemStatus() const { +uint8_t IffFundamentalData::getSystemStatus() const { return _systemStatus; } -void IffFundamentalData::setSystemStatus(unsigned char pX) { +void IffFundamentalData::setSystemStatus(uint8_t pX) { _systemStatus = pX; } -unsigned char IffFundamentalData::getAlternateParameter4() const { +uint8_t IffFundamentalData::getAlternateParameter4() const { return _alternateParameter4; } -void IffFundamentalData::setAlternateParameter4(unsigned char pX) { +void IffFundamentalData::setAlternateParameter4(uint8_t pX) { _alternateParameter4 = pX; } -unsigned char IffFundamentalData::getInformationLayers() const { +uint8_t IffFundamentalData::getInformationLayers() const { return _informationLayers; } -void IffFundamentalData::setInformationLayers(unsigned char pX) { +void IffFundamentalData::setInformationLayers(uint8_t pX) { _informationLayers = pX; } -unsigned char IffFundamentalData::getModifier() const { return _modifier; } +uint8_t IffFundamentalData::getModifier() const { return _modifier; } -void IffFundamentalData::setModifier(unsigned char pX) { _modifier = pX; } +void IffFundamentalData::setModifier(uint8_t pX) { _modifier = pX; } uint16_t IffFundamentalData::getParameter1() const { return _parameter1; } diff --git a/src/dis6/IffFundamentalData.h b/src/dis6/IffFundamentalData.h index d81110d1..3cc077c5 100644 --- a/src/dis6/IffFundamentalData.h +++ b/src/dis6/IffFundamentalData.h @@ -14,16 +14,16 @@ namespace DIS { class OPENDIS6_EXPORT IffFundamentalData { protected: /** system status */ - unsigned char _systemStatus; + uint8_t _systemStatus; /** Alternate parameter 4 */ - unsigned char _alternateParameter4; + uint8_t _alternateParameter4; /** eight boolean fields */ - unsigned char _informationLayers; + uint8_t _informationLayers; /** enumeration */ - unsigned char _modifier; + uint8_t _modifier; /** parameter, enumeration */ uint16_t _parameter1; @@ -50,17 +50,17 @@ class OPENDIS6_EXPORT IffFundamentalData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getSystemStatus() const; - void setSystemStatus(unsigned char pX); + uint8_t getSystemStatus() const; + void setSystemStatus(uint8_t pX); - unsigned char getAlternateParameter4() const; - void setAlternateParameter4(unsigned char pX); + uint8_t getAlternateParameter4() const; + void setAlternateParameter4(uint8_t pX); - unsigned char getInformationLayers() const; - void setInformationLayers(unsigned char pX); + uint8_t getInformationLayers() const; + void setInformationLayers(uint8_t pX); - unsigned char getModifier() const; - void setModifier(unsigned char pX); + uint8_t getModifier() const; + void setModifier(uint8_t pX); uint16_t getParameter1() const; void setParameter1(uint16_t pX); diff --git a/src/dis6/IntercomCommunicationsParameters.cpp b/src/dis6/IntercomCommunicationsParameters.cpp index 710069e4..9d451e69 100644 --- a/src/dis6/IntercomCommunicationsParameters.cpp +++ b/src/dis6/IntercomCommunicationsParameters.cpp @@ -23,11 +23,11 @@ void IntercomCommunicationsParameters::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned int IntercomCommunicationsParameters::getRecordSpecificField() const { +uint32_t IntercomCommunicationsParameters::getRecordSpecificField() const { return _recordSpecificField; } -void IntercomCommunicationsParameters::setRecordSpecificField(unsigned int pX) { +void IntercomCommunicationsParameters::setRecordSpecificField(uint32_t pX) { _recordSpecificField = pX; } diff --git a/src/dis6/IntercomCommunicationsParameters.h b/src/dis6/IntercomCommunicationsParameters.h index 8a645e88..f5c80451 100644 --- a/src/dis6/IntercomCommunicationsParameters.h +++ b/src/dis6/IntercomCommunicationsParameters.h @@ -21,7 +21,7 @@ class OPENDIS6_EXPORT IntercomCommunicationsParameters { /** Jerks. Looks like the committee is forcing a lookup of the record type * parameter to find out how long the field is. This is a placeholder. */ - unsigned int _recordSpecificField; + uint32_t _recordSpecificField; public: IntercomCommunicationsParameters(); @@ -36,8 +36,8 @@ class OPENDIS6_EXPORT IntercomCommunicationsParameters { uint16_t getRecordLength() const; void setRecordLength(uint16_t pX); - unsigned int getRecordSpecificField() const; - void setRecordSpecificField(unsigned int pX); + uint32_t getRecordSpecificField() const; + void setRecordSpecificField(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/IntercomControlPdu.cpp b/src/dis6/IntercomControlPdu.cpp index 13ac7827..96df7b3e 100644 --- a/src/dis6/IntercomControlPdu.cpp +++ b/src/dis6/IntercomControlPdu.cpp @@ -20,17 +20,17 @@ IntercomControlPdu::IntercomControlPdu() IntercomControlPdu::~IntercomControlPdu() { _intercomParameters.clear(); } -unsigned char IntercomControlPdu::getControlType() const { +uint8_t IntercomControlPdu::getControlType() const { return _controlType; } -void IntercomControlPdu::setControlType(unsigned char pX) { _controlType = pX; } +void IntercomControlPdu::setControlType(uint8_t pX) { _controlType = pX; } -unsigned char IntercomControlPdu::getCommunicationsChannelType() const { +uint8_t IntercomControlPdu::getCommunicationsChannelType() const { return _communicationsChannelType; } -void IntercomControlPdu::setCommunicationsChannelType(unsigned char pX) { +void IntercomControlPdu::setCommunicationsChannelType(uint8_t pX) { _communicationsChannelType = pX; } @@ -44,41 +44,41 @@ void IntercomControlPdu::setSourceEntityID(const EntityID& pX) { _sourceEntityID = pX; } -unsigned char IntercomControlPdu::getSourceCommunicationsDeviceID() const { +uint8_t IntercomControlPdu::getSourceCommunicationsDeviceID() const { return _sourceCommunicationsDeviceID; } -void IntercomControlPdu::setSourceCommunicationsDeviceID(unsigned char pX) { +void IntercomControlPdu::setSourceCommunicationsDeviceID(uint8_t pX) { _sourceCommunicationsDeviceID = pX; } -unsigned char IntercomControlPdu::getSourceLineID() const { +uint8_t IntercomControlPdu::getSourceLineID() const { return _sourceLineID; } -void IntercomControlPdu::setSourceLineID(unsigned char pX) { +void IntercomControlPdu::setSourceLineID(uint8_t pX) { _sourceLineID = pX; } -unsigned char IntercomControlPdu::getTransmitPriority() const { +uint8_t IntercomControlPdu::getTransmitPriority() const { return _transmitPriority; } -void IntercomControlPdu::setTransmitPriority(unsigned char pX) { +void IntercomControlPdu::setTransmitPriority(uint8_t pX) { _transmitPriority = pX; } -unsigned char IntercomControlPdu::getTransmitLineState() const { +uint8_t IntercomControlPdu::getTransmitLineState() const { return _transmitLineState; } -void IntercomControlPdu::setTransmitLineState(unsigned char pX) { +void IntercomControlPdu::setTransmitLineState(uint8_t pX) { _transmitLineState = pX; } -unsigned char IntercomControlPdu::getCommand() const { return _command; } +uint8_t IntercomControlPdu::getCommand() const { return _command; } -void IntercomControlPdu::setCommand(unsigned char pX) { _command = pX; } +void IntercomControlPdu::setCommand(uint8_t pX) { _command = pX; } EntityID& IntercomControlPdu::getMasterEntityID() { return _masterEntityID; } @@ -98,7 +98,7 @@ void IntercomControlPdu::setMasterCommunicationsDeviceID(uint16_t pX) { _masterCommunicationsDeviceID = pX; } -unsigned int IntercomControlPdu::getIntercomParametersLength() const { +uint32_t IntercomControlPdu::getIntercomParametersLength() const { return _intercomParameters.size(); } @@ -130,7 +130,7 @@ void IntercomControlPdu::marshal(DataStream& dataStream) const { dataStream << _command; _masterEntityID.marshal(dataStream); dataStream << _masterCommunicationsDeviceID; - dataStream << (unsigned int)_intercomParameters.size(); + dataStream << (uint32_t)_intercomParameters.size(); for (size_t idx = 0; idx < _intercomParameters.size(); idx++) { IntercomCommunicationsParameters x = _intercomParameters[idx]; diff --git a/src/dis6/IntercomControlPdu.h b/src/dis6/IntercomControlPdu.h index 8f69cb3b..5b1fc451 100644 --- a/src/dis6/IntercomControlPdu.h +++ b/src/dis6/IntercomControlPdu.h @@ -22,29 +22,29 @@ namespace DIS { class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { protected: /** control type */ - unsigned char _controlType; + uint8_t _controlType; /** control type */ - unsigned char _communicationsChannelType; + uint8_t _communicationsChannelType; /** Source entity ID */ EntityID _sourceEntityID; /** The specific intercom device being simulated within an entity. */ - unsigned char _sourceCommunicationsDeviceID; + uint8_t _sourceCommunicationsDeviceID; /** Line number to which the intercom control refers */ - unsigned char _sourceLineID; + uint8_t _sourceLineID; /** priority of this message relative to transmissons from other intercom * devices */ - unsigned char _transmitPriority; + uint8_t _transmitPriority; /** current transmit state of the line */ - unsigned char _transmitLineState; + uint8_t _transmitLineState; /** detailed type requested. */ - unsigned char _command; + uint8_t _command; /** eid of the entity that has created this intercom channel. */ EntityID _masterEntityID; @@ -53,7 +53,7 @@ class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { uint16_t _masterCommunicationsDeviceID; /** number of intercom parameters */ - unsigned int _intercomParametersLength; + uint32_t _intercomParametersLength; /** ^^^This is wrong--the length of the data field is variable. Using a long * for now. */ @@ -66,30 +66,30 @@ class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getControlType() const; - void setControlType(unsigned char pX); + uint8_t getControlType() const; + void setControlType(uint8_t pX); - unsigned char getCommunicationsChannelType() const; - void setCommunicationsChannelType(unsigned char pX); + uint8_t getCommunicationsChannelType() const; + void setCommunicationsChannelType(uint8_t pX); EntityID& getSourceEntityID(); const EntityID& getSourceEntityID() const; void setSourceEntityID(const EntityID& pX); - unsigned char getSourceCommunicationsDeviceID() const; - void setSourceCommunicationsDeviceID(unsigned char pX); + uint8_t getSourceCommunicationsDeviceID() const; + void setSourceCommunicationsDeviceID(uint8_t pX); - unsigned char getSourceLineID() const; - void setSourceLineID(unsigned char pX); + uint8_t getSourceLineID() const; + void setSourceLineID(uint8_t pX); - unsigned char getTransmitPriority() const; - void setTransmitPriority(unsigned char pX); + uint8_t getTransmitPriority() const; + void setTransmitPriority(uint8_t pX); - unsigned char getTransmitLineState() const; - void setTransmitLineState(unsigned char pX); + uint8_t getTransmitLineState() const; + void setTransmitLineState(uint8_t pX); - unsigned char getCommand() const; - void setCommand(unsigned char pX); + uint8_t getCommand() const; + void setCommand(uint8_t pX); EntityID& getMasterEntityID(); const EntityID& getMasterEntityID() const; @@ -98,7 +98,7 @@ class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { uint16_t getMasterCommunicationsDeviceID() const; void setMasterCommunicationsDeviceID(uint16_t pX); - unsigned int getIntercomParametersLength() const; + uint32_t getIntercomParametersLength() const; std::vector& getIntercomParameters(); const std::vector& getIntercomParameters() diff --git a/src/dis6/IntercomSignalPdu.cpp b/src/dis6/IntercomSignalPdu.cpp index 93b688f7..ae13fe61 100644 --- a/src/dis6/IntercomSignalPdu.cpp +++ b/src/dis6/IntercomSignalPdu.cpp @@ -42,9 +42,9 @@ uint16_t IntercomSignalPdu::getTdlType() const { return _tdlType; } void IntercomSignalPdu::setTdlType(uint16_t pX) { _tdlType = pX; } -unsigned int IntercomSignalPdu::getSampleRate() const { return _sampleRate; } +uint32_t IntercomSignalPdu::getSampleRate() const { return _sampleRate; } -void IntercomSignalPdu::setSampleRate(unsigned int pX) { _sampleRate = pX; } +void IntercomSignalPdu::setSampleRate(uint32_t pX) { _sampleRate = pX; } uint16_t IntercomSignalPdu::getDataLength() const { return _data.size(); } diff --git a/src/dis6/IntercomSignalPdu.h b/src/dis6/IntercomSignalPdu.h index d5ca4c72..8629fac4 100644 --- a/src/dis6/IntercomSignalPdu.h +++ b/src/dis6/IntercomSignalPdu.h @@ -31,7 +31,7 @@ class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { uint16_t _tdlType; /** sample rate */ - unsigned int _sampleRate; + uint32_t _sampleRate; /** data length */ uint16_t _dataLength; @@ -62,8 +62,8 @@ class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { uint16_t getTdlType() const; void setTdlType(uint16_t pX); - unsigned int getSampleRate() const; - void setSampleRate(unsigned int pX); + uint32_t getSampleRate() const; + void setSampleRate(uint32_t pX); uint16_t getDataLength() const; diff --git a/src/dis6/IsGroupOfPdu.cpp b/src/dis6/IsGroupOfPdu.cpp index 4715349b..106f8d58 100644 --- a/src/dis6/IsGroupOfPdu.cpp +++ b/src/dis6/IsGroupOfPdu.cpp @@ -23,21 +23,21 @@ const EntityID& IsGroupOfPdu::getGroupEntityID() const { void IsGroupOfPdu::setGroupEntityID(const EntityID& pX) { _groupEntityID = pX; } -unsigned char IsGroupOfPdu::getGroupedEntityCategory() const { +uint8_t IsGroupOfPdu::getGroupedEntityCategory() const { return _groupedEntityCategory; } -void IsGroupOfPdu::setGroupedEntityCategory(unsigned char pX) { +void IsGroupOfPdu::setGroupedEntityCategory(uint8_t pX) { _groupedEntityCategory = pX; } -unsigned char IsGroupOfPdu::getNumberOfGroupedEntities() const { +uint8_t IsGroupOfPdu::getNumberOfGroupedEntities() const { return _groupedEntityDescriptions.size(); } -unsigned int IsGroupOfPdu::getPad2() const { return _pad2; } +uint32_t IsGroupOfPdu::getPad2() const { return _pad2; } -void IsGroupOfPdu::setPad2(unsigned int pX) { _pad2 = pX; } +void IsGroupOfPdu::setPad2(uint32_t pX) { _pad2 = pX; } double IsGroupOfPdu::getLatitude() const { return _latitude; } @@ -66,7 +66,7 @@ void IsGroupOfPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _groupEntityID.marshal(dataStream); dataStream << _groupedEntityCategory; - dataStream << (unsigned char)_groupedEntityDescriptions.size(); + dataStream << (uint8_t)_groupedEntityDescriptions.size(); dataStream << _pad2; dataStream << _latitude; dataStream << _longitude; diff --git a/src/dis6/IsGroupOfPdu.h b/src/dis6/IsGroupOfPdu.h index 9339567e..eba66d58 100644 --- a/src/dis6/IsGroupOfPdu.h +++ b/src/dis6/IsGroupOfPdu.h @@ -25,13 +25,13 @@ class OPENDIS6_EXPORT IsGroupOfPdu : public EntityManagementFamilyPdu { EntityID _groupEntityID; /** type of entities constituting the group */ - unsigned char _groupedEntityCategory; + uint8_t _groupedEntityCategory; /** Number of individual entities constituting the group */ - unsigned char _numberOfGroupedEntities; + uint8_t _numberOfGroupedEntities; /** padding */ - unsigned int _pad2; + uint32_t _pad2; /** latitude */ double _latitude; @@ -55,13 +55,13 @@ class OPENDIS6_EXPORT IsGroupOfPdu : public EntityManagementFamilyPdu { const EntityID& getGroupEntityID() const; void setGroupEntityID(const EntityID& pX); - unsigned char getGroupedEntityCategory() const; - void setGroupedEntityCategory(unsigned char pX); + uint8_t getGroupedEntityCategory() const; + void setGroupedEntityCategory(uint8_t pX); - unsigned char getNumberOfGroupedEntities() const; + uint8_t getNumberOfGroupedEntities() const; - unsigned int getPad2() const; - void setPad2(unsigned int pX); + uint32_t getPad2() const; + void setPad2(uint32_t pX); double getLatitude() const; void setLatitude(double pX); diff --git a/src/dis6/LayerHeader.cpp b/src/dis6/LayerHeader.cpp index 021643db..edf0510f 100644 --- a/src/dis6/LayerHeader.cpp +++ b/src/dis6/LayerHeader.cpp @@ -7,15 +7,15 @@ LayerHeader::LayerHeader() LayerHeader::~LayerHeader() {} -unsigned char LayerHeader::getLayerNumber() const { return _layerNumber; } +uint8_t LayerHeader::getLayerNumber() const { return _layerNumber; } -void LayerHeader::setLayerNumber(unsigned char pX) { _layerNumber = pX; } +void LayerHeader::setLayerNumber(uint8_t pX) { _layerNumber = pX; } -unsigned char LayerHeader::getLayerSpecificInformaiton() const { +uint8_t LayerHeader::getLayerSpecificInformaiton() const { return _layerSpecificInformaiton; } -void LayerHeader::setLayerSpecificInformaiton(unsigned char pX) { +void LayerHeader::setLayerSpecificInformaiton(uint8_t pX) { _layerSpecificInformaiton = pX; } diff --git a/src/dis6/LayerHeader.h b/src/dis6/LayerHeader.h index 07ab8c1f..deb6adcb 100644 --- a/src/dis6/LayerHeader.h +++ b/src/dis6/LayerHeader.h @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT LayerHeader { protected: /** Layer number */ - unsigned char _layerNumber; + uint8_t _layerNumber; /** Layer speccific information enumeration */ - unsigned char _layerSpecificInformaiton; + uint8_t _layerSpecificInformaiton; /** information length */ uint16_t _length; @@ -29,11 +29,11 @@ class OPENDIS6_EXPORT LayerHeader { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getLayerNumber() const; - void setLayerNumber(unsigned char pX); + uint8_t getLayerNumber() const; + void setLayerNumber(uint8_t pX); - unsigned char getLayerSpecificInformaiton() const; - void setLayerSpecificInformaiton(unsigned char pX); + uint8_t getLayerSpecificInformaiton() const; + void setLayerSpecificInformaiton(uint8_t pX); uint16_t getLength() const; void setLength(uint16_t pX); diff --git a/src/dis6/LinearObjectStatePdu.cpp b/src/dis6/LinearObjectStatePdu.cpp index 752538fd..526f4a15 100644 --- a/src/dis6/LinearObjectStatePdu.cpp +++ b/src/dis6/LinearObjectStatePdu.cpp @@ -45,11 +45,11 @@ void LinearObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } -unsigned char LinearObjectStatePdu::getForceID() const { return _forceID; } +uint8_t LinearObjectStatePdu::getForceID() const { return _forceID; } -void LinearObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void LinearObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char LinearObjectStatePdu::getNumberOfSegments() const { +uint8_t LinearObjectStatePdu::getNumberOfSegments() const { return _linearSegmentParameters.size(); } @@ -109,7 +109,7 @@ void LinearObjectStatePdu::marshal(DataStream& dataStream) const { _referencedObjectID.marshal(dataStream); dataStream << _updateNumber; dataStream << _forceID; - dataStream << (unsigned char)_linearSegmentParameters.size(); + dataStream << (uint8_t)_linearSegmentParameters.size(); _requesterID.marshal(dataStream); _receivingID.marshal(dataStream); _objectType.marshal(dataStream); diff --git a/src/dis6/LinearObjectStatePdu.h b/src/dis6/LinearObjectStatePdu.h index 40ade491..0f8aef64 100644 --- a/src/dis6/LinearObjectStatePdu.h +++ b/src/dis6/LinearObjectStatePdu.h @@ -33,10 +33,10 @@ class OPENDIS6_EXPORT LinearObjectStatePdu uint16_t _updateNumber; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** number of linear segment parameters */ - unsigned char _numberOfSegments; + uint8_t _numberOfSegments; /** requesterID */ SimulationAddress _requesterID; @@ -68,10 +68,10 @@ class OPENDIS6_EXPORT LinearObjectStatePdu uint16_t getUpdateNumber() const; void setUpdateNumber(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getNumberOfSegments() const; + uint8_t getNumberOfSegments() const; SimulationAddress& getRequesterID(); const SimulationAddress& getRequesterID() const; diff --git a/src/dis6/LinearSegmentParameter.cpp b/src/dis6/LinearSegmentParameter.cpp index 075ddd1f..eb801177 100644 --- a/src/dis6/LinearSegmentParameter.cpp +++ b/src/dis6/LinearSegmentParameter.cpp @@ -15,11 +15,11 @@ LinearSegmentParameter::LinearSegmentParameter() LinearSegmentParameter::~LinearSegmentParameter() {} -unsigned char LinearSegmentParameter::getSegmentNumber() const { +uint8_t LinearSegmentParameter::getSegmentNumber() const { return _segmentNumber; } -void LinearSegmentParameter::setSegmentNumber(unsigned char pX) { +void LinearSegmentParameter::setSegmentNumber(uint8_t pX) { _segmentNumber = pX; } @@ -87,9 +87,9 @@ void LinearSegmentParameter::setSegmentDepth(uint16_t pX) { _segmentDepth = pX; } -unsigned int LinearSegmentParameter::getPad1() const { return _pad1; } +uint32_t LinearSegmentParameter::getPad1() const { return _pad1; } -void LinearSegmentParameter::setPad1(unsigned int pX) { _pad1 = pX; } +void LinearSegmentParameter::setPad1(uint32_t pX) { _pad1 = pX; } void LinearSegmentParameter::marshal(DataStream& dataStream) const { dataStream << _segmentNumber; diff --git a/src/dis6/LinearSegmentParameter.h b/src/dis6/LinearSegmentParameter.h index 4e1ff07f..999601ae 100644 --- a/src/dis6/LinearSegmentParameter.h +++ b/src/dis6/LinearSegmentParameter.h @@ -17,7 +17,7 @@ namespace DIS { class OPENDIS6_EXPORT LinearSegmentParameter { protected: /** number of segments */ - unsigned char _segmentNumber; + uint8_t _segmentNumber; /** segment appearance */ SixByteChunk _segmentAppearance; @@ -41,7 +41,7 @@ class OPENDIS6_EXPORT LinearSegmentParameter { uint16_t _segmentDepth; /** segment Depth */ - unsigned int _pad1; + uint32_t _pad1; public: LinearSegmentParameter(); @@ -50,8 +50,8 @@ class OPENDIS6_EXPORT LinearSegmentParameter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getSegmentNumber() const; - void setSegmentNumber(unsigned char pX); + uint8_t getSegmentNumber() const; + void setSegmentNumber(uint8_t pX); SixByteChunk& getSegmentAppearance(); const SixByteChunk& getSegmentAppearance() const; @@ -77,8 +77,8 @@ class OPENDIS6_EXPORT LinearSegmentParameter { uint16_t getSegmentDepth() const; void setSegmentDepth(uint16_t pX); - unsigned int getPad1() const; - void setPad1(unsigned int pX); + uint32_t getPad1() const; + void setPad1(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/Marking.cpp b/src/dis6/Marking.cpp index a9f9ad49..dd47d293 100644 --- a/src/dis6/Marking.cpp +++ b/src/dis6/Marking.cpp @@ -13,9 +13,9 @@ Marking::Marking() : _characterSet(0) { Marking::~Marking() {} -unsigned char Marking::getCharacterSet() const { return _characterSet; } +uint8_t Marking::getCharacterSet() const { return _characterSet; } -void Marking::setCharacterSet(unsigned char pX) { _characterSet = pX; } +void Marking::setCharacterSet(uint8_t pX) { _characterSet = pX; } char* Marking::getCharacters() { return _characters; } @@ -55,7 +55,7 @@ bool Marking::operator==(const Marking& rhs) const { if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 11; idx++) { + for (uint8_t idx = 0; idx < 11; idx++) { if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; } diff --git a/src/dis6/Marking.h b/src/dis6/Marking.h index 095520d6..fa8d218e 100644 --- a/src/dis6/Marking.h +++ b/src/dis6/Marking.h @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS6_EXPORT Marking { protected: /** The character set */ - unsigned char _characterSet; + uint8_t _characterSet; /** The characters */ char _characters[11]; @@ -27,8 +27,8 @@ class OPENDIS6_EXPORT Marking { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + uint8_t getCharacterSet() const; + void setCharacterSet(uint8_t pX); char* getCharacters(); const char* getCharacters() const; diff --git a/src/dis6/MinefieldDataPdu.cpp b/src/dis6/MinefieldDataPdu.cpp index c15089b3..ec86b8d6 100644 --- a/src/dis6/MinefieldDataPdu.cpp +++ b/src/dis6/MinefieldDataPdu.cpp @@ -52,39 +52,39 @@ void MinefieldDataPdu::setMinefieldSequenceNumbeer(uint16_t pX) { _minefieldSequenceNumbeer = pX; } -unsigned char MinefieldDataPdu::getRequestID() const { return _requestID; } +uint8_t MinefieldDataPdu::getRequestID() const { return _requestID; } -void MinefieldDataPdu::setRequestID(unsigned char pX) { _requestID = pX; } +void MinefieldDataPdu::setRequestID(uint8_t pX) { _requestID = pX; } -unsigned char MinefieldDataPdu::getPduSequenceNumber() const { +uint8_t MinefieldDataPdu::getPduSequenceNumber() const { return _pduSequenceNumber; } -void MinefieldDataPdu::setPduSequenceNumber(unsigned char pX) { +void MinefieldDataPdu::setPduSequenceNumber(uint8_t pX) { _pduSequenceNumber = pX; } -unsigned char MinefieldDataPdu::getNumberOfPdus() const { +uint8_t MinefieldDataPdu::getNumberOfPdus() const { return _numberOfPdus; } -void MinefieldDataPdu::setNumberOfPdus(unsigned char pX) { _numberOfPdus = pX; } +void MinefieldDataPdu::setNumberOfPdus(uint8_t pX) { _numberOfPdus = pX; } -unsigned char MinefieldDataPdu::getNumberOfMinesInThisPdu() const { +uint8_t MinefieldDataPdu::getNumberOfMinesInThisPdu() const { return _mineLocation.size(); } -unsigned char MinefieldDataPdu::getNumberOfSensorTypes() const { +uint8_t MinefieldDataPdu::getNumberOfSensorTypes() const { return _sensorTypes.size(); } -unsigned char MinefieldDataPdu::getPad2() const { return _pad2; } +uint8_t MinefieldDataPdu::getPad2() const { return _pad2; } -void MinefieldDataPdu::setPad2(unsigned char pX) { _pad2 = pX; } +void MinefieldDataPdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int MinefieldDataPdu::getDataFilter() const { return _dataFilter; } +uint32_t MinefieldDataPdu::getDataFilter() const { return _dataFilter; } -void MinefieldDataPdu::setDataFilter(unsigned int pX) { _dataFilter = pX; } +void MinefieldDataPdu::setDataFilter(uint32_t pX) { _dataFilter = pX; } EntityType& MinefieldDataPdu::getMineType() { return _mineType; } @@ -104,9 +104,9 @@ void MinefieldDataPdu::setSensorTypes(const std::vector& pX) { _sensorTypes = pX; } -unsigned char MinefieldDataPdu::getPad3() const { return _pad3; } +uint8_t MinefieldDataPdu::getPad3() const { return _pad3; } -void MinefieldDataPdu::setPad3(unsigned char pX) { _pad3 = pX; } +void MinefieldDataPdu::setPad3(uint8_t pX) { _pad3 = pX; } std::vector& MinefieldDataPdu::getMineLocation() { return _mineLocation; @@ -129,8 +129,8 @@ void MinefieldDataPdu::marshal(DataStream& dataStream) const { dataStream << _requestID; dataStream << _pduSequenceNumber; dataStream << _numberOfPdus; - dataStream << (unsigned char)_mineLocation.size(); - dataStream << (unsigned char)_sensorTypes.size(); + dataStream << (uint8_t)_mineLocation.size(); + dataStream << (uint8_t)_sensorTypes.size(); dataStream << _pad2; dataStream << _dataFilter; _mineType.marshal(dataStream); diff --git a/src/dis6/MinefieldDataPdu.h b/src/dis6/MinefieldDataPdu.h index 61da3375..e59461ac 100644 --- a/src/dis6/MinefieldDataPdu.h +++ b/src/dis6/MinefieldDataPdu.h @@ -31,25 +31,25 @@ class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { uint16_t _minefieldSequenceNumbeer; /** request ID */ - unsigned char _requestID; + uint8_t _requestID; /** pdu sequence number */ - unsigned char _pduSequenceNumber; + uint8_t _pduSequenceNumber; /** number of pdus in response */ - unsigned char _numberOfPdus; + uint8_t _numberOfPdus; /** how many mines are in this PDU */ - unsigned char _numberOfMinesInThisPdu; + uint8_t _numberOfMinesInThisPdu; /** how many sensor type are in this PDU */ - unsigned char _numberOfSensorTypes; + uint8_t _numberOfSensorTypes; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** 32 boolean fields */ - unsigned int _dataFilter; + uint32_t _dataFilter; /** Mine type */ EntityType _mineType; @@ -59,7 +59,7 @@ class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { /** Padding to get things 32-bit aligned. ^^^this is wrong--dyanmically sized * padding needed */ - unsigned char _pad3; + uint8_t _pad3; /** Mine locations */ std::vector _mineLocation; @@ -82,24 +82,24 @@ class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { uint16_t getMinefieldSequenceNumbeer() const; void setMinefieldSequenceNumbeer(uint16_t pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + uint8_t getRequestID() const; + void setRequestID(uint8_t pX); - unsigned char getPduSequenceNumber() const; - void setPduSequenceNumber(unsigned char pX); + uint8_t getPduSequenceNumber() const; + void setPduSequenceNumber(uint8_t pX); - unsigned char getNumberOfPdus() const; - void setNumberOfPdus(unsigned char pX); + uint8_t getNumberOfPdus() const; + void setNumberOfPdus(uint8_t pX); - unsigned char getNumberOfMinesInThisPdu() const; + uint8_t getNumberOfMinesInThisPdu() const; - unsigned char getNumberOfSensorTypes() const; + uint8_t getNumberOfSensorTypes() const; - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getDataFilter() const; - void setDataFilter(unsigned int pX); + uint32_t getDataFilter() const; + void setDataFilter(uint32_t pX); EntityType& getMineType(); const EntityType& getMineType() const; @@ -109,8 +109,8 @@ class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { const std::vector& getSensorTypes() const; void setSensorTypes(const std::vector& pX); - unsigned char getPad3() const; - void setPad3(unsigned char pX); + uint8_t getPad3() const; + void setPad3(uint8_t pX); std::vector& getMineLocation(); const std::vector& getMineLocation() const; diff --git a/src/dis6/MinefieldQueryPdu.cpp b/src/dis6/MinefieldQueryPdu.cpp index ca8493de..356f7c59 100644 --- a/src/dis6/MinefieldQueryPdu.cpp +++ b/src/dis6/MinefieldQueryPdu.cpp @@ -42,25 +42,25 @@ void MinefieldQueryPdu::setRequestingEntityID(const EntityID& pX) { _requestingEntityID = pX; } -unsigned char MinefieldQueryPdu::getRequestID() const { return _requestID; } +uint8_t MinefieldQueryPdu::getRequestID() const { return _requestID; } -void MinefieldQueryPdu::setRequestID(unsigned char pX) { _requestID = pX; } +void MinefieldQueryPdu::setRequestID(uint8_t pX) { _requestID = pX; } -unsigned char MinefieldQueryPdu::getNumberOfPerimeterPoints() const { +uint8_t MinefieldQueryPdu::getNumberOfPerimeterPoints() const { return _requestedPerimeterPoints.size(); } -unsigned char MinefieldQueryPdu::getPad2() const { return _pad2; } +uint8_t MinefieldQueryPdu::getPad2() const { return _pad2; } -void MinefieldQueryPdu::setPad2(unsigned char pX) { _pad2 = pX; } +void MinefieldQueryPdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned char MinefieldQueryPdu::getNumberOfSensorTypes() const { +uint8_t MinefieldQueryPdu::getNumberOfSensorTypes() const { return _sensorTypes.size(); } -unsigned int MinefieldQueryPdu::getDataFilter() const { return _dataFilter; } +uint32_t MinefieldQueryPdu::getDataFilter() const { return _dataFilter; } -void MinefieldQueryPdu::setDataFilter(unsigned int pX) { _dataFilter = pX; } +void MinefieldQueryPdu::setDataFilter(uint32_t pX) { _dataFilter = pX; } EntityType& MinefieldQueryPdu::getRequestedMineType() { return _requestedMineType; @@ -106,9 +106,9 @@ void MinefieldQueryPdu::marshal(DataStream& dataStream) const { _minefieldID.marshal(dataStream); _requestingEntityID.marshal(dataStream); dataStream << _requestID; - dataStream << (unsigned char)_requestedPerimeterPoints.size(); + dataStream << (uint8_t)_requestedPerimeterPoints.size(); dataStream << _pad2; - dataStream << (unsigned char)_sensorTypes.size(); + dataStream << (uint8_t)_sensorTypes.size(); dataStream << _dataFilter; _requestedMineType.marshal(dataStream); diff --git a/src/dis6/MinefieldQueryPdu.h b/src/dis6/MinefieldQueryPdu.h index 45fc9b39..793b7bdc 100644 --- a/src/dis6/MinefieldQueryPdu.h +++ b/src/dis6/MinefieldQueryPdu.h @@ -28,19 +28,19 @@ class OPENDIS6_EXPORT MinefieldQueryPdu : public MinefieldFamilyPdu { EntityID _requestingEntityID; /** request ID */ - unsigned char _requestID; + uint8_t _requestID; /** Number of perimeter points for the minefield */ - unsigned char _numberOfPerimeterPoints; + uint8_t _numberOfPerimeterPoints; /** Padding */ - unsigned char _pad2; + uint8_t _pad2; /** Number of sensor types */ - unsigned char _numberOfSensorTypes; + uint8_t _numberOfSensorTypes; /** data filter, 32 boolean fields */ - unsigned int _dataFilter; + uint32_t _dataFilter; /** Entity type of mine being requested */ EntityType _requestedMineType; @@ -66,18 +66,18 @@ class OPENDIS6_EXPORT MinefieldQueryPdu : public MinefieldFamilyPdu { const EntityID& getRequestingEntityID() const; void setRequestingEntityID(const EntityID& pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + uint8_t getRequestID() const; + void setRequestID(uint8_t pX); - unsigned char getNumberOfPerimeterPoints() const; + uint8_t getNumberOfPerimeterPoints() const; - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned char getNumberOfSensorTypes() const; + uint8_t getNumberOfSensorTypes() const; - unsigned int getDataFilter() const; - void setDataFilter(unsigned int pX); + uint32_t getDataFilter() const; + void setDataFilter(uint32_t pX); EntityType& getRequestedMineType(); const EntityType& getRequestedMineType() const; diff --git a/src/dis6/MinefieldResponseNackPdu.cpp b/src/dis6/MinefieldResponseNackPdu.cpp index d2a9898a..53a84a2d 100644 --- a/src/dis6/MinefieldResponseNackPdu.cpp +++ b/src/dis6/MinefieldResponseNackPdu.cpp @@ -37,15 +37,15 @@ void MinefieldResponseNackPdu::setRequestingEntityID(const EntityID& pX) { _requestingEntityID = pX; } -unsigned char MinefieldResponseNackPdu::getRequestID() const { +uint8_t MinefieldResponseNackPdu::getRequestID() const { return _requestID; } -void MinefieldResponseNackPdu::setRequestID(unsigned char pX) { +void MinefieldResponseNackPdu::setRequestID(uint8_t pX) { _requestID = pX; } -unsigned char MinefieldResponseNackPdu::getNumberOfMissingPdus() const { +uint8_t MinefieldResponseNackPdu::getNumberOfMissingPdus() const { return _missingPduSequenceNumbers.size(); } @@ -70,7 +70,7 @@ void MinefieldResponseNackPdu::marshal(DataStream& dataStream) const { _minefieldID.marshal(dataStream); _requestingEntityID.marshal(dataStream); dataStream << _requestID; - dataStream << (unsigned char)_missingPduSequenceNumbers.size(); + dataStream << (uint8_t)_missingPduSequenceNumbers.size(); for (size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { EightByteChunk x = _missingPduSequenceNumbers[idx]; diff --git a/src/dis6/MinefieldResponseNackPdu.h b/src/dis6/MinefieldResponseNackPdu.h index b4d6a094..b2bd488a 100644 --- a/src/dis6/MinefieldResponseNackPdu.h +++ b/src/dis6/MinefieldResponseNackPdu.h @@ -26,10 +26,10 @@ class OPENDIS6_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu { EntityID _requestingEntityID; /** request ID */ - unsigned char _requestID; + uint8_t _requestID; /** how many pdus were missing */ - unsigned char _numberOfMissingPdus; + uint8_t _numberOfMissingPdus; /** PDU sequence numbers that were missing */ std::vector _missingPduSequenceNumbers; @@ -49,10 +49,10 @@ class OPENDIS6_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu { const EntityID& getRequestingEntityID() const; void setRequestingEntityID(const EntityID& pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + uint8_t getRequestID() const; + void setRequestID(uint8_t pX); - unsigned char getNumberOfMissingPdus() const; + uint8_t getNumberOfMissingPdus() const; std::vector& getMissingPduSequenceNumbers(); const std::vector& getMissingPduSequenceNumbers() const; diff --git a/src/dis6/MinefieldStatePdu.cpp b/src/dis6/MinefieldStatePdu.cpp index 24328f88..96327e0a 100644 --- a/src/dis6/MinefieldStatePdu.cpp +++ b/src/dis6/MinefieldStatePdu.cpp @@ -40,11 +40,11 @@ void MinefieldStatePdu::setMinefieldSequence(uint16_t pX) { _minefieldSequence = pX; } -unsigned char MinefieldStatePdu::getForceID() const { return _forceID; } +uint8_t MinefieldStatePdu::getForceID() const { return _forceID; } -void MinefieldStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void MinefieldStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char MinefieldStatePdu::getNumberOfPerimeterPoints() const { +uint8_t MinefieldStatePdu::getNumberOfPerimeterPoints() const { return _perimeterPoints.size(); } @@ -126,7 +126,7 @@ void MinefieldStatePdu::marshal(DataStream& dataStream) const { _minefieldID.marshal(dataStream); dataStream << _minefieldSequence; dataStream << _forceID; - dataStream << (unsigned char)_perimeterPoints.size(); + dataStream << (uint8_t)_perimeterPoints.size(); _minefieldType.marshal(dataStream); dataStream << (uint16_t)_mineType.size(); _minefieldLocation.marshal(dataStream); diff --git a/src/dis6/MinefieldStatePdu.h b/src/dis6/MinefieldStatePdu.h index c662fb60..aa58447c 100644 --- a/src/dis6/MinefieldStatePdu.h +++ b/src/dis6/MinefieldStatePdu.h @@ -29,10 +29,10 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { uint16_t _minefieldSequence; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** Number of permieter points */ - unsigned char _numberOfPerimeterPoints; + uint8_t _numberOfPerimeterPoints; /** type of minefield */ EntityType _minefieldType; @@ -72,10 +72,10 @@ class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { uint16_t getMinefieldSequence() const; void setMinefieldSequence(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getNumberOfPerimeterPoints() const; + uint8_t getNumberOfPerimeterPoints() const; EntityType& getMinefieldType(); const EntityType& getMinefieldType() const; diff --git a/src/dis6/ObjectType.cpp b/src/dis6/ObjectType.cpp index e9fe566e..06863e9c 100644 --- a/src/dis6/ObjectType.cpp +++ b/src/dis6/ObjectType.cpp @@ -7,25 +7,25 @@ ObjectType::ObjectType() ObjectType::~ObjectType() {} -unsigned char ObjectType::getEntityKind() const { return _entityKind; } +uint8_t ObjectType::getEntityKind() const { return _entityKind; } -void ObjectType::setEntityKind(unsigned char pX) { _entityKind = pX; } +void ObjectType::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char ObjectType::getDomain() const { return _domain; } +uint8_t ObjectType::getDomain() const { return _domain; } -void ObjectType::setDomain(unsigned char pX) { _domain = pX; } +void ObjectType::setDomain(uint8_t pX) { _domain = pX; } uint16_t ObjectType::getCountry() const { return _country; } void ObjectType::setCountry(uint16_t pX) { _country = pX; } -unsigned char ObjectType::getCategory() const { return _category; } +uint8_t ObjectType::getCategory() const { return _category; } -void ObjectType::setCategory(unsigned char pX) { _category = pX; } +void ObjectType::setCategory(uint8_t pX) { _category = pX; } -unsigned char ObjectType::getSubcategory() const { return _subcategory; } +uint8_t ObjectType::getSubcategory() const { return _subcategory; } -void ObjectType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void ObjectType::setSubcategory(uint8_t pX) { _subcategory = pX; } void ObjectType::marshal(DataStream& dataStream) const { dataStream << _entityKind; diff --git a/src/dis6/ObjectType.h b/src/dis6/ObjectType.h index 9bcd7c71..6e03ed86 100644 --- a/src/dis6/ObjectType.h +++ b/src/dis6/ObjectType.h @@ -15,19 +15,19 @@ namespace DIS { class OPENDIS6_EXPORT ObjectType { protected: /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; public: ObjectType(); @@ -36,20 +36,20 @@ class OPENDIS6_EXPORT ObjectType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); uint16_t getCountry() const; void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/Pdu.cpp b/src/dis6/Pdu.cpp index 2fa0ca09..c22ead58 100644 --- a/src/dis6/Pdu.cpp +++ b/src/dis6/Pdu.cpp @@ -13,25 +13,25 @@ Pdu::Pdu() Pdu::~Pdu() {} -unsigned char Pdu::getProtocolVersion() const { return _protocolVersion; } +uint8_t Pdu::getProtocolVersion() const { return _protocolVersion; } -void Pdu::setProtocolVersion(unsigned char pX) { _protocolVersion = pX; } +void Pdu::setProtocolVersion(uint8_t pX) { _protocolVersion = pX; } -unsigned char Pdu::getExerciseID() const { return _exerciseID; } +uint8_t Pdu::getExerciseID() const { return _exerciseID; } -void Pdu::setExerciseID(unsigned char pX) { _exerciseID = pX; } +void Pdu::setExerciseID(uint8_t pX) { _exerciseID = pX; } -unsigned char Pdu::getPduType() const { return _pduType; } +uint8_t Pdu::getPduType() const { return _pduType; } -void Pdu::setPduType(unsigned char pX) { _pduType = pX; } +void Pdu::setPduType(uint8_t pX) { _pduType = pX; } -unsigned char Pdu::getProtocolFamily() const { return _protocolFamily; } +uint8_t Pdu::getProtocolFamily() const { return _protocolFamily; } -void Pdu::setProtocolFamily(unsigned char pX) { _protocolFamily = pX; } +void Pdu::setProtocolFamily(uint8_t pX) { _protocolFamily = pX; } -unsigned int Pdu::getTimestamp() const { return _timestamp; } +uint32_t Pdu::getTimestamp() const { return _timestamp; } -void Pdu::setTimestamp(unsigned int pX) { _timestamp = pX; } +void Pdu::setTimestamp(uint32_t pX) { _timestamp = pX; } uint16_t Pdu::getLength() const { return this->getMarshalledSize(); } diff --git a/src/dis6/Pdu.h b/src/dis6/Pdu.h index 1a45ff6b..b9177989 100644 --- a/src/dis6/Pdu.h +++ b/src/dis6/Pdu.h @@ -15,19 +15,19 @@ namespace DIS { class OPENDIS6_EXPORT Pdu { protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998. */ - unsigned char _protocolVersion; + uint8_t _protocolVersion; /** Exercise ID */ - unsigned char _exerciseID; + uint8_t _exerciseID; /** Type of pdu, unique for each PDU class */ - unsigned char _pduType; + uint8_t _pduType; /** value that refers to the protocol family, eg SimulationManagement, et */ - unsigned char _protocolFamily; + uint8_t _protocolFamily; /** Timestamp value */ - unsigned int _timestamp; + uint32_t _timestamp; /** Length, in bytes, of the PDU */ uint16_t _length; @@ -42,20 +42,20 @@ class OPENDIS6_EXPORT Pdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getProtocolVersion() const; - void setProtocolVersion(unsigned char pX); + uint8_t getProtocolVersion() const; + void setProtocolVersion(uint8_t pX); - unsigned char getExerciseID() const; - void setExerciseID(unsigned char pX); + uint8_t getExerciseID() const; + void setExerciseID(uint8_t pX); - unsigned char getPduType() const; - void setPduType(unsigned char pX); + uint8_t getPduType() const; + void setPduType(uint8_t pX); - unsigned char getProtocolFamily() const; - void setProtocolFamily(unsigned char pX); + uint8_t getProtocolFamily() const; + void setProtocolFamily(uint8_t pX); - unsigned int getTimestamp() const; - void setTimestamp(unsigned int pX); + uint32_t getTimestamp() const; + void setTimestamp(uint32_t pX); uint16_t getLength() const; void setLength(uint16_t pX); diff --git a/src/dis6/PointObjectStatePdu.cpp b/src/dis6/PointObjectStatePdu.cpp index 1b3c9004..3605b7b6 100644 --- a/src/dis6/PointObjectStatePdu.cpp +++ b/src/dis6/PointObjectStatePdu.cpp @@ -47,15 +47,15 @@ void PointObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } -unsigned char PointObjectStatePdu::getForceID() const { return _forceID; } +uint8_t PointObjectStatePdu::getForceID() const { return _forceID; } -void PointObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void PointObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char PointObjectStatePdu::getModifications() const { +uint8_t PointObjectStatePdu::getModifications() const { return _modifications; } -void PointObjectStatePdu::setModifications(unsigned char pX) { +void PointObjectStatePdu::setModifications(uint8_t pX) { _modifications = pX; } @@ -125,9 +125,9 @@ void PointObjectStatePdu::setReceivingID(const SimulationAddress& pX) { _receivingID = pX; } -unsigned int PointObjectStatePdu::getPad2() const { return _pad2; } +uint32_t PointObjectStatePdu::getPad2() const { return _pad2; } -void PointObjectStatePdu::setPad2(unsigned int pX) { _pad2 = pX; } +void PointObjectStatePdu::setPad2(uint32_t pX) { _pad2 = pX; } void PointObjectStatePdu::marshal(DataStream& dataStream) const { SyntheticEnvironmentFamilyPdu::marshal( diff --git a/src/dis6/PointObjectStatePdu.h b/src/dis6/PointObjectStatePdu.h index d3b00f4e..19a9df99 100644 --- a/src/dis6/PointObjectStatePdu.h +++ b/src/dis6/PointObjectStatePdu.h @@ -32,10 +32,10 @@ class OPENDIS6_EXPORT PointObjectStatePdu uint16_t _updateNumber; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** modifications */ - unsigned char _modifications; + uint8_t _modifications; /** Object type */ ObjectType _objectType; @@ -56,7 +56,7 @@ class OPENDIS6_EXPORT PointObjectStatePdu SimulationAddress _receivingID; /** padding */ - unsigned int _pad2; + uint32_t _pad2; public: PointObjectStatePdu(); @@ -76,11 +76,11 @@ class OPENDIS6_EXPORT PointObjectStatePdu uint16_t getUpdateNumber() const; void setUpdateNumber(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + uint8_t getModifications() const; + void setModifications(uint8_t pX); ObjectType& getObjectType(); const ObjectType& getObjectType() const; @@ -105,8 +105,8 @@ class OPENDIS6_EXPORT PointObjectStatePdu const SimulationAddress& getReceivingID() const; void setReceivingID(const SimulationAddress& pX); - unsigned int getPad2() const; - void setPad2(unsigned int pX); + uint32_t getPad2() const; + void setPad2(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RadioEntityType.cpp b/src/dis6/RadioEntityType.cpp index d55a4261..a1271a29 100644 --- a/src/dis6/RadioEntityType.cpp +++ b/src/dis6/RadioEntityType.cpp @@ -12,27 +12,27 @@ RadioEntityType::RadioEntityType() RadioEntityType::~RadioEntityType() {} -unsigned char RadioEntityType::getEntityKind() const { return _entityKind; } +uint8_t RadioEntityType::getEntityKind() const { return _entityKind; } -void RadioEntityType::setEntityKind(unsigned char pX) { _entityKind = pX; } +void RadioEntityType::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char RadioEntityType::getDomain() const { return _domain; } +uint8_t RadioEntityType::getDomain() const { return _domain; } -void RadioEntityType::setDomain(unsigned char pX) { _domain = pX; } +void RadioEntityType::setDomain(uint8_t pX) { _domain = pX; } uint16_t RadioEntityType::getCountry() const { return _country; } void RadioEntityType::setCountry(uint16_t pX) { _country = pX; } -unsigned char RadioEntityType::getCategory() const { return _category; } +uint8_t RadioEntityType::getCategory() const { return _category; } -void RadioEntityType::setCategory(unsigned char pX) { _category = pX; } +void RadioEntityType::setCategory(uint8_t pX) { _category = pX; } -unsigned char RadioEntityType::getNomenclatureVersion() const { +uint8_t RadioEntityType::getNomenclatureVersion() const { return _nomenclatureVersion; } -void RadioEntityType::setNomenclatureVersion(unsigned char pX) { +void RadioEntityType::setNomenclatureVersion(uint8_t pX) { _nomenclatureVersion = pX; } diff --git a/src/dis6/RadioEntityType.h b/src/dis6/RadioEntityType.h index fcb87309..f2e5e096 100644 --- a/src/dis6/RadioEntityType.h +++ b/src/dis6/RadioEntityType.h @@ -14,19 +14,19 @@ namespace DIS { class OPENDIS6_EXPORT RadioEntityType { protected: /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** specific info based on subcategory field */ - unsigned char _nomenclatureVersion; + uint8_t _nomenclatureVersion; uint16_t _nomenclature; @@ -37,20 +37,20 @@ class OPENDIS6_EXPORT RadioEntityType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); uint16_t getCountry() const; void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getNomenclatureVersion() const; - void setNomenclatureVersion(unsigned char pX); + uint8_t getNomenclatureVersion() const; + void setNomenclatureVersion(uint8_t pX); uint16_t getNomenclature() const; void setNomenclature(uint16_t pX); diff --git a/src/dis6/RecordQueryReliablePdu.cpp b/src/dis6/RecordQueryReliablePdu.cpp index fe514b99..6272b77a 100644 --- a/src/dis6/RecordQueryReliablePdu.cpp +++ b/src/dis6/RecordQueryReliablePdu.cpp @@ -16,15 +16,15 @@ RecordQueryReliablePdu::RecordQueryReliablePdu() RecordQueryReliablePdu::~RecordQueryReliablePdu() { _recordIDs.clear(); } -unsigned int RecordQueryReliablePdu::getRequestID() const { return _requestID; } +uint32_t RecordQueryReliablePdu::getRequestID() const { return _requestID; } -void RecordQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void RecordQueryReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned char RecordQueryReliablePdu::getRequiredReliabilityService() const { +uint8_t RecordQueryReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void RecordQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void RecordQueryReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -32,9 +32,9 @@ uint16_t RecordQueryReliablePdu::getPad1() const { return _pad1; } void RecordQueryReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char RecordQueryReliablePdu::getPad2() const { return _pad2; } +uint8_t RecordQueryReliablePdu::getPad2() const { return _pad2; } -void RecordQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void RecordQueryReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } uint16_t RecordQueryReliablePdu::getEventType() const { return _eventType; @@ -44,11 +44,11 @@ void RecordQueryReliablePdu::setEventType(uint16_t pX) { _eventType = pX; } -unsigned int RecordQueryReliablePdu::getTime() const { return _time; } +uint32_t RecordQueryReliablePdu::getTime() const { return _time; } -void RecordQueryReliablePdu::setTime(unsigned int pX) { _time = pX; } +void RecordQueryReliablePdu::setTime(uint32_t pX) { _time = pX; } -unsigned int RecordQueryReliablePdu::getNumberOfRecords() const { +uint32_t RecordQueryReliablePdu::getNumberOfRecords() const { return _recordIDs.size(); } @@ -74,7 +74,7 @@ void RecordQueryReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad2; dataStream << _eventType; dataStream << _time; - dataStream << (unsigned int)_recordIDs.size(); + dataStream << (uint32_t)_recordIDs.size(); for (size_t idx = 0; idx < _recordIDs.size(); idx++) { FourByteChunk x = _recordIDs[idx]; diff --git a/src/dis6/RecordQueryReliablePdu.h b/src/dis6/RecordQueryReliablePdu.h index 45d4e109..96d1de13 100644 --- a/src/dis6/RecordQueryReliablePdu.h +++ b/src/dis6/RecordQueryReliablePdu.h @@ -20,25 +20,25 @@ class OPENDIS6_EXPORT RecordQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** event type */ uint16_t _eventType; /** time */ - unsigned int _time; + uint32_t _time; /** numberOfRecords */ - unsigned int _numberOfRecords; + uint32_t _numberOfRecords; /** record IDs */ std::vector _recordIDs; @@ -50,25 +50,25 @@ class OPENDIS6_EXPORT RecordQueryReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); uint16_t getEventType() const; void setEventType(uint16_t pX); - unsigned int getTime() const; - void setTime(unsigned int pX); + uint32_t getTime() const; + void setTime(uint32_t pX); - unsigned int getNumberOfRecords() const; + uint32_t getNumberOfRecords() const; std::vector& getRecordIDs(); const std::vector& getRecordIDs() const; diff --git a/src/dis6/RecordSet.cpp b/src/dis6/RecordSet.cpp index c9f7ee41..7c769bf8 100644 --- a/src/dis6/RecordSet.cpp +++ b/src/dis6/RecordSet.cpp @@ -12,15 +12,15 @@ RecordSet::RecordSet() RecordSet::~RecordSet() {} -unsigned int RecordSet::getRecordID() const { return _recordID; } +uint32_t RecordSet::getRecordID() const { return _recordID; } -void RecordSet::setRecordID(unsigned int pX) { _recordID = pX; } +void RecordSet::setRecordID(uint32_t pX) { _recordID = pX; } -unsigned int RecordSet::getRecordSetSerialNumber() const { +uint32_t RecordSet::getRecordSetSerialNumber() const { return _recordSetSerialNumber; } -void RecordSet::setRecordSetSerialNumber(unsigned int pX) { +void RecordSet::setRecordSetSerialNumber(uint32_t pX) { _recordSetSerialNumber = pX; } @@ -36,9 +36,9 @@ uint16_t RecordSet::getRecordValues() const { return _recordValues; } void RecordSet::setRecordValues(uint16_t pX) { _recordValues = pX; } -unsigned char RecordSet::getPad4() const { return _pad4; } +uint8_t RecordSet::getPad4() const { return _pad4; } -void RecordSet::setPad4(unsigned char pX) { _pad4 = pX; } +void RecordSet::setPad4(uint8_t pX) { _pad4 = pX; } void RecordSet::marshal(DataStream& dataStream) const { dataStream << _recordID; diff --git a/src/dis6/RecordSet.h b/src/dis6/RecordSet.h index 3ef1beb7..d36eff16 100644 --- a/src/dis6/RecordSet.h +++ b/src/dis6/RecordSet.h @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS6_EXPORT RecordSet { protected: /** record ID */ - unsigned int _recordID; + uint32_t _recordID; /** record set serial number */ - unsigned int _recordSetSerialNumber; + uint32_t _recordSetSerialNumber; /** record length */ uint16_t _recordLength; @@ -29,7 +29,7 @@ class OPENDIS6_EXPORT RecordSet { uint16_t _recordValues; /** ^^^This is wrong--variable sized padding */ - unsigned char _pad4; + uint8_t _pad4; public: RecordSet(); @@ -38,11 +38,11 @@ class OPENDIS6_EXPORT RecordSet { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordID() const; - void setRecordID(unsigned int pX); + uint32_t getRecordID() const; + void setRecordID(uint32_t pX); - unsigned int getRecordSetSerialNumber() const; - void setRecordSetSerialNumber(unsigned int pX); + uint32_t getRecordSetSerialNumber() const; + void setRecordSetSerialNumber(uint32_t pX); uint16_t getRecordLength() const; void setRecordLength(uint16_t pX); @@ -53,8 +53,8 @@ class OPENDIS6_EXPORT RecordSet { uint16_t getRecordValues() const; void setRecordValues(uint16_t pX); - unsigned char getPad4() const; - void setPad4(unsigned char pX); + uint8_t getPad4() const; + void setPad4(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RemoveEntityPdu.cpp b/src/dis6/RemoveEntityPdu.cpp index c726344d..09fee38a 100644 --- a/src/dis6/RemoveEntityPdu.cpp +++ b/src/dis6/RemoveEntityPdu.cpp @@ -9,9 +9,9 @@ RemoveEntityPdu::RemoveEntityPdu() RemoveEntityPdu::~RemoveEntityPdu() {} -unsigned int RemoveEntityPdu::getRequestID() const { return _requestID; } +uint32_t RemoveEntityPdu::getRequestID() const { return _requestID; } -void RemoveEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void RemoveEntityPdu::setRequestID(uint32_t pX) { _requestID = pX; } void RemoveEntityPdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis6/RemoveEntityPdu.h b/src/dis6/RemoveEntityPdu.h index da235134..330d76ed 100644 --- a/src/dis6/RemoveEntityPdu.h +++ b/src/dis6/RemoveEntityPdu.h @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS6_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu { protected: /** Identifier for the request */ - unsigned int _requestID; + uint32_t _requestID; public: RemoveEntityPdu(); @@ -24,8 +24,8 @@ class OPENDIS6_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RemoveEntityReliablePdu.cpp b/src/dis6/RemoveEntityReliablePdu.cpp index 08b34ead..c47976df 100644 --- a/src/dis6/RemoveEntityReliablePdu.cpp +++ b/src/dis6/RemoveEntityReliablePdu.cpp @@ -13,11 +13,11 @@ RemoveEntityReliablePdu::RemoveEntityReliablePdu() RemoveEntityReliablePdu::~RemoveEntityReliablePdu() {} -unsigned char RemoveEntityReliablePdu::getRequiredReliabilityService() const { +uint8_t RemoveEntityReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void RemoveEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void RemoveEntityReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -25,15 +25,15 @@ uint16_t RemoveEntityReliablePdu::getPad1() const { return _pad1; } void RemoveEntityReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char RemoveEntityReliablePdu::getPad2() const { return _pad2; } +uint8_t RemoveEntityReliablePdu::getPad2() const { return _pad2; } -void RemoveEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void RemoveEntityReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int RemoveEntityReliablePdu::getRequestID() const { +uint32_t RemoveEntityReliablePdu::getRequestID() const { return _requestID; } -void RemoveEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void RemoveEntityReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void RemoveEntityReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis6/RemoveEntityReliablePdu.h b/src/dis6/RemoveEntityReliablePdu.h index 03b9aab4..29177803 100644 --- a/src/dis6/RemoveEntityReliablePdu.h +++ b/src/dis6/RemoveEntityReliablePdu.h @@ -16,16 +16,16 @@ class OPENDIS6_EXPORT RemoveEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: RemoveEntityReliablePdu(); @@ -34,17 +34,17 @@ class OPENDIS6_EXPORT RemoveEntityReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/RepairResponsePdu.cpp b/src/dis6/RepairResponsePdu.cpp index 1ee095be..7c02741b 100644 --- a/src/dis6/RepairResponsePdu.cpp +++ b/src/dis6/RepairResponsePdu.cpp @@ -38,11 +38,11 @@ void RepairResponsePdu::setRepairingEntityID(const EntityID& pX) { _repairingEntityID = pX; } -unsigned char RepairResponsePdu::getRepairResult() const { +uint8_t RepairResponsePdu::getRepairResult() const { return _repairResult; } -void RepairResponsePdu::setRepairResult(unsigned char pX) { +void RepairResponsePdu::setRepairResult(uint8_t pX) { _repairResult = pX; } diff --git a/src/dis6/RepairResponsePdu.h b/src/dis6/RepairResponsePdu.h index f45112f6..6b64b365 100644 --- a/src/dis6/RepairResponsePdu.h +++ b/src/dis6/RepairResponsePdu.h @@ -22,7 +22,7 @@ class OPENDIS6_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { EntityID _repairingEntityID; /** Result of repair operation */ - unsigned char _repairResult; + uint8_t _repairResult; /** padding */ int16_t _padding1; @@ -45,8 +45,8 @@ class OPENDIS6_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { const EntityID& getRepairingEntityID() const; void setRepairingEntityID(const EntityID& pX); - unsigned char getRepairResult() const; - void setRepairResult(unsigned char pX); + uint8_t getRepairResult() const; + void setRepairResult(uint8_t pX); int16_t getPadding1() const; void setPadding1(int16_t pX); diff --git a/src/dis6/ResupplyOfferPdu.cpp b/src/dis6/ResupplyOfferPdu.cpp index af3d4724..1aaac4af 100644 --- a/src/dis6/ResupplyOfferPdu.cpp +++ b/src/dis6/ResupplyOfferPdu.cpp @@ -38,7 +38,7 @@ void ResupplyOfferPdu::setSupplyingEntityID(const EntityID& pX) { _supplyingEntityID = pX; } -unsigned char ResupplyOfferPdu::getNumberOfSupplyTypes() const { +uint8_t ResupplyOfferPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } @@ -67,7 +67,7 @@ void ResupplyOfferPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _receivingEntityID.marshal(dataStream); _supplyingEntityID.marshal(dataStream); - dataStream << (unsigned char)_supplies.size(); + dataStream << (uint8_t)_supplies.size(); dataStream << _padding1; dataStream << _padding2; diff --git a/src/dis6/ResupplyOfferPdu.h b/src/dis6/ResupplyOfferPdu.h index ed10d803..a6101bfd 100644 --- a/src/dis6/ResupplyOfferPdu.h +++ b/src/dis6/ResupplyOfferPdu.h @@ -25,7 +25,7 @@ class OPENDIS6_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { EntityID _supplyingEntityID; /** how many supplies are being offered */ - unsigned char _numberOfSupplyTypes; + uint8_t _numberOfSupplyTypes; /** padding */ int16_t _padding1; @@ -50,7 +50,7 @@ class OPENDIS6_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { const EntityID& getSupplyingEntityID() const; void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + uint8_t getNumberOfSupplyTypes() const; int16_t getPadding1() const; void setPadding1(int16_t pX); diff --git a/src/dis6/ResupplyReceivedPdu.cpp b/src/dis6/ResupplyReceivedPdu.cpp index 09697cb5..d444144d 100644 --- a/src/dis6/ResupplyReceivedPdu.cpp +++ b/src/dis6/ResupplyReceivedPdu.cpp @@ -38,7 +38,7 @@ void ResupplyReceivedPdu::setSupplyingEntityID(const EntityID& pX) { _supplyingEntityID = pX; } -unsigned char ResupplyReceivedPdu::getNumberOfSupplyTypes() const { +uint8_t ResupplyReceivedPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } @@ -67,7 +67,7 @@ void ResupplyReceivedPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _receivingEntityID.marshal(dataStream); _supplyingEntityID.marshal(dataStream); - dataStream << (unsigned char)_supplies.size(); + dataStream << (uint8_t)_supplies.size(); dataStream << _padding1; dataStream << _padding2; diff --git a/src/dis6/ResupplyReceivedPdu.h b/src/dis6/ResupplyReceivedPdu.h index 88a4405f..df1f97fb 100644 --- a/src/dis6/ResupplyReceivedPdu.h +++ b/src/dis6/ResupplyReceivedPdu.h @@ -25,7 +25,7 @@ class OPENDIS6_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { EntityID _supplyingEntityID; /** how many supplies are being offered */ - unsigned char _numberOfSupplyTypes; + uint8_t _numberOfSupplyTypes; /** padding */ int16_t _padding1; @@ -50,7 +50,7 @@ class OPENDIS6_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { const EntityID& getSupplyingEntityID() const; void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + uint8_t getNumberOfSupplyTypes() const; int16_t getPadding1() const; void setPadding1(int16_t pX); diff --git a/src/dis6/ServiceRequestPdu.cpp b/src/dis6/ServiceRequestPdu.cpp index c3789ef3..192db8e4 100644 --- a/src/dis6/ServiceRequestPdu.cpp +++ b/src/dis6/ServiceRequestPdu.cpp @@ -38,15 +38,15 @@ void ServiceRequestPdu::setServicingEntityID(const EntityID& pX) { _servicingEntityID = pX; } -unsigned char ServiceRequestPdu::getServiceTypeRequested() const { +uint8_t ServiceRequestPdu::getServiceTypeRequested() const { return _serviceTypeRequested; } -void ServiceRequestPdu::setServiceTypeRequested(unsigned char pX) { +void ServiceRequestPdu::setServiceTypeRequested(uint8_t pX) { _serviceTypeRequested = pX; } -unsigned char ServiceRequestPdu::getNumberOfSupplyTypes() const { +uint8_t ServiceRequestPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } @@ -76,7 +76,7 @@ void ServiceRequestPdu::marshal(DataStream& dataStream) const { _requestingEntityID.marshal(dataStream); _servicingEntityID.marshal(dataStream); dataStream << _serviceTypeRequested; - dataStream << (unsigned char)_supplies.size(); + dataStream << (uint8_t)_supplies.size(); dataStream << _serviceRequestPadding; for (size_t idx = 0; idx < _supplies.size(); idx++) { diff --git a/src/dis6/ServiceRequestPdu.h b/src/dis6/ServiceRequestPdu.h index a772bb7f..29cca0c3 100644 --- a/src/dis6/ServiceRequestPdu.h +++ b/src/dis6/ServiceRequestPdu.h @@ -25,10 +25,10 @@ class OPENDIS6_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { EntityID _servicingEntityID; /** type of service requested */ - unsigned char _serviceTypeRequested; + uint8_t _serviceTypeRequested; /** How many requested */ - unsigned char _numberOfSupplyTypes; + uint8_t _numberOfSupplyTypes; /** padding */ int16_t _serviceRequestPadding; @@ -50,10 +50,10 @@ class OPENDIS6_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { const EntityID& getServicingEntityID() const; void setServicingEntityID(const EntityID& pX); - unsigned char getServiceTypeRequested() const; - void setServiceTypeRequested(unsigned char pX); + uint8_t getServiceTypeRequested() const; + void setServiceTypeRequested(uint8_t pX); - unsigned char getNumberOfSupplyTypes() const; + uint8_t getNumberOfSupplyTypes() const; int16_t getServiceRequestPadding() const; void setServiceRequestPadding(int16_t pX); diff --git a/src/dis6/SetDataPdu.cpp b/src/dis6/SetDataPdu.cpp index 8ca9590a..d2aef22d 100644 --- a/src/dis6/SetDataPdu.cpp +++ b/src/dis6/SetDataPdu.cpp @@ -16,19 +16,19 @@ SetDataPdu::~SetDataPdu() { _variableDatums.clear(); } -unsigned int SetDataPdu::getRequestID() const { return _requestID; } +uint32_t SetDataPdu::getRequestID() const { return _requestID; } -void SetDataPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void SetDataPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int SetDataPdu::getPadding1() const { return _padding1; } +uint32_t SetDataPdu::getPadding1() const { return _padding1; } -void SetDataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } +void SetDataPdu::setPadding1(uint32_t pX) { _padding1 = pX; } -unsigned int SetDataPdu::getNumberOfFixedDatumRecords() const { +uint32_t SetDataPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int SetDataPdu::getNumberOfVariableDatumRecords() const { +uint32_t SetDataPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -59,8 +59,8 @@ void SetDataPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _padding1; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; diff --git a/src/dis6/SetDataPdu.h b/src/dis6/SetDataPdu.h index 4483fd41..10f04012 100644 --- a/src/dis6/SetDataPdu.h +++ b/src/dis6/SetDataPdu.h @@ -20,16 +20,16 @@ namespace DIS { class OPENDIS6_EXPORT SetDataPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ - unsigned int _requestID; + uint32_t _requestID; /** padding */ - unsigned int _padding1; + uint32_t _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -44,15 +44,15 @@ class OPENDIS6_EXPORT SetDataPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + uint32_t getPadding1() const; + void setPadding1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis6/SetDataReliablePdu.cpp b/src/dis6/SetDataReliablePdu.cpp index 75ca6b09..98e579ef 100644 --- a/src/dis6/SetDataReliablePdu.cpp +++ b/src/dis6/SetDataReliablePdu.cpp @@ -18,11 +18,11 @@ SetDataReliablePdu::~SetDataReliablePdu() { _variableDatumRecords.clear(); } -unsigned char SetDataReliablePdu::getRequiredReliabilityService() const { +uint8_t SetDataReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void SetDataReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void SetDataReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -30,19 +30,19 @@ uint16_t SetDataReliablePdu::getPad1() const { return _pad1; } void SetDataReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char SetDataReliablePdu::getPad2() const { return _pad2; } +uint8_t SetDataReliablePdu::getPad2() const { return _pad2; } -void SetDataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void SetDataReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int SetDataReliablePdu::getRequestID() const { return _requestID; } +uint32_t SetDataReliablePdu::getRequestID() const { return _requestID; } -void SetDataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void SetDataReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int SetDataReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t SetDataReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int SetDataReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t SetDataReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -81,8 +81,8 @@ void SetDataReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad1; dataStream << _pad2; dataStream << _requestID; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; diff --git a/src/dis6/SetDataReliablePdu.h b/src/dis6/SetDataReliablePdu.h index bb1b32f0..c4d65aae 100644 --- a/src/dis6/SetDataReliablePdu.h +++ b/src/dis6/SetDataReliablePdu.h @@ -22,22 +22,22 @@ class OPENDIS6_EXPORT SetDataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -52,21 +52,21 @@ class OPENDIS6_EXPORT SetDataReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis6/SetRecordReliablePdu.cpp b/src/dis6/SetRecordReliablePdu.cpp index 2cacff37..2001db90 100644 --- a/src/dis6/SetRecordReliablePdu.cpp +++ b/src/dis6/SetRecordReliablePdu.cpp @@ -14,15 +14,15 @@ SetRecordReliablePdu::SetRecordReliablePdu() SetRecordReliablePdu::~SetRecordReliablePdu() { _recordSets.clear(); } -unsigned int SetRecordReliablePdu::getRequestID() const { return _requestID; } +uint32_t SetRecordReliablePdu::getRequestID() const { return _requestID; } -void SetRecordReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void SetRecordReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned char SetRecordReliablePdu::getRequiredReliabilityService() const { +uint8_t SetRecordReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void SetRecordReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void SetRecordReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -30,11 +30,11 @@ uint16_t SetRecordReliablePdu::getPad1() const { return _pad1; } void SetRecordReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char SetRecordReliablePdu::getPad2() const { return _pad2; } +uint8_t SetRecordReliablePdu::getPad2() const { return _pad2; } -void SetRecordReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void SetRecordReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int SetRecordReliablePdu::getNumberOfRecordSets() const { +uint32_t SetRecordReliablePdu::getNumberOfRecordSets() const { return _recordSets.size(); } @@ -57,7 +57,7 @@ void SetRecordReliablePdu::marshal(DataStream& dataStream) const { dataStream << _requiredReliabilityService; dataStream << _pad1; dataStream << _pad2; - dataStream << (unsigned int)_recordSets.size(); + dataStream << (uint32_t)_recordSets.size(); for (size_t idx = 0; idx < _recordSets.size(); idx++) { RecordSet x = _recordSets[idx]; diff --git a/src/dis6/SetRecordReliablePdu.h b/src/dis6/SetRecordReliablePdu.h index 0ca29c75..6c426c60 100644 --- a/src/dis6/SetRecordReliablePdu.h +++ b/src/dis6/SetRecordReliablePdu.h @@ -20,19 +20,19 @@ class OPENDIS6_EXPORT SetRecordReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Number of record sets in list */ - unsigned int _numberOfRecordSets; + uint32_t _numberOfRecordSets; /** record sets */ std::vector _recordSets; @@ -44,19 +44,19 @@ class OPENDIS6_EXPORT SetRecordReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getNumberOfRecordSets() const; + uint32_t getNumberOfRecordSets() const; std::vector& getRecordSets(); const std::vector& getRecordSets() const; diff --git a/src/dis6/SignalPdu.cpp b/src/dis6/SignalPdu.cpp index 08b0353e..b8e21b68 100644 --- a/src/dis6/SignalPdu.cpp +++ b/src/dis6/SignalPdu.cpp @@ -22,9 +22,9 @@ uint16_t SignalPdu::getTdlType() const { return _tdlType; } void SignalPdu::setTdlType(uint16_t pX) { _tdlType = pX; } -unsigned int SignalPdu::getSampleRate() const { return _sampleRate; } +uint32_t SignalPdu::getSampleRate() const { return _sampleRate; } -void SignalPdu::setSampleRate(unsigned int pX) { _sampleRate = pX; } +void SignalPdu::setSampleRate(uint32_t pX) { _sampleRate = pX; } int16_t SignalPdu::getDataLength() const { return _data.size(); } diff --git a/src/dis6/SignalPdu.h b/src/dis6/SignalPdu.h index 274d92aa..e449feb7 100644 --- a/src/dis6/SignalPdu.h +++ b/src/dis6/SignalPdu.h @@ -27,7 +27,7 @@ class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { uint16_t _tdlType; /** sample rate */ - unsigned int _sampleRate; + uint32_t _sampleRate; /** length od data */ int16_t _dataLength; @@ -51,8 +51,8 @@ class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { uint16_t getTdlType() const; void setTdlType(uint16_t pX); - unsigned int getSampleRate() const; - void setSampleRate(unsigned int pX); + uint32_t getSampleRate() const; + void setSampleRate(uint32_t pX); int16_t getDataLength() const; diff --git a/src/dis6/SixByteChunk.cpp b/src/dis6/SixByteChunk.cpp index 8d47d10e..76ef8403 100644 --- a/src/dis6/SixByteChunk.cpp +++ b/src/dis6/SixByteChunk.cpp @@ -39,7 +39,7 @@ void SixByteChunk::unmarshal(DataStream& dataStream) { bool SixByteChunk::operator==(const SixByteChunk& rhs) const { bool ivarsEqual = true; - for (unsigned char idx = 0; idx < 6; idx++) { + for (uint8_t idx = 0; idx < 6; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis6/StartResumePdu.cpp b/src/dis6/StartResumePdu.cpp index 941e3fff..e6299a51 100644 --- a/src/dis6/StartResumePdu.cpp +++ b/src/dis6/StartResumePdu.cpp @@ -32,9 +32,9 @@ void StartResumePdu::setSimulationTime(const ClockTime& pX) { _simulationTime = pX; } -unsigned int StartResumePdu::getRequestID() const { return _requestID; } +uint32_t StartResumePdu::getRequestID() const { return _requestID; } -void StartResumePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StartResumePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StartResumePdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis6/StartResumePdu.h b/src/dis6/StartResumePdu.h index 13aed820..b2d5ab09 100644 --- a/src/dis6/StartResumePdu.h +++ b/src/dis6/StartResumePdu.h @@ -22,7 +22,7 @@ class OPENDIS6_EXPORT StartResumePdu : public SimulationManagementFamilyPdu { ClockTime _simulationTime; /** Identifier for the request */ - unsigned int _requestID; + uint32_t _requestID; public: StartResumePdu(); @@ -39,8 +39,8 @@ class OPENDIS6_EXPORT StartResumePdu : public SimulationManagementFamilyPdu { const ClockTime& getSimulationTime() const; void setSimulationTime(const ClockTime& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/StartResumeReliablePdu.cpp b/src/dis6/StartResumeReliablePdu.cpp index a140ca69..04f2ec12 100644 --- a/src/dis6/StartResumeReliablePdu.cpp +++ b/src/dis6/StartResumeReliablePdu.cpp @@ -37,11 +37,11 @@ void StartResumeReliablePdu::setSimulationTime(const ClockTime& pX) { _simulationTime = pX; } -unsigned char StartResumeReliablePdu::getRequiredReliabilityService() const { +uint8_t StartResumeReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void StartResumeReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void StartResumeReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } @@ -49,13 +49,13 @@ uint16_t StartResumeReliablePdu::getPad1() const { return _pad1; } void StartResumeReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char StartResumeReliablePdu::getPad2() const { return _pad2; } +uint8_t StartResumeReliablePdu::getPad2() const { return _pad2; } -void StartResumeReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void StartResumeReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int StartResumeReliablePdu::getRequestID() const { return _requestID; } +uint32_t StartResumeReliablePdu::getRequestID() const { return _requestID; } -void StartResumeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StartResumeReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StartResumeReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis6/StartResumeReliablePdu.h b/src/dis6/StartResumeReliablePdu.h index 9f23b441..ae6668dd 100644 --- a/src/dis6/StartResumeReliablePdu.h +++ b/src/dis6/StartResumeReliablePdu.h @@ -23,16 +23,16 @@ class OPENDIS6_EXPORT StartResumeReliablePdu ClockTime _simulationTime; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: StartResumeReliablePdu(); @@ -49,17 +49,17 @@ class OPENDIS6_EXPORT StartResumeReliablePdu const ClockTime& getSimulationTime() const; void setSimulationTime(const ClockTime& pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); uint16_t getPad1() const; void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/StopFreezePdu.cpp b/src/dis6/StopFreezePdu.cpp index 0dc06040..49766974 100644 --- a/src/dis6/StopFreezePdu.cpp +++ b/src/dis6/StopFreezePdu.cpp @@ -24,15 +24,15 @@ void StopFreezePdu::setRealWorldTime(const ClockTime& pX) { _realWorldTime = pX; } -unsigned char StopFreezePdu::getReason() const { return _reason; } +uint8_t StopFreezePdu::getReason() const { return _reason; } -void StopFreezePdu::setReason(unsigned char pX) { _reason = pX; } +void StopFreezePdu::setReason(uint8_t pX) { _reason = pX; } -unsigned char StopFreezePdu::getFrozenBehavior() const { +uint8_t StopFreezePdu::getFrozenBehavior() const { return _frozenBehavior; } -void StopFreezePdu::setFrozenBehavior(unsigned char pX) { +void StopFreezePdu::setFrozenBehavior(uint8_t pX) { _frozenBehavior = pX; } @@ -40,9 +40,9 @@ int16_t StopFreezePdu::getPadding1() const { return _padding1; } void StopFreezePdu::setPadding1(int16_t pX) { _padding1 = pX; } -unsigned int StopFreezePdu::getRequestID() const { return _requestID; } +uint32_t StopFreezePdu::getRequestID() const { return _requestID; } -void StopFreezePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StopFreezePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StopFreezePdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis6/StopFreezePdu.h b/src/dis6/StopFreezePdu.h index bf199bb0..d1a4a450 100644 --- a/src/dis6/StopFreezePdu.h +++ b/src/dis6/StopFreezePdu.h @@ -19,17 +19,17 @@ class OPENDIS6_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { ClockTime _realWorldTime; /** Reason the simulation was stopped or frozen */ - unsigned char _reason; + uint8_t _reason; /** Internal behavior of the simulation and its appearance while frozento the * other participants */ - unsigned char _frozenBehavior; + uint8_t _frozenBehavior; /** padding */ int16_t _padding1; /** Request ID that is unique */ - unsigned int _requestID; + uint32_t _requestID; public: StopFreezePdu(); @@ -42,17 +42,17 @@ class OPENDIS6_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { const ClockTime& getRealWorldTime() const; void setRealWorldTime(const ClockTime& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + uint8_t getReason() const; + void setReason(uint8_t pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + uint8_t getFrozenBehavior() const; + void setFrozenBehavior(uint8_t pX); int16_t getPadding1() const; void setPadding1(int16_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/StopFreezeReliablePdu.cpp b/src/dis6/StopFreezeReliablePdu.cpp index b43a04fd..391b86b8 100644 --- a/src/dis6/StopFreezeReliablePdu.cpp +++ b/src/dis6/StopFreezeReliablePdu.cpp @@ -25,33 +25,33 @@ void StopFreezeReliablePdu::setRealWorldTime(const ClockTime& pX) { _realWorldTime = pX; } -unsigned char StopFreezeReliablePdu::getReason() const { return _reason; } +uint8_t StopFreezeReliablePdu::getReason() const { return _reason; } -void StopFreezeReliablePdu::setReason(unsigned char pX) { _reason = pX; } +void StopFreezeReliablePdu::setReason(uint8_t pX) { _reason = pX; } -unsigned char StopFreezeReliablePdu::getFrozenBehavior() const { +uint8_t StopFreezeReliablePdu::getFrozenBehavior() const { return _frozenBehavior; } -void StopFreezeReliablePdu::setFrozenBehavior(unsigned char pX) { +void StopFreezeReliablePdu::setFrozenBehavior(uint8_t pX) { _frozenBehavior = pX; } -unsigned char StopFreezeReliablePdu::getRequiredReliablityService() const { +uint8_t StopFreezeReliablePdu::getRequiredReliablityService() const { return _requiredReliablityService; } -void StopFreezeReliablePdu::setRequiredReliablityService(unsigned char pX) { +void StopFreezeReliablePdu::setRequiredReliablityService(uint8_t pX) { _requiredReliablityService = pX; } -unsigned char StopFreezeReliablePdu::getPad1() const { return _pad1; } +uint8_t StopFreezeReliablePdu::getPad1() const { return _pad1; } -void StopFreezeReliablePdu::setPad1(unsigned char pX) { _pad1 = pX; } +void StopFreezeReliablePdu::setPad1(uint8_t pX) { _pad1 = pX; } -unsigned int StopFreezeReliablePdu::getRequestID() const { return _requestID; } +uint32_t StopFreezeReliablePdu::getRequestID() const { return _requestID; } -void StopFreezeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StopFreezeReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StopFreezeReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis6/StopFreezeReliablePdu.h b/src/dis6/StopFreezeReliablePdu.h index ec283324..0c2eca4e 100644 --- a/src/dis6/StopFreezeReliablePdu.h +++ b/src/dis6/StopFreezeReliablePdu.h @@ -20,19 +20,19 @@ class OPENDIS6_EXPORT StopFreezeReliablePdu ClockTime _realWorldTime; /** Reason for stopping/freezing simulation */ - unsigned char _reason; + uint8_t _reason; /** internal behvior of the simulation while frozen */ - unsigned char _frozenBehavior; + uint8_t _frozenBehavior; /** reliablity level */ - unsigned char _requiredReliablityService; + uint8_t _requiredReliablityService; /** padding */ - unsigned char _pad1; + uint8_t _pad1; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: StopFreezeReliablePdu(); @@ -45,20 +45,20 @@ class OPENDIS6_EXPORT StopFreezeReliablePdu const ClockTime& getRealWorldTime() const; void setRealWorldTime(const ClockTime& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + uint8_t getReason() const; + void setReason(uint8_t pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + uint8_t getFrozenBehavior() const; + void setFrozenBehavior(uint8_t pX); - unsigned char getRequiredReliablityService() const; - void setRequiredReliablityService(unsigned char pX); + uint8_t getRequiredReliablityService() const; + void setRequiredReliablityService(uint8_t pX); - unsigned char getPad1() const; - void setPad1(unsigned char pX); + uint8_t getPad1() const; + void setPad1(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/SupplyQuantity.cpp b/src/dis6/SupplyQuantity.cpp index 56acaaaf..b48c40db 100644 --- a/src/dis6/SupplyQuantity.cpp +++ b/src/dis6/SupplyQuantity.cpp @@ -12,9 +12,9 @@ const EntityType& SupplyQuantity::getSupplyType() const { return _supplyType; } void SupplyQuantity::setSupplyType(const EntityType& pX) { _supplyType = pX; } -unsigned char SupplyQuantity::getQuantity() const { return _quantity; } +uint8_t SupplyQuantity::getQuantity() const { return _quantity; } -void SupplyQuantity::setQuantity(unsigned char pX) { _quantity = pX; } +void SupplyQuantity::setQuantity(uint8_t pX) { _quantity = pX; } void SupplyQuantity::marshal(DataStream& dataStream) const { _supplyType.marshal(dataStream); diff --git a/src/dis6/SupplyQuantity.h b/src/dis6/SupplyQuantity.h index 6b35ed3d..f41e8de6 100644 --- a/src/dis6/SupplyQuantity.h +++ b/src/dis6/SupplyQuantity.h @@ -19,7 +19,7 @@ class OPENDIS6_EXPORT SupplyQuantity { EntityType _supplyType; /** quantity to be supplied */ - unsigned char _quantity; + uint8_t _quantity; public: SupplyQuantity(); @@ -32,8 +32,8 @@ class OPENDIS6_EXPORT SupplyQuantity { const EntityType& getSupplyType() const; void setSupplyType(const EntityType& pX); - unsigned char getQuantity() const; - void setQuantity(unsigned char pX); + uint8_t getQuantity() const; + void setQuantity(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/SystemID.cpp b/src/dis6/SystemID.cpp index 819b74ba..5f64da40 100644 --- a/src/dis6/SystemID.cpp +++ b/src/dis6/SystemID.cpp @@ -15,13 +15,13 @@ uint16_t SystemID::getSystemName() const { return _systemName; } void SystemID::setSystemName(uint16_t pX) { _systemName = pX; } -unsigned char SystemID::getSystemMode() const { return _systemMode; } +uint8_t SystemID::getSystemMode() const { return _systemMode; } -void SystemID::setSystemMode(unsigned char pX) { _systemMode = pX; } +void SystemID::setSystemMode(uint8_t pX) { _systemMode = pX; } -unsigned char SystemID::getChangeOptions() const { return _changeOptions; } +uint8_t SystemID::getChangeOptions() const { return _changeOptions; } -void SystemID::setChangeOptions(unsigned char pX) { _changeOptions = pX; } +void SystemID::setChangeOptions(uint8_t pX) { _changeOptions = pX; } void SystemID::marshal(DataStream& dataStream) const { dataStream << _systemType; diff --git a/src/dis6/SystemID.h b/src/dis6/SystemID.h index bfd8d6b0..1e2c6b93 100644 --- a/src/dis6/SystemID.h +++ b/src/dis6/SystemID.h @@ -20,10 +20,10 @@ class OPENDIS6_EXPORT SystemID { uint16_t _systemName; /** System mode */ - unsigned char _systemMode; + uint8_t _systemMode; /** Change Options */ - unsigned char _changeOptions; + uint8_t _changeOptions; public: SystemID(); @@ -38,11 +38,11 @@ class OPENDIS6_EXPORT SystemID { uint16_t getSystemName() const; void setSystemName(uint16_t pX); - unsigned char getSystemMode() const; - void setSystemMode(unsigned char pX); + uint8_t getSystemMode() const; + void setSystemMode(uint8_t pX); - unsigned char getChangeOptions() const; - void setChangeOptions(unsigned char pX); + uint8_t getChangeOptions() const; + void setChangeOptions(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/TrackJamTarget.cpp b/src/dis6/TrackJamTarget.cpp index 92baa9b8..8129c822 100644 --- a/src/dis6/TrackJamTarget.cpp +++ b/src/dis6/TrackJamTarget.cpp @@ -12,13 +12,13 @@ const EntityID& TrackJamTarget::getTrackJam() const { return _trackJam; } void TrackJamTarget::setTrackJam(const EntityID& pX) { _trackJam = pX; } -unsigned char TrackJamTarget::getEmitterID() const { return _emitterID; } +uint8_t TrackJamTarget::getEmitterID() const { return _emitterID; } -void TrackJamTarget::setEmitterID(unsigned char pX) { _emitterID = pX; } +void TrackJamTarget::setEmitterID(uint8_t pX) { _emitterID = pX; } -unsigned char TrackJamTarget::getBeamID() const { return _beamID; } +uint8_t TrackJamTarget::getBeamID() const { return _beamID; } -void TrackJamTarget::setBeamID(unsigned char pX) { _beamID = pX; } +void TrackJamTarget::setBeamID(uint8_t pX) { _beamID = pX; } void TrackJamTarget::marshal(DataStream& dataStream) const { _trackJam.marshal(dataStream); diff --git a/src/dis6/TrackJamTarget.h b/src/dis6/TrackJamTarget.h index 5fea4bce..0d6aae47 100644 --- a/src/dis6/TrackJamTarget.h +++ b/src/dis6/TrackJamTarget.h @@ -18,10 +18,10 @@ class OPENDIS6_EXPORT TrackJamTarget { EntityID _trackJam; /** Emitter ID */ - unsigned char _emitterID; + uint8_t _emitterID; /** beam ID */ - unsigned char _beamID; + uint8_t _beamID; public: TrackJamTarget(); @@ -34,11 +34,11 @@ class OPENDIS6_EXPORT TrackJamTarget { const EntityID& getTrackJam() const; void setTrackJam(const EntityID& pX); - unsigned char getEmitterID() const; - void setEmitterID(unsigned char pX); + uint8_t getEmitterID() const; + void setEmitterID(uint8_t pX); - unsigned char getBeamID() const; - void setBeamID(unsigned char pX); + uint8_t getBeamID() const; + void setBeamID(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis6/TransferControlRequestPdu.cpp b/src/dis6/TransferControlRequestPdu.cpp index fa3048f5..5dd582af 100644 --- a/src/dis6/TransferControlRequestPdu.cpp +++ b/src/dis6/TransferControlRequestPdu.cpp @@ -40,28 +40,28 @@ void TransferControlRequestPdu::setRecevingEntityID(const EntityID& pX) { _recevingEntityID = pX; } -unsigned int TransferControlRequestPdu::getRequestID() const { +uint32_t TransferControlRequestPdu::getRequestID() const { return _requestID; } -void TransferControlRequestPdu::setRequestID(unsigned int pX) { +void TransferControlRequestPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned char TransferControlRequestPdu::getRequiredReliabilityService() const { +uint8_t TransferControlRequestPdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } void TransferControlRequestPdu::setRequiredReliabilityService( - unsigned char pX) { + uint8_t pX) { _requiredReliabilityService = pX; } -unsigned char TransferControlRequestPdu::getTranferType() const { +uint8_t TransferControlRequestPdu::getTranferType() const { return _tranferType; } -void TransferControlRequestPdu::setTranferType(unsigned char pX) { +void TransferControlRequestPdu::setTranferType(uint8_t pX) { _tranferType = pX; } @@ -77,7 +77,7 @@ void TransferControlRequestPdu::setTransferEntityID(const EntityID& pX) { _transferEntityID = pX; } -unsigned char TransferControlRequestPdu::getNumberOfRecordSets() const { +uint8_t TransferControlRequestPdu::getNumberOfRecordSets() const { return _recordSets.size(); } @@ -103,7 +103,7 @@ void TransferControlRequestPdu::marshal(DataStream& dataStream) const { dataStream << _requiredReliabilityService; dataStream << _tranferType; _transferEntityID.marshal(dataStream); - dataStream << (unsigned char)_recordSets.size(); + dataStream << (uint8_t)_recordSets.size(); for (size_t idx = 0; idx < _recordSets.size(); idx++) { RecordSet x = _recordSets[idx]; diff --git a/src/dis6/TransferControlRequestPdu.h b/src/dis6/TransferControlRequestPdu.h index 15d1c8db..3869d7df 100644 --- a/src/dis6/TransferControlRequestPdu.h +++ b/src/dis6/TransferControlRequestPdu.h @@ -28,19 +28,19 @@ class OPENDIS6_EXPORT TransferControlRequestPdu EntityID _recevingEntityID; /** ID ofrequest */ - unsigned int _requestID; + uint32_t _requestID; /** required level of reliabliity service. */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** type of transfer desired */ - unsigned char _tranferType; + uint8_t _tranferType; /** The entity for which control is being requested to transfer */ EntityID _transferEntityID; /** number of record sets to transfer */ - unsigned char _numberOfRecordSets; + uint8_t _numberOfRecordSets; /** ^^^This is wrong--the RecordSet class needs more work */ std::vector _recordSets; @@ -60,20 +60,20 @@ class OPENDIS6_EXPORT TransferControlRequestPdu const EntityID& getRecevingEntityID() const; void setRecevingEntityID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned char getTranferType() const; - void setTranferType(unsigned char pX); + uint8_t getTranferType() const; + void setTranferType(uint8_t pX); EntityID& getTransferEntityID(); const EntityID& getTransferEntityID() const; void setTransferEntityID(const EntityID& pX); - unsigned char getNumberOfRecordSets() const; + uint8_t getNumberOfRecordSets() const; std::vector& getRecordSets(); const std::vector& getRecordSets() const; diff --git a/src/dis6/TransmitterPdu.cpp b/src/dis6/TransmitterPdu.cpp index b0a24c41..09566a17 100644 --- a/src/dis6/TransmitterPdu.cpp +++ b/src/dis6/TransmitterPdu.cpp @@ -41,15 +41,15 @@ void TransmitterPdu::setRadioEntityType(const RadioEntityType& pX) { _radioEntityType = pX; } -unsigned char TransmitterPdu::getTransmitState() const { +uint8_t TransmitterPdu::getTransmitState() const { return _transmitState; } -void TransmitterPdu::setTransmitState(unsigned char pX) { _transmitState = pX; } +void TransmitterPdu::setTransmitState(uint8_t pX) { _transmitState = pX; } -unsigned char TransmitterPdu::getInputSource() const { return _inputSource; } +uint8_t TransmitterPdu::getInputSource() const { return _inputSource; } -void TransmitterPdu::setInputSource(unsigned char pX) { _inputSource = pX; } +void TransmitterPdu::setInputSource(uint8_t pX) { _inputSource = pX; } uint16_t TransmitterPdu::getPadding1() const { return _padding1; } @@ -123,7 +123,7 @@ uint16_t TransmitterPdu::getCryptoKeyId() const { return _cryptoKeyId; } void TransmitterPdu::setCryptoKeyId(uint16_t pX) { _cryptoKeyId = pX; } -unsigned char TransmitterPdu::getModulationParameterCount() const { +uint8_t TransmitterPdu::getModulationParameterCount() const { return _modulationParametersList.size(); } @@ -131,9 +131,9 @@ uint16_t TransmitterPdu::getPadding2() const { return _padding2; } void TransmitterPdu::setPadding2(uint16_t pX) { _padding2 = pX; } -unsigned char TransmitterPdu::getPadding3() const { return _padding3; } +uint8_t TransmitterPdu::getPadding3() const { return _padding3; } -void TransmitterPdu::setPadding3(unsigned char pX) { _padding3 = pX; } +void TransmitterPdu::setPadding3(uint8_t pX) { _padding3 = pX; } std::vector& TransmitterPdu::getModulationParametersList() { return _modulationParametersList; @@ -179,7 +179,7 @@ void TransmitterPdu::marshal(DataStream& dataStream) const { _modulationType.marshal(dataStream); dataStream << _cryptoSystem; dataStream << _cryptoKeyId; - dataStream << (unsigned char)_modulationParametersList.size(); + dataStream << (uint8_t)_modulationParametersList.size(); dataStream << _padding2; dataStream << _padding3; diff --git a/src/dis6/TransmitterPdu.h b/src/dis6/TransmitterPdu.h index 95ce3c26..93f315e5 100644 --- a/src/dis6/TransmitterPdu.h +++ b/src/dis6/TransmitterPdu.h @@ -26,10 +26,10 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { RadioEntityType _radioEntityType; /** transmit state */ - unsigned char _transmitState; + uint8_t _transmitState; /** input source */ - unsigned char _inputSource; + uint8_t _inputSource; /** padding */ uint16_t _padding1; @@ -65,13 +65,13 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { uint16_t _cryptoKeyId; /** how many modulation parameters we have */ - unsigned char _modulationParameterCount; + uint8_t _modulationParameterCount; /** padding2 */ uint16_t _padding2; /** padding3 */ - unsigned char _padding3; + uint8_t _padding3; /** variable length list of modulation parameters */ std::vector _modulationParametersList; @@ -90,11 +90,11 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { const RadioEntityType& getRadioEntityType() const; void setRadioEntityType(const RadioEntityType& pX); - unsigned char getTransmitState() const; - void setTransmitState(unsigned char pX); + uint8_t getTransmitState() const; + void setTransmitState(uint8_t pX); - unsigned char getInputSource() const; - void setInputSource(unsigned char pX); + uint8_t getInputSource() const; + void setInputSource(uint8_t pX); uint16_t getPadding1() const; void setPadding1(uint16_t pX); @@ -131,13 +131,13 @@ class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { uint16_t getCryptoKeyId() const; void setCryptoKeyId(uint16_t pX); - unsigned char getModulationParameterCount() const; + uint8_t getModulationParameterCount() const; uint16_t getPadding2() const; void setPadding2(uint16_t pX); - unsigned char getPadding3() const; - void setPadding3(unsigned char pX); + uint8_t getPadding3() const; + void setPadding3(uint8_t pX); std::vector& getModulationParametersList(); const std::vector& getModulationParametersList() const; diff --git a/src/dis6/TwoByteChunk.cpp b/src/dis6/TwoByteChunk.cpp index bffb78c2..aec852fe 100644 --- a/src/dis6/TwoByteChunk.cpp +++ b/src/dis6/TwoByteChunk.cpp @@ -39,7 +39,7 @@ void TwoByteChunk::unmarshal(DataStream& dataStream) { bool TwoByteChunk::operator==(const TwoByteChunk& rhs) const { bool ivarsEqual = true; - for (unsigned char idx = 0; idx < 2; idx++) { + for (uint8_t idx = 0; idx < 2; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis6/UaPdu.cpp b/src/dis6/UaPdu.cpp index b45c0750..7f374cfc 100644 --- a/src/dis6/UaPdu.cpp +++ b/src/dis6/UaPdu.cpp @@ -50,19 +50,19 @@ void UaPdu::setPassiveParameterIndex(uint16_t pX) { _passiveParameterIndex = pX; } -unsigned char UaPdu::getPropulsionPlantConfiguration() const { +uint8_t UaPdu::getPropulsionPlantConfiguration() const { return _propulsionPlantConfiguration; } -void UaPdu::setPropulsionPlantConfiguration(unsigned char pX) { +void UaPdu::setPropulsionPlantConfiguration(uint8_t pX) { _propulsionPlantConfiguration = pX; } -unsigned char UaPdu::getNumberOfShafts() const { return _shaftRPMs.size(); } +uint8_t UaPdu::getNumberOfShafts() const { return _shaftRPMs.size(); } -unsigned char UaPdu::getNumberOfAPAs() const { return _apaData.size(); } +uint8_t UaPdu::getNumberOfAPAs() const { return _apaData.size(); } -unsigned char UaPdu::getNumberOfUAEmitterSystems() const { +uint8_t UaPdu::getNumberOfUAEmitterSystems() const { return _emitterSystems.size(); } @@ -100,9 +100,9 @@ void UaPdu::marshal(DataStream& dataStream) const { dataStream << _pad; dataStream << _passiveParameterIndex; dataStream << _propulsionPlantConfiguration; - dataStream << (unsigned char)_shaftRPMs.size(); - dataStream << (unsigned char)_apaData.size(); - dataStream << (unsigned char)_emitterSystems.size(); + dataStream << (uint8_t)_shaftRPMs.size(); + dataStream << (uint8_t)_apaData.size(); + dataStream << (uint8_t)_emitterSystems.size(); for (size_t idx = 0; idx < _shaftRPMs.size(); idx++) { ShaftRPMs x = _shaftRPMs[idx]; diff --git a/src/dis6/UaPdu.h b/src/dis6/UaPdu.h index cb262800..bb03ec4d 100644 --- a/src/dis6/UaPdu.h +++ b/src/dis6/UaPdu.h @@ -47,18 +47,18 @@ class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { /** This field shall specify the entity propulsion plant configuration. This * field is used to determine the passive signature characteristics of an * entity. */ - unsigned char _propulsionPlantConfiguration; + uint8_t _propulsionPlantConfiguration; /** This field shall represent the number of shafts on a platform */ - unsigned char _numberOfShafts; + uint8_t _numberOfShafts; /** This field shall indicate the number of APAs described in the current UA * PDU */ - unsigned char _numberOfAPAs; + uint8_t _numberOfAPAs; /** This field shall specify the number of UA emitter systems being described * in the current UA PDU */ - unsigned char _numberOfUAEmitterSystems; + uint8_t _numberOfUAEmitterSystems; /** shaft RPM values */ std::vector _shaftRPMs; @@ -92,14 +92,14 @@ class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { uint16_t getPassiveParameterIndex() const; void setPassiveParameterIndex(uint16_t pX); - unsigned char getPropulsionPlantConfiguration() const; - void setPropulsionPlantConfiguration(unsigned char pX); + uint8_t getPropulsionPlantConfiguration() const; + void setPropulsionPlantConfiguration(uint8_t pX); - unsigned char getNumberOfShafts() const; + uint8_t getNumberOfShafts() const; - unsigned char getNumberOfAPAs() const; + uint8_t getNumberOfAPAs() const; - unsigned char getNumberOfUAEmitterSystems() const; + uint8_t getNumberOfUAEmitterSystems() const; std::vector& getShaftRPMs(); const std::vector& getShaftRPMs() const; diff --git a/src/dis6/VariableDatum.cpp b/src/dis6/VariableDatum.cpp index 4fe56348..1c105f53 100644 --- a/src/dis6/VariableDatum.cpp +++ b/src/dis6/VariableDatum.cpp @@ -15,19 +15,19 @@ VariableDatum::~VariableDatum() { // delete [] _variableDatums; } -unsigned int VariableDatum::getVariableDatumID() const { +uint32_t VariableDatum::getVariableDatumID() const { return _variableDatumID; } -void VariableDatum::setVariableDatumID(unsigned int pX) { +void VariableDatum::setVariableDatumID(uint32_t pX) { _variableDatumID = pX; } -unsigned int VariableDatum::getVariableDatumLength() const { +uint32_t VariableDatum::getVariableDatumLength() const { return _variableDatumLength; } -void VariableDatum::setVariableDatumLength(unsigned int pX) { +void VariableDatum::setVariableDatumLength(uint32_t pX) { _variableDatumLength = pX; } @@ -42,12 +42,12 @@ const char* VariableDatum::getVariableDatums() const { } void VariableDatum::setVariableDatums(const char* x, - const unsigned int length) { + const uint32_t length) { // convert and store length as bits _variableDatumLength = length * 8; // Figure out _arrayLength (including padding to force whole 8 byte chunks) - unsigned int chunks = length / 8; + uint32_t chunks = length / 8; int remainder = length % 8; if (remainder > 0) chunks++; _arrayLength = chunks * 8; @@ -90,7 +90,7 @@ void VariableDatum::unmarshal(DataStream& dataStream) { if (_variableDatums.size() < _arrayLength) _variableDatums.resize(_arrayLength); - for (unsigned int idx = 0; idx < _arrayLength; idx++) { + for (uint32_t idx = 0; idx < _arrayLength; idx++) { dataStream >> _variableDatums[idx]; // std::cout << (int)_variableDatums[idx] << " "; } @@ -121,8 +121,8 @@ bool VariableDatum::operator==(const VariableDatum& rhs) const { return ivarsEqual; } -unsigned int VariableDatum::getMarshalledSize() const { - unsigned int marshalSize = 0; +uint32_t VariableDatum::getMarshalledSize() const { + uint32_t marshalSize = 0; marshalSize = marshalSize + 4; // _variableDatumID marshalSize = marshalSize + 4; // _variableDatumLength diff --git a/src/dis6/VariableDatum.h b/src/dis6/VariableDatum.h index 794bc2b8..b9fd5a0f 100644 --- a/src/dis6/VariableDatum.h +++ b/src/dis6/VariableDatum.h @@ -20,14 +20,14 @@ namespace DIS { class OPENDIS6_EXPORT VariableDatum { protected: /** ID of the variable datum */ - unsigned int _variableDatumID; + uint32_t _variableDatumID; /** length of the variable datums */ - unsigned int _variableDatumLength; + uint32_t _variableDatumLength; /** The variable datum data.*/ std::vector _variableDatums; - unsigned int _arrayLength; + uint32_t _arrayLength; public: VariableDatum(); @@ -36,17 +36,17 @@ class OPENDIS6_EXPORT VariableDatum { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getVariableDatumID() const; - void setVariableDatumID(unsigned int pX); + uint32_t getVariableDatumID() const; + void setVariableDatumID(uint32_t pX); - unsigned int getVariableDatumLength() const; - void setVariableDatumLength(unsigned int pX); + uint32_t getVariableDatumLength() const; + void setVariableDatumLength(uint32_t pX); char* getVariableDatums(); const char* getVariableDatums() const; - void setVariableDatums(const char* pX, const unsigned int length); + void setVariableDatums(const char* pX, const uint32_t length); - virtual unsigned int getMarshalledSize() const; + virtual uint32_t getMarshalledSize() const; bool operator==(const VariableDatum& rhs) const; }; diff --git a/src/dis6/symbolic_names.h b/src/dis6/symbolic_names.h index b117fd0c..0a17b2de 100644 --- a/src/dis6/symbolic_names.h +++ b/src/dis6/symbolic_names.h @@ -6,78 +6,78 @@ * Symbolic names as defined in 5.1.4 */ namespace DIS { -const unsigned int AGG_HRT_BEAT_TIMER = 30U; // s -const unsigned int AGG_RESPONSE_DFLT = 10U; // s +const uint32_t AGG_HRT_BEAT_TIMER = 30U; // s +const uint32_t AGG_RESPONSE_DFLT = 10U; // s const uint16_t ALL_AGGS = 0xFFFFU; const uint16_t ALL_APPLIC = 0xFFFFU; const uint16_t ALL_ENTITIES = 0xFFFFU; const uint16_t ALL_OBJECTS = 0xFFFFU; const uint16_t ALL_SITES = 0xFFFFU; -const unsigned int APPEAR_HRT_BEAT_TIMER = 60U; // se -const unsigned int COLLISION_ELASTIC_TO = 5U; // s -const unsigned int COLLISION_THRSH_DFLT = 1U; // m/s +const uint32_t APPEAR_HRT_BEAT_TIMER = 60U; // se +const uint32_t COLLISION_ELASTIC_TO = 5U; // s +const uint32_t COLLISION_THRSH_DFLT = 1U; // m/s -const unsigned int DRA_ORIENT_THRSH_DFLT = 3U; // degrees -const unsigned int DRA_POS_THRSH_DFLT = 1U; // m -const unsigned int EE_AZ_THRSH_DFLT = 1U; // degrees -const unsigned int EE_EL_THRSH_DFLT = 1U; // degrees +const uint32_t DRA_ORIENT_THRSH_DFLT = 3U; // degrees +const uint32_t DRA_POS_THRSH_DFLT = 1U; // m +const uint32_t EE_AZ_THRSH_DFLT = 1U; // degrees +const uint32_t EE_EL_THRSH_DFLT = 1U; // degrees -const unsigned int EP_DIMENSION_THRSH_DFLT = 1U; // m +const uint32_t EP_DIMENSION_THRSH_DFLT = 1U; // m const uint16_t EP_NO_SEQUENCE = 0xFFFFU; -const unsigned int EP_POS_THRSH_DFLT = 1U; // m shift -const unsigned int EP_STATE_THRSH_DFLT = 10U; //% -const unsigned int GD_HRT_BEAT_TIMER = 15U; // min -const unsigned int HRT_BEAT_MOVE_TIMER = 2U; // s +const uint32_t EP_POS_THRSH_DFLT = 1U; // m shift +const uint32_t EP_STATE_THRSH_DFLT = 10U; //% +const uint32_t GD_HRT_BEAT_TIMER = 15U; // min +const uint32_t HRT_BEAT_MOVE_TIMER = 2U; // s const float HRT_BEAT_MPLIER = 2.4f; -const unsigned int HRT_BEAT_TIMER = 5U; // s -const unsigned int IFF_ATC_NAVAIDS_DFLT = 10U; // s -const unsigned int IFF_ATC_NAVAIDS_CLAT = 2U; // s -const unsigned int LE_HRT_BEAT_TIMER = 30; // s +const uint32_t HRT_BEAT_TIMER = 5U; // s +const uint32_t IFF_ATC_NAVAIDS_DFLT = 10U; // s +const uint32_t IFF_ATC_NAVAIDS_CLAT = 2U; // s +const uint32_t LE_HRT_BEAT_TIMER = 30; // s // MINEFIELD_CHANGE_DFLT between 0 and MINEFIELD_DATA_DFLT -const unsigned int MINEFIELD_DATA_DFLT = 5U; // s -const unsigned int MINEFIELD_DATA_TIMEOUT_DLFT = 5U; // s -const unsigned int MINEFIELD_DFLT = 5U; // s -const unsigned int MINEFIELD_RESPONSE_DFLT = 1U; // s +const uint32_t MINEFIELD_DATA_DFLT = 5U; // s +const uint32_t MINEFIELD_DATA_TIMEOUT_DLFT = 5U; // s +const uint32_t MINEFIELD_DFLT = 5U; // s +const uint32_t MINEFIELD_RESPONSE_DFLT = 1U; // s const uint16_t NO_AGG = 0U; const uint16_t NO_APPLIC = 0U; const uint16_t NO_ENTITY = 0U; -const unsigned int NO_FIRE_MISSION = 0U; +const uint32_t NO_FIRE_MISSION = 0U; const uint16_t NO_OBJECT = 0U; const uint16_t NO_SITE = 0U; -const unsigned int REPAR_REC_T1_DFLT = 5U; // s -const unsigned int REPAR_SUP_T1_DFLT = 12U; // s -const unsigned int REPAR_SUP_T2_DFLT = 12U; // s -const unsigned int RESUP_REC_T1_DFLT = 5U; // s -const unsigned int RESUP_REC_T2_DFLT = 55U; // s -const unsigned int RESUP_SUP_T1_DFLT = 1U; // min +const uint32_t REPAR_REC_T1_DFLT = 5U; // s +const uint32_t REPAR_SUP_T1_DFLT = 12U; // s +const uint32_t REPAR_SUP_T2_DFLT = 12U; // s +const uint32_t RESUP_REC_T1_DFLT = 5U; // s +const uint32_t RESUP_REC_T2_DFLT = 55U; // s +const uint32_t RESUP_SUP_T1_DFLT = 1U; // min const uint16_t RQST_ASSIGN_ID = 0xFFFEU; -const unsigned int SEES_NDA_THRSH_DFLT = +const uint32_t SEES_NDA_THRSH_DFLT = 2U; // degrees in the axis of deflection -const unsigned int SEES_PS_THRSH_DFLT = +const uint32_t SEES_PS_THRSH_DFLT = 10U; //% of the maximum value of the Power Setting -const unsigned int SEES_RPM_DELTA_THRSH_DFLT = +const uint32_t SEES_RPM_DELTA_THRSH_DFLT = 5U; //% of the maximum engine speed in RPM -const unsigned int SEES_STATE_UPDATE_DFLT = 3U; // min -const unsigned int SM_REL_RETRY_CNT_DFLT = 3U; -const unsigned int SM_REL_RETRY_DELAY_DFLT = 2U; // s +const uint32_t SEES_STATE_UPDATE_DFLT = 3U; // min +const uint32_t SM_REL_RETRY_CNT_DFLT = 3U; +const uint32_t SM_REL_RETRY_DELAY_DFLT = 2U; // s -const unsigned int TARGETS_IN_TJ_FIELD_DFLT = 10U; -const unsigned int TI_TIMER1_DFLT = 2U; // s -const unsigned int TI_TIMER2_DFLT = 12U; // s -const unsigned int TR_TIMER1_DFLT = 5U; // s -const unsigned int TR_TIMER2_DFLT = 60U; // s -const unsigned int TRANS_ORIENT_THRSH_DFLT = 180U; // degrees -const unsigned int TRANS_POS_THRSH_DFLT = 500U; // m -const unsigned int UA_LOCATION_CHANGE_DELTA = 10U; // m -const unsigned int UA_ORIENTATION_CHANGE_DELTA = 2U; // degrees -const unsigned int UA_SRPM_CHANGE_DELTA = 5U; //% of maximum shaft speed in RPM -const unsigned int UA_SRPM_ROC_CHANGE_DELTA = +const uint32_t TARGETS_IN_TJ_FIELD_DFLT = 10U; +const uint32_t TI_TIMER1_DFLT = 2U; // s +const uint32_t TI_TIMER2_DFLT = 12U; // s +const uint32_t TR_TIMER1_DFLT = 5U; // s +const uint32_t TR_TIMER2_DFLT = 60U; // s +const uint32_t TRANS_ORIENT_THRSH_DFLT = 180U; // degrees +const uint32_t TRANS_POS_THRSH_DFLT = 500U; // m +const uint32_t UA_LOCATION_CHANGE_DELTA = 10U; // m +const uint32_t UA_ORIENTATION_CHANGE_DELTA = 2U; // degrees +const uint32_t UA_SRPM_CHANGE_DELTA = 5U; //% of maximum shaft speed in RPM +const uint32_t UA_SRPM_ROC_CHANGE_DELTA = 10U; //% of maximum rate of change -const unsigned int UA_STATE_UPDATE_HRT_BEAT_TIMER = 3U; // min +const uint32_t UA_STATE_UPDATE_HRT_BEAT_TIMER = 3U; // min /** If you want to have the EntityID constants below, you * need to add the constructor EntityID(uint16_t,uint16_t,unsigned diff --git a/src/dis6/utils/Conversion.cpp b/src/dis6/utils/Conversion.cpp index 57da99a0..5b73270b 100644 --- a/src/dis6/utils/Conversion.cpp +++ b/src/dis6/utils/Conversion.cpp @@ -3,7 +3,7 @@ using namespace DIS; -// const unsigned char +// const uint8_t // Convert::ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; int Convert::MakeArticulationParameterType(int typeclass, int typemetric) { diff --git a/src/dis6/utils/Conversion.h b/src/dis6/utils/Conversion.h index c4ff7b70..105ca95c 100644 --- a/src/dis6/utils/Conversion.h +++ b/src/dis6/utils/Conversion.h @@ -6,6 +6,8 @@ #ifndef _dcl_dis_conversion_h_ #define _dcl_dis_conversion_h_ +#include + #include // for library symbols namespace DIS { @@ -14,8 +16,7 @@ struct OPENDIS6_EXPORT Convert { /// the number of bits used to store the type metric value /// within the Articulation Parameter's parameter type value. /// this mask is based on the IEEE Std 1278.1-1995 - static const unsigned char ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = - 5; + static const uint8_t ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; /// make the value needed for the ArticulationParameter's Parameter Type. /// @param typeclass the enumeration for the articulated part. diff --git a/src/dis6/utils/DataStream.cpp b/src/dis6/utils/DataStream.cpp index f129325b..49cd87b7 100644 --- a/src/dis6/utils/DataStream.cpp +++ b/src/dis6/utils/DataStream.cpp @@ -62,7 +62,7 @@ void DataStream::clear() { bool DataStream::empty() const { return _buffer.empty(); } -const char& DataStream::operator[](unsigned int offset) const { +const char& DataStream::operator[](uint32_t offset) const { return _buffer[_read_pos + offset]; } @@ -81,7 +81,7 @@ void DataStream::SetStream(const char* buffer, size_t length, Endian stream) { // take ownership of the data // copy the data, expensive! - for (unsigned int i = 0; i < length; ++i) { + for (uint32_t i = 0; i < length; ++i) { _buffer[i] = buffer[i]; } } @@ -108,7 +108,7 @@ void DataStream::DoFlip(char* buf, size_t bufsize) { } void DataStream::DoWrite(const char* buf, size_t bufsize) { - for (unsigned int i = 0; i < bufsize; ++i) { + for (uint32_t i = 0; i < bufsize; ++i) { // ignores the _write_pos value currently, // this should allow for values to always be appended to the end of the // buffer. @@ -117,7 +117,7 @@ void DataStream::DoWrite(const char* buf, size_t bufsize) { } void DataStream::DoRead(char* ch, size_t bufsize) { - for (unsigned int i = 0; i < bufsize; i++) { + for (uint32_t i = 0; i < bufsize; i++) { ch[i] = _buffer.at(_read_pos + i); } } @@ -128,7 +128,7 @@ DataStream& DataStream::operator<<(char c) { return *this; } -DataStream& DataStream::operator<<(unsigned char c) { +DataStream& DataStream::operator<<(uint8_t c) { WriteAlgorithm(c); return *this; } @@ -148,7 +148,7 @@ DataStream& DataStream::operator<<(int d) { return *this; } -DataStream& DataStream::operator<<(unsigned int d) { +DataStream& DataStream::operator<<(uint32_t d) { WriteAlgorithm(d); return *this; } @@ -179,7 +179,7 @@ DataStream& DataStream::operator>>(char& c) { return *this; } -DataStream& DataStream::operator>>(unsigned char& c) { +DataStream& DataStream::operator>>(uint8_t& c) { ReadAlgorithm(c); return *this; } @@ -199,7 +199,7 @@ DataStream& DataStream::operator>>(int& d) { return *this; } -DataStream& DataStream::operator>>(unsigned int& d) { +DataStream& DataStream::operator>>(uint32_t& d) { ReadAlgorithm(d); return *this; } diff --git a/src/dis6/utils/DataStream.h b/src/dis6/utils/DataStream.h index b9a4f15a..adba5b36 100644 --- a/src/dis6/utils/DataStream.h +++ b/src/dis6/utils/DataStream.h @@ -41,7 +41,7 @@ class OPENDIS6_EXPORT DataStream { /// a method for reading the stored buffer data. /// @param offset the index distance with respect to the current read point. - const char& operator[](unsigned int offset) const; + const char& operator[](uint32_t offset) const; /// take ownership of the data buffer. void SetStream(const char* buffer, size_t length, Endian order); @@ -49,11 +49,11 @@ class OPENDIS6_EXPORT DataStream { // write operations DataStream& operator<<(bool c); DataStream& operator<<(char c); - DataStream& operator<<(unsigned char c); + DataStream& operator<<(uint8_t c); DataStream& operator<<(float c); DataStream& operator<<(double c); DataStream& operator<<(int c); - DataStream& operator<<(unsigned int c); + DataStream& operator<<(uint32_t c); DataStream& operator<<(int64_t c); DataStream& operator<<(uint64_t c); DataStream& operator<<(uint16_t c); @@ -62,11 +62,11 @@ class OPENDIS6_EXPORT DataStream { // read operations DataStream& operator>>(bool& c); DataStream& operator>>(char& c); - DataStream& operator>>(unsigned char& c); + DataStream& operator>>(uint8_t& c); DataStream& operator>>(float& c); DataStream& operator>>(double& c); DataStream& operator>>(int& c); - DataStream& operator>>(unsigned int& c); + DataStream& operator>>(uint32_t& c); DataStream& operator>>(int64_t& c); DataStream& operator>>(uint64_t& c); DataStream& operator>>(uint16_t& c); diff --git a/src/dis6/utils/IBufferProcessor.h b/src/dis6/utils/IBufferProcessor.h index a18c4db5..c84e0d09 100644 --- a/src/dis6/utils/IBufferProcessor.h +++ b/src/dis6/utils/IBufferProcessor.h @@ -12,7 +12,7 @@ namespace DIS { class IBufferProcessor { public: virtual ~IBufferProcessor() {} - virtual void Process(const char* buf, unsigned int size, Endian e) = 0; + virtual void Process(const char* buf, uint32_t size, Endian e) = 0; }; } // namespace DIS diff --git a/src/dis6/utils/IPduBank.h b/src/dis6/utils/IPduBank.h index b308be93..e85829f6 100644 --- a/src/dis6/utils/IPduBank.h +++ b/src/dis6/utils/IPduBank.h @@ -13,6 +13,6 @@ class IPduBank { /// finds the PDU instance corresponding to the identifier /// @param pdu_type the 8-bit PDU type identifier /// @return NULL when the pdu_type is unknown. - virtual Pdu* GetStaticPDU(unsigned char pdu_type, DataStream& ds) = 0; + virtual Pdu* GetStaticPDU(uint8_t pdu_type, DataStream& ds) = 0; }; } // namespace DIS diff --git a/src/dis6/utils/IncomingMessage.cpp b/src/dis6/utils/IncomingMessage.cpp index b7343d63..6e5b5f9c 100644 --- a/src/dis6/utils/IncomingMessage.cpp +++ b/src/dis6/utils/IncomingMessage.cpp @@ -11,13 +11,13 @@ using namespace DIS; // the DIS specification says the type is known for all PDUs at the 3rd byte of // the PDU buffer. -const unsigned int PDU_TYPE_POSITION = 2; +const uint32_t PDU_TYPE_POSITION = 2; IncomingMessage::IncomingMessage() : _processors(), _pduBanks() {} IncomingMessage::~IncomingMessage() {} -void IncomingMessage::Process(const char* buf, unsigned int size, Endian e) { +void IncomingMessage::Process(const char* buf, uint32_t size, Endian e) { if (size < 1) { return; } @@ -25,7 +25,7 @@ void IncomingMessage::Process(const char* buf, unsigned int size, Endian e) { DataStream ds(buf, size, e); while (ds.GetReadPos() < ds.size()) { - unsigned char pdu_type = ds[PDU_TYPE_POSITION]; + uint8_t pdu_type = ds[PDU_TYPE_POSITION]; SwitchOnType(static_cast(pdu_type), ds); } } @@ -63,7 +63,7 @@ void IncomingMessage::SwitchOnType(DIS::PDUType pdu_type, DataStream& ds) { } } -bool IncomingMessage::AddProcessor(unsigned char id, IPacketProcessor* pp) { +bool IncomingMessage::AddProcessor(uint8_t id, IPacketProcessor* pp) { PacketProcessorContainer::value_type candidate(id, pp); PacketProcessorContainer::iterator containerIter; @@ -78,7 +78,7 @@ bool IncomingMessage::AddProcessor(unsigned char id, IPacketProcessor* pp) { ///\todo add proper support for erasing from a multimap. ///\warning erases any processor registered for the id -bool IncomingMessage::RemoveProcessor(unsigned char id, +bool IncomingMessage::RemoveProcessor(uint8_t id, const IPacketProcessor* pp) { PacketProcessorContainer::iterator containerIter; @@ -92,7 +92,7 @@ bool IncomingMessage::RemoveProcessor(unsigned char id, return false; } -bool IncomingMessage::AddPduBank(unsigned char id, IPduBank* pduBank) { +bool IncomingMessage::AddPduBank(uint8_t id, IPduBank* pduBank) { PduBankContainer::value_type candidate(id, pduBank); PduBankContainer::iterator containerIter; @@ -107,7 +107,7 @@ bool IncomingMessage::AddPduBank(unsigned char id, IPduBank* pduBank) { ///\todo add proper support for erasing from a multimap. ///\warning erases any PDU bank registered PDU type -bool IncomingMessage::RemovePduBank(unsigned char id, const IPduBank* pduBank) { +bool IncomingMessage::RemovePduBank(uint8_t id, const IPduBank* pduBank) { PduBankContainer::iterator containerIter; if (FindPduBankContainer(id, pduBank, containerIter)) { @@ -138,7 +138,7 @@ const IncomingMessage::PduBankContainer& IncomingMessage::GetPduBanks() const { } bool IncomingMessage::FindProccessorContainer( - unsigned char id, const IPacketProcessor* pp, + uint8_t id, const IPacketProcessor* pp, PacketProcessorContainer::iterator& containerIter) { PacketProcessIteratorPair iterPair = _processors.equal_range(id); @@ -159,7 +159,7 @@ bool IncomingMessage::FindProccessorContainer( } bool IncomingMessage::FindPduBankContainer( - unsigned char pdu_type, const IPduBank* pduBank, + uint8_t pdu_type, const IPduBank* pduBank, PduBankContainer::iterator& containerIter) { PduBankIteratorPair iterPair = _pduBanks.equal_range(pdu_type); diff --git a/src/dis6/utils/IncomingMessage.h b/src/dis6/utils/IncomingMessage.h index 8c563c24..ca4fece5 100644 --- a/src/dis6/utils/IncomingMessage.h +++ b/src/dis6/utils/IncomingMessage.h @@ -22,37 +22,37 @@ class DataStream; class OPENDIS6_EXPORT IncomingMessage : public IBufferProcessor { public: /// the container type for supporting processors. - typedef std::multimap + typedef std::multimap PacketProcessorContainer; /// the container type for supporting PDU banks. - typedef std::multimap PduBankContainer; + typedef std::multimap PduBankContainer; IncomingMessage(); ~IncomingMessage(); - void Process(const char* buf, unsigned int size, Endian e); + void Process(const char* buf, uint32_t size, Endian e); /// registers the ipp instance to process packets with the id /// @return 'true' if the pair of parameters were not found in the container /// and were addded. 'false' if the pair was found. - bool AddProcessor(unsigned char id, IPacketProcessor* pp); + bool AddProcessor(uint8_t id, IPacketProcessor* pp); /// unregisters the ipp instance for packets with the id. it does not clean /// up the delete the ipp. /// @return 'true' if the pair of parameters were found in the container and /// removed. 'false' if the pair was not found. - bool RemoveProcessor(unsigned char id, const IPacketProcessor* pp); + bool RemoveProcessor(uint8_t id, const IPacketProcessor* pp); /// registers the PDU bank instance to provide the PDU object /// @return 'true' if the pair of parameters were not found in the container /// and were addded. 'false' if the pair was found. - bool AddPduBank(unsigned char pdu_type, IPduBank* pduBank); + bool AddPduBank(uint8_t pdu_type, IPduBank* pduBank); /// unregisters the PDU bank instance /// @return 'true' if the pair of parameters were found in the container and /// removed. 'false' if the pair was not found. - bool RemovePduBank(unsigned char pdu_type, const IPduBank* pduBank); + bool RemovePduBank(uint8_t pdu_type, const IPduBank* pduBank); PacketProcessorContainer& GetProcessors(); const PacketProcessorContainer& GetProcessors() const; @@ -75,12 +75,12 @@ class OPENDIS6_EXPORT IncomingMessage : public IBufferProcessor { /// Searches the proccesor container multimap for a matching container and /// returns the iterator bool FindProccessorContainer( - unsigned char id, const IPacketProcessor* pp, + uint8_t id, const IPacketProcessor* pp, PacketProcessorContainer::iterator& containerIter); /// Searches the PDU bank container multimap for a matching container and /// returns the iterator - bool FindPduBankContainer(unsigned char pdu_type, const IPduBank* pduBank, + bool FindPduBankContainer(uint8_t pdu_type, const IPduBank* pduBank, PduBankContainer::iterator& containerIter); }; diff --git a/src/dis6/utils/Masks.h b/src/dis6/utils/Masks.h index c29ef947..2c578ffd 100644 --- a/src/dis6/utils/Masks.h +++ b/src/dis6/utils/Masks.h @@ -5,13 +5,15 @@ #ifndef _dcl_dis_masks_h_ #define _dcl_dis_masks_h_ +#include + #include // for library symbols namespace DIS { /// the mask that will leave only the typemetric /// from an integer representing the Articulation Parameter's parameter type. /// this mask is based on the IEEE Std 1278.1-1995 -const unsigned int ARTICULATION_PARAMETER_TYPE_METRIC_MASK = 0x001F; +const uint32_t ARTICULATION_PARAMETER_TYPE_METRIC_MASK = 0x001F; } // namespace DIS #endif // _dcl_dis_masks_h_ diff --git a/src/dis6/utils/PDUBank.h b/src/dis6/utils/PDUBank.h index a4a6a6ce..04c8f919 100644 --- a/src/dis6/utils/PDUBank.h +++ b/src/dis6/utils/PDUBank.h @@ -11,7 +11,7 @@ class OPENDIS6_EXPORT PduBank { /// finds the PDU instance corresponding to the identifier /// @param pdu_type the 8-bit PDU type identifier /// @return NULL when the pdu_type is unknown. - ///\todo make this parameter just 'unsigned char' since that will be easier to + ///\todo make this parameter just 'uint8_t' since that will be easier to ///generate. static Pdu* GetStaticPDU(DIS::PDUType pdu_type); }; diff --git a/src/dis6/utils/PacketFactory.cpp b/src/dis6/utils/PacketFactory.cpp index 4fb7487f..90f437b6 100644 --- a/src/dis6/utils/PacketFactory.cpp +++ b/src/dis6/utils/PacketFactory.cpp @@ -5,7 +5,7 @@ using namespace DIS; -Pdu* PacketFactory::CreatePacket(unsigned char id) { +Pdu* PacketFactory::CreatePacket(uint8_t id) { FunctionMap::iterator iter = _fMap.find(id); if (iter != _fMap.end()) { return (iter->second)(); @@ -16,7 +16,7 @@ Pdu* PacketFactory::CreatePacket(unsigned char id) { void PacketFactory::DestroyPacket(Pdu* pdu) { delete pdu; } -bool PacketFactory::IsRegistered(unsigned char id) const { +bool PacketFactory::IsRegistered(uint8_t id) const { FunctionMap::const_iterator iter = _fMap.find(id); return (iter != _fMap.end()); } diff --git a/src/dis6/utils/PacketFactory.h b/src/dis6/utils/PacketFactory.h index 48bd1ed5..49d2a146 100644 --- a/src/dis6/utils/PacketFactory.h +++ b/src/dis6/utils/PacketFactory.h @@ -26,7 +26,7 @@ class OPENDIS6_EXPORT PacketFactory { /// specification. /// @return a dynamically allocated instance of a concrete Pdu. The value /// will be 'NULL' if no support for creating the concrete Pdu was registered. - Pdu* CreatePacket(unsigned char id); + Pdu* CreatePacket(uint8_t id); /// Clean up the memory for the Pdu. /// @param pdu The packet to be deleted. @@ -37,7 +37,7 @@ class OPENDIS6_EXPORT PacketFactory { /// @return 'false' if a packet id was already registered for the Pdu type. /// 'true' if support was added. template - bool RegisterPacket(unsigned char id) { + bool RegisterPacket(uint8_t id) { FunctionMap::value_type candidate(id, &CreateImplementation); std::pair result = _fMap.insert(candidate); return result.second; @@ -53,14 +53,14 @@ class OPENDIS6_EXPORT PacketFactory { /// @param id The value representing the Pdu type. /// @return 'true' if support for creating a Pdu was found, 'false' if not /// found. - bool IsRegistered(unsigned char id) const; + bool IsRegistered(uint8_t id) const; private: /// the function signature required for creating Pdu instances. typedef Pdu* (*CREATE_FUNC)(); /// the type to contain mappings to functions used to create Pdu instances. - typedef std::map FunctionMap; + typedef std::map FunctionMap; /// instance of the storage mechanism for creating Pdu instances. FunctionMap _fMap; diff --git a/src/dis6/utils/StreamUtils.cpp b/src/dis6/utils/StreamUtils.cpp index 15bec8bf..24b22659 100644 --- a/src/dis6/utils/StreamUtils.cpp +++ b/src/dis6/utils/StreamUtils.cpp @@ -4,15 +4,15 @@ #include std::ostream& operator<<(std::ostream& lhs, const DIS::EntityType& rhs) { - lhs << "EntityType (" << (unsigned int)rhs.getEntityKind() << "," - << (unsigned int)rhs.getDomain() << "," << (unsigned int)rhs.getCountry() - << "," << (unsigned int)rhs.getCategory() << "," - << (unsigned int)rhs.getSubcategory() << ") "; + lhs << "EntityType (" << (uint32_t)rhs.getEntityKind() << "," + << (uint32_t)rhs.getDomain() << "," << (uint32_t)rhs.getCountry() + << "," << (uint32_t)rhs.getCategory() << "," + << (uint32_t)rhs.getSubcategory() << ") "; return lhs; } std::ostream& operator<<(std::ostream& lhs, const DIS::EntityID& rhs) { - lhs << "EntityID (" << (unsigned int)rhs.getEntity() << ") "; + lhs << "EntityID (" << (uint32_t)rhs.getEntity() << ") "; return lhs; } From 6c8d33feaf7a603fabc964e4e401de531e74df6a Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Thu, 27 Apr 2023 02:19:28 +0000 Subject: [PATCH 05/22] Fixed include statements in dis7 --- src/dis7/AcknowledgePdu.cpp | 2 +- src/dis7/AcknowledgePdu.h | 8 +++---- src/dis7/AcknowledgeReliablePdu.cpp | 2 +- src/dis7/AcknowledgeReliablePdu.h | 6 ++--- src/dis7/AcousticEmitter.cpp | 2 +- src/dis7/AcousticEmitter.h | 4 ++-- src/dis7/ActionRequestPdu.cpp | 2 +- src/dis7/ActionRequestPdu.h | 12 +++++----- src/dis7/ActionRequestReliablePdu.cpp | 2 +- src/dis7/ActionRequestReliablePdu.h | 10 ++++---- src/dis7/ActionResponsePdu.cpp | 2 +- src/dis7/ActionResponsePdu.h | 12 +++++----- src/dis7/ActionResponseReliablePdu.cpp | 2 +- src/dis7/ActionResponseReliablePdu.h | 10 ++++---- src/dis7/AggregateIdentifier.cpp | 2 +- src/dis7/AggregateIdentifier.h | 6 ++--- src/dis7/AggregateMarking.cpp | 2 +- src/dis7/AggregateMarking.h | 4 ++-- src/dis7/AggregateType.cpp | 2 +- src/dis7/AggregateType.h | 4 ++-- src/dis7/AngleDeception.cpp | 2 +- src/dis7/AngleDeception.h | 4 ++-- src/dis7/AngularVelocityVector.cpp | 2 +- src/dis7/AngularVelocityVector.h | 4 ++-- src/dis7/AntennaLocation.cpp | 2 +- src/dis7/AntennaLocation.h | 8 +++---- src/dis7/ArealObjectStatePdu.cpp | 2 +- src/dis7/ArealObjectStatePdu.h | 14 +++++------ src/dis7/ArticulatedParts.cpp | 2 +- src/dis7/ArticulatedParts.h | 4 ++-- src/dis7/Association.cpp | 2 +- src/dis7/Association.h | 8 +++---- src/dis7/AttachedParts.cpp | 2 +- src/dis7/AttachedParts.h | 4 ++-- src/dis7/Attribute.cpp | 2 +- src/dis7/Attribute.h | 4 ++-- src/dis7/AttributePdu.cpp | 2 +- src/dis7/AttributePdu.h | 8 +++---- src/dis7/BeamAntennaPattern.cpp | 2 +- src/dis7/BeamAntennaPattern.h | 6 ++--- src/dis7/BeamData.cpp | 2 +- src/dis7/BeamData.h | 4 ++-- src/dis7/BeamStatus.cpp | 2 +- src/dis7/BeamStatus.h | 4 ++-- src/dis7/BlankingSector.cpp | 2 +- src/dis7/BlankingSector.h | 4 ++-- src/dis7/ClockTime.cpp | 2 +- src/dis7/ClockTime.h | 4 ++-- src/dis7/CollisionElasticPdu.cpp | 2 +- src/dis7/CollisionElasticPdu.h | 12 +++++----- src/dis7/CollisionPdu.cpp | 2 +- src/dis7/CollisionPdu.h | 12 +++++----- src/dis7/CommentPdu.cpp | 2 +- src/dis7/CommentPdu.h | 10 ++++---- src/dis7/CommentReliablePdu.cpp | 2 +- src/dis7/CommentReliablePdu.h | 10 ++++---- src/dis7/CommunicationsNodeID.cpp | 2 +- src/dis7/CommunicationsNodeID.h | 6 ++--- src/dis7/CreateEntityPdu.cpp | 2 +- src/dis7/CreateEntityPdu.h | 8 +++---- src/dis7/CreateEntityReliablePdu.cpp | 2 +- src/dis7/CreateEntityReliablePdu.h | 6 ++--- src/dis7/DataPdu.cpp | 2 +- src/dis7/DataPdu.h | 10 ++++---- src/dis7/DataQueryDatumSpecification.cpp | 2 +- src/dis7/DataQueryDatumSpecification.h | 6 ++--- src/dis7/DataQueryPdu.cpp | 2 +- src/dis7/DataQueryPdu.h | 10 ++++---- src/dis7/DataQueryReliablePdu.cpp | 2 +- src/dis7/DataQueryReliablePdu.h | 10 ++++---- src/dis7/DataReliablePdu.cpp | 2 +- src/dis7/DataReliablePdu.h | 10 ++++---- src/dis7/DatumSpecification.cpp | 2 +- src/dis7/DatumSpecification.h | 8 +++---- src/dis7/DeadReckoningParameters.cpp | 2 +- src/dis7/DeadReckoningParameters.h | 6 ++--- src/dis7/DesignatorPdu.cpp | 2 +- src/dis7/DesignatorPdu.h | 12 +++++----- src/dis7/DetonationPdu.cpp | 2 +- src/dis7/DetonationPdu.h | 18 +++++++------- src/dis7/DirectedEnergyAreaAimpoint.cpp | 2 +- src/dis7/DirectedEnergyAreaAimpoint.h | 8 +++---- src/dis7/DirectedEnergyDamage.cpp | 2 +- src/dis7/DirectedEnergyDamage.h | 8 +++---- src/dis7/DirectedEnergyFirePdu.cpp | 2 +- src/dis7/DirectedEnergyFirePdu.h | 14 +++++------ src/dis7/DirectedEnergyPrecisionAimpoint.cpp | 2 +- src/dis7/DirectedEnergyPrecisionAimpoint.h | 10 ++++---- .../DirectedEnergyTargetEnergyDeposition.cpp | 2 +- .../DirectedEnergyTargetEnergyDeposition.h | 6 ++--- src/dis7/DistributedEmissionsFamilyPdu.cpp | 2 +- src/dis7/DistributedEmissionsFamilyPdu.h | 6 ++--- src/dis7/EEFundamentalParameterData.cpp | 2 +- src/dis7/EEFundamentalParameterData.h | 4 ++-- src/dis7/EightByteChunk.cpp | 2 +- src/dis7/EightByteChunk.h | 4 ++-- src/dis7/ElectromagneticEmissionBeamData.cpp | 2 +- src/dis7/ElectromagneticEmissionBeamData.h | 12 +++++----- .../ElectromagneticEmissionSystemData.cpp | 2 +- src/dis7/ElectromagneticEmissionSystemData.h | 10 ++++---- src/dis7/ElectromagneticEmissionsPdu.cpp | 2 +- src/dis7/ElectromagneticEmissionsPdu.h | 14 +++++------ src/dis7/EmitterSystem.cpp | 2 +- src/dis7/EmitterSystem.h | 4 ++-- src/dis7/EngineFuel.cpp | 2 +- src/dis7/EngineFuel.h | 4 ++-- src/dis7/EngineFuelReload.cpp | 2 +- src/dis7/EngineFuelReload.h | 4 ++-- src/dis7/EntityAssociation.cpp | 2 +- src/dis7/EntityAssociation.h | 6 ++--- src/dis7/EntityDamageStatusPdu.cpp | 2 +- src/dis7/EntityDamageStatusPdu.h | 10 ++++---- src/dis7/EntityID.cpp | 2 +- src/dis7/EntityID.h | 6 ++--- src/dis7/EntityInformationFamilyPdu.cpp | 2 +- src/dis7/EntityInformationFamilyPdu.h | 6 ++--- src/dis7/EntityManagementFamilyPdu.cpp | 2 +- src/dis7/EntityManagementFamilyPdu.h | 6 ++--- src/dis7/EntityMarking.cpp | 2 +- src/dis7/EntityMarking.h | 4 ++-- src/dis7/EntityStatePdu.cpp | 2 +- src/dis7/EntityStatePdu.h | 22 ++++++++--------- src/dis7/EntityStateUpdatePdu.cpp | 2 +- src/dis7/EntityStateUpdatePdu.h | 16 ++++++------- src/dis7/EntityType.cpp | 2 +- src/dis7/EntityType.h | 4 ++-- src/dis7/EntityTypeVP.cpp | 2 +- src/dis7/EntityTypeVP.h | 6 ++--- src/dis7/Environment.cpp | 2 +- src/dis7/Environment.h | 4 ++-- src/dis7/EnvironmentGeneral.cpp | 2 +- src/dis7/EnvironmentGeneral.h | 4 ++-- src/dis7/EnvironmentType.cpp | 2 +- src/dis7/EnvironmentType.h | 4 ++-- src/dis7/EulerAngles.cpp | 2 +- src/dis7/EulerAngles.h | 4 ++-- src/dis7/EventIdentifier.cpp | 2 +- src/dis7/EventIdentifier.h | 6 ++--- src/dis7/EventIdentifierLiveEntity.cpp | 2 +- src/dis7/EventIdentifierLiveEntity.h | 4 ++-- src/dis7/EventReportPdu.cpp | 2 +- src/dis7/EventReportPdu.h | 10 ++++---- src/dis7/EventReportReliablePdu.cpp | 2 +- src/dis7/EventReportReliablePdu.h | 10 ++++---- src/dis7/Expendable.cpp | 2 +- src/dis7/Expendable.h | 6 ++--- src/dis7/ExpendableDescriptor.cpp | 2 +- src/dis7/ExpendableDescriptor.h | 6 ++--- src/dis7/ExpendableReload.cpp | 2 +- src/dis7/ExpendableReload.h | 6 ++--- src/dis7/ExplosionDescriptor.cpp | 2 +- src/dis7/ExplosionDescriptor.h | 6 ++--- src/dis7/FalseTargetsAttribute.cpp | 2 +- src/dis7/FalseTargetsAttribute.h | 4 ++-- src/dis7/FastEntityStatePdu.cpp | 2 +- src/dis7/FastEntityStatePdu.h | 8 +++---- src/dis7/FirePdu.cpp | 2 +- src/dis7/FirePdu.h | 16 ++++++------- src/dis7/FixedDatum.cpp | 2 +- src/dis7/FixedDatum.h | 4 ++-- src/dis7/FourByteChunk.cpp | 2 +- src/dis7/FourByteChunk.h | 4 ++-- src/dis7/FundamentalOperationalData.cpp | 2 +- src/dis7/FundamentalOperationalData.h | 4 ++-- src/dis7/GridAxis.cpp | 2 +- src/dis7/GridAxis.h | 4 ++-- src/dis7/GroupIdentifier.cpp | 2 +- src/dis7/GroupIdentifier.h | 6 ++--- src/dis7/IFFFundamentalParameterData.cpp | 2 +- src/dis7/IFFFundamentalParameterData.h | 4 ++-- src/dis7/IFFPdu.cpp | 2 +- src/dis7/IFFPdu.h | 24 +++++++++---------- src/dis7/IOCommunicationsNode.cpp | 2 +- src/dis7/IOCommunicationsNode.h | 6 ++--- src/dis7/IOEffect.cpp | 2 +- src/dis7/IOEffect.h | 6 ++--- src/dis7/IffDataSpecification.cpp | 2 +- src/dis7/IffDataSpecification.h | 6 ++--- src/dis7/IntercomCommunicationsParameters.cpp | 2 +- src/dis7/IntercomCommunicationsParameters.h | 4 ++-- src/dis7/IntercomIdentifier.cpp | 2 +- src/dis7/IntercomIdentifier.h | 4 ++-- src/dis7/IntercomSignalPdu.cpp | 2 +- src/dis7/IntercomSignalPdu.h | 8 +++---- src/dis7/IsPartOfPdu.cpp | 2 +- src/dis7/IsPartOfPdu.h | 16 ++++++------- src/dis7/JammingTechnique.cpp | 2 +- src/dis7/JammingTechnique.h | 4 ++-- src/dis7/LaunchedMunitionRecord.cpp | 2 +- src/dis7/LaunchedMunitionRecord.h | 8 +++---- src/dis7/LayerHeader.cpp | 2 +- src/dis7/LayerHeader.h | 4 ++-- src/dis7/LinearObjectStatePdu.cpp | 2 +- src/dis7/LinearObjectStatePdu.h | 14 +++++------ src/dis7/LinearSegmentParameter.cpp | 2 +- src/dis7/LinearSegmentParameter.h | 8 +++---- src/dis7/LiveEntityIdentifier.cpp | 2 +- src/dis7/LiveEntityIdentifier.h | 6 ++--- src/dis7/LiveEntityPdu.cpp | 2 +- src/dis7/LiveEntityPdu.h | 6 ++--- src/dis7/LiveSimulationAddress.cpp | 2 +- src/dis7/LiveSimulationAddress.h | 4 ++-- src/dis7/LogisticsFamilyPdu.cpp | 2 +- src/dis7/LogisticsFamilyPdu.h | 6 ++--- src/dis7/MineEntityIdentifier.cpp | 2 +- src/dis7/MineEntityIdentifier.h | 6 ++--- src/dis7/MinefieldFamilyPdu.cpp | 2 +- src/dis7/MinefieldFamilyPdu.h | 6 ++--- src/dis7/MinefieldIdentifier.cpp | 2 +- src/dis7/MinefieldIdentifier.h | 6 ++--- src/dis7/MinefieldResponseNackPdu.cpp | 2 +- src/dis7/MinefieldResponseNackPdu.h | 10 ++++---- src/dis7/MinefieldStatePdu.cpp | 2 +- src/dis7/MinefieldStatePdu.h | 16 ++++++------- src/dis7/ModulationParameters.cpp | 2 +- src/dis7/ModulationParameters.h | 4 ++-- src/dis7/ModulationType.cpp | 2 +- src/dis7/ModulationType.h | 4 ++-- src/dis7/Munition.cpp | 2 +- src/dis7/Munition.h | 6 ++--- src/dis7/MunitionDescriptor.cpp | 2 +- src/dis7/MunitionDescriptor.h | 6 ++--- src/dis7/MunitionReload.cpp | 2 +- src/dis7/MunitionReload.h | 6 ++--- src/dis7/NamedLocationIdentification.cpp | 2 +- src/dis7/NamedLocationIdentification.h | 4 ++-- src/dis7/ObjectIdentifier.cpp | 2 +- src/dis7/ObjectIdentifier.h | 6 ++--- src/dis7/ObjectType.cpp | 2 +- src/dis7/ObjectType.h | 4 ++-- src/dis7/OwnershipStatus.cpp | 2 +- src/dis7/OwnershipStatus.h | 6 ++--- src/dis7/Pdu.cpp | 2 +- src/dis7/Pdu.h | 6 ++--- src/dis7/PduContainer.cpp | 2 +- src/dis7/PduContainer.h | 6 ++--- src/dis7/PduHeader.cpp | 2 +- src/dis7/PduHeader.h | 4 ++-- src/dis7/PduStatus.cpp | 2 +- src/dis7/PduStatus.h | 4 ++-- src/dis7/PduSuperclass.cpp | 2 +- src/dis7/PduSuperclass.h | 4 ++-- src/dis7/PointObjectStatePdu.cpp | 2 +- src/dis7/PointObjectStatePdu.h | 16 ++++++------- src/dis7/PropulsionSystemData.cpp | 2 +- src/dis7/PropulsionSystemData.h | 4 ++-- src/dis7/RadioCommunicationsFamilyPdu.cpp | 2 +- src/dis7/RadioCommunicationsFamilyPdu.h | 8 +++---- src/dis7/RadioIdentifier.cpp | 2 +- src/dis7/RadioIdentifier.h | 4 ++-- src/dis7/RadioType.cpp | 2 +- src/dis7/RadioType.h | 4 ++-- src/dis7/ReceiverPdu.cpp | 2 +- src/dis7/ReceiverPdu.h | 8 +++---- src/dis7/RecordQueryReliablePdu.cpp | 2 +- src/dis7/RecordQueryReliablePdu.h | 8 +++---- src/dis7/RecordQuerySpecification.cpp | 2 +- src/dis7/RecordQuerySpecification.h | 6 ++--- src/dis7/RecordSpecification.cpp | 2 +- src/dis7/RecordSpecification.h | 6 ++--- src/dis7/RecordSpecificationElement.cpp | 2 +- src/dis7/RecordSpecificationElement.h | 4 ++-- src/dis7/Relationship.cpp | 2 +- src/dis7/Relationship.h | 4 ++-- src/dis7/RemoveEntityPdu.cpp | 2 +- src/dis7/RemoveEntityPdu.h | 8 +++---- src/dis7/RemoveEntityReliablePdu.cpp | 2 +- src/dis7/RemoveEntityReliablePdu.h | 6 ++--- src/dis7/RepairCompletePdu.cpp | 2 +- src/dis7/RepairCompletePdu.h | 8 +++---- src/dis7/RepairResponsePdu.cpp | 2 +- src/dis7/RepairResponsePdu.h | 8 +++---- src/dis7/ResupplyOfferPdu.cpp | 2 +- src/dis7/ResupplyOfferPdu.h | 10 ++++---- src/dis7/ResupplyReceivedPdu.cpp | 2 +- src/dis7/ResupplyReceivedPdu.h | 10 ++++---- src/dis7/SecondaryOperationalData.cpp | 2 +- src/dis7/SecondaryOperationalData.h | 4 ++-- src/dis7/SeesPdu.cpp | 2 +- src/dis7/SeesPdu.h | 12 +++++----- src/dis7/Sensor.cpp | 2 +- src/dis7/Sensor.h | 4 ++-- src/dis7/SeparationVP.cpp | 2 +- src/dis7/SeparationVP.h | 6 ++--- src/dis7/ServiceRequestPdu.cpp | 2 +- src/dis7/ServiceRequestPdu.h | 10 ++++---- src/dis7/SetDataPdu.cpp | 2 +- src/dis7/SetDataPdu.h | 10 ++++---- src/dis7/SetDataReliablePdu.cpp | 2 +- src/dis7/SetDataReliablePdu.h | 10 ++++---- src/dis7/SimulationAddress.cpp | 2 +- src/dis7/SimulationAddress.h | 4 ++-- src/dis7/SimulationIdentifier.cpp | 2 +- src/dis7/SimulationIdentifier.h | 6 ++--- src/dis7/SimulationManagementFamilyPdu.cpp | 2 +- src/dis7/SimulationManagementFamilyPdu.h | 8 +++---- src/dis7/SimulationManagementPduHeader.cpp | 2 +- src/dis7/SimulationManagementPduHeader.h | 8 +++---- ...tionManagementWithReliabilityFamilyPdu.cpp | 2 +- ...lationManagementWithReliabilityFamilyPdu.h | 8 +++---- src/dis7/StandardVariableSpecification.cpp | 2 +- src/dis7/StandardVariableSpecification.h | 6 ++--- src/dis7/StartResumePdu.cpp | 2 +- src/dis7/StartResumePdu.h | 10 ++++---- src/dis7/StartResumeReliablePdu.cpp | 2 +- src/dis7/StartResumeReliablePdu.h | 8 +++---- src/dis7/StopFreezePdu.cpp | 2 +- src/dis7/StopFreezePdu.h | 10 ++++---- src/dis7/StopFreezeReliablePdu.cpp | 2 +- src/dis7/StopFreezeReliablePdu.h | 8 +++---- src/dis7/StorageFuel.cpp | 2 +- src/dis7/StorageFuel.h | 4 ++-- src/dis7/StorageFuelReload.cpp | 2 +- src/dis7/StorageFuelReload.h | 4 ++-- src/dis7/SupplyQuantity.cpp | 2 +- src/dis7/SupplyQuantity.h | 6 ++--- src/dis7/SyntheticEnvironmentFamilyPdu.cpp | 2 +- src/dis7/SyntheticEnvironmentFamilyPdu.h | 6 ++--- src/dis7/SystemIdentifier.cpp | 2 +- src/dis7/SystemIdentifier.h | 4 ++-- src/dis7/TotalRecordSets.cpp | 2 +- src/dis7/TotalRecordSets.h | 4 ++-- src/dis7/TrackJamData.cpp | 2 +- src/dis7/TrackJamData.h | 6 ++--- src/dis7/TwoByteChunk.cpp | 2 +- src/dis7/TwoByteChunk.h | 4 ++-- src/dis7/UAFundamentalParameter.cpp | 2 +- src/dis7/UAFundamentalParameter.h | 4 ++-- src/dis7/UaPdu.cpp | 2 +- src/dis7/UaPdu.h | 12 +++++----- src/dis7/UnattachedIdentifier.cpp | 2 +- src/dis7/UnattachedIdentifier.h | 6 ++--- src/dis7/UnsignedDISInteger.cpp | 2 +- src/dis7/UnsignedDISInteger.h | 4 ++-- src/dis7/VariableDatum.cpp | 2 +- src/dis7/VariableDatum.h | 6 ++--- src/dis7/VariableParameter.cpp | 2 +- src/dis7/VariableParameter.h | 4 ++-- src/dis7/VariableTransmitterParameters.cpp | 2 +- src/dis7/VariableTransmitterParameters.h | 4 ++-- src/dis7/Vector2Float.cpp | 2 +- src/dis7/Vector2Float.h | 4 ++-- src/dis7/Vector3Double.cpp | 2 +- src/dis7/Vector3Double.h | 4 ++-- src/dis7/Vector3Float.cpp | 2 +- src/dis7/Vector3Float.h | 4 ++-- src/dis7/VectoringNozzleSystem.cpp | 2 +- src/dis7/VectoringNozzleSystem.h | 4 ++-- src/dis7/WarfareFamilyPdu.cpp | 2 +- src/dis7/WarfareFamilyPdu.h | 8 +++---- 350 files changed, 791 insertions(+), 791 deletions(-) diff --git a/src/dis7/AcknowledgePdu.cpp b/src/dis7/AcknowledgePdu.cpp index 679e24b0..0385e033 100644 --- a/src/dis7/AcknowledgePdu.cpp +++ b/src/dis7/AcknowledgePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AcknowledgePdu.h" using namespace DIS; diff --git a/src/dis7/AcknowledgePdu.h b/src/dis7/AcknowledgePdu.h index 2ebc2305..11debe6d 100644 --- a/src/dis7/AcknowledgePdu.h +++ b/src/dis7/AcknowledgePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.6. Acknowledge the receipt of a start/resume, stop/freeze, or diff --git a/src/dis7/AcknowledgeReliablePdu.cpp b/src/dis7/AcknowledgeReliablePdu.cpp index bf814362..b66e41a1 100644 --- a/src/dis7/AcknowledgeReliablePdu.cpp +++ b/src/dis7/AcknowledgeReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AcknowledgeReliablePdu.h" using namespace DIS; diff --git a/src/dis7/AcknowledgeReliablePdu.h b/src/dis7/AcknowledgeReliablePdu.h index f03a0cdc..53ed49ca 100644 --- a/src/dis7/AcknowledgeReliablePdu.h +++ b/src/dis7/AcknowledgeReliablePdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity diff --git a/src/dis7/AcousticEmitter.cpp b/src/dis7/AcousticEmitter.cpp index 9a0dc73b..55adb162 100644 --- a/src/dis7/AcousticEmitter.cpp +++ b/src/dis7/AcousticEmitter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AcousticEmitter.h" using namespace DIS; diff --git a/src/dis7/AcousticEmitter.h b/src/dis7/AcousticEmitter.h index 9aa78d13..a48393ad 100644 --- a/src/dis7/AcousticEmitter.h +++ b/src/dis7/AcousticEmitter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // information about a specific UA emmtter. Section 6.2.2. diff --git a/src/dis7/ActionRequestPdu.cpp b/src/dis7/ActionRequestPdu.cpp index 1b72cbd0..795cea1e 100644 --- a/src/dis7/ActionRequestPdu.cpp +++ b/src/dis7/ActionRequestPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ActionRequestPdu.h" using namespace DIS; diff --git a/src/dis7/ActionRequestPdu.h b/src/dis7/ActionRequestPdu.h index 09826ae7..95bb551b 100644 --- a/src/dis7/ActionRequestPdu.h +++ b/src/dis7/ActionRequestPdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.7. Request from simulation manager to a managed entity to perform diff --git a/src/dis7/ActionRequestReliablePdu.cpp b/src/dis7/ActionRequestReliablePdu.cpp index 1701f9fc..893caf1e 100644 --- a/src/dis7/ActionRequestReliablePdu.cpp +++ b/src/dis7/ActionRequestReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ActionRequestReliablePdu.h" using namespace DIS; diff --git a/src/dis7/ActionRequestReliablePdu.h b/src/dis7/ActionRequestReliablePdu.h index 89d08bc4..9def2e4a 100644 --- a/src/dis7/ActionRequestReliablePdu.h +++ b/src/dis7/ActionRequestReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.6: request from a simulation manager to a managed entity to diff --git a/src/dis7/ActionResponsePdu.cpp b/src/dis7/ActionResponsePdu.cpp index 3871a118..40397041 100644 --- a/src/dis7/ActionResponsePdu.cpp +++ b/src/dis7/ActionResponsePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ActionResponsePdu.h" using namespace DIS; diff --git a/src/dis7/ActionResponsePdu.h b/src/dis7/ActionResponsePdu.h index aff7f5c8..48e7e9ee 100644 --- a/src/dis7/ActionResponsePdu.h +++ b/src/dis7/ActionResponsePdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.8. response to an action request PDU. COMPLETE diff --git a/src/dis7/ActionResponseReliablePdu.cpp b/src/dis7/ActionResponseReliablePdu.cpp index 0656ad52..8bae247a 100644 --- a/src/dis7/ActionResponseReliablePdu.cpp +++ b/src/dis7/ActionResponseReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ActionResponseReliablePdu.h" using namespace DIS; diff --git a/src/dis7/ActionResponseReliablePdu.h b/src/dis7/ActionResponseReliablePdu.h index 41530005..9cf9fafc 100644 --- a/src/dis7/ActionResponseReliablePdu.h +++ b/src/dis7/ActionResponseReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE diff --git a/src/dis7/AggregateIdentifier.cpp b/src/dis7/AggregateIdentifier.cpp index 429fada8..be809189 100644 --- a/src/dis7/AggregateIdentifier.cpp +++ b/src/dis7/AggregateIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AggregateIdentifier.h" using namespace DIS; diff --git a/src/dis7/AggregateIdentifier.h b/src/dis7/AggregateIdentifier.h index 88188542..520f34a5 100644 --- a/src/dis7/AggregateIdentifier.h +++ b/src/dis7/AggregateIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of each aggrgate in an exercise is specified by an diff --git a/src/dis7/AggregateMarking.cpp b/src/dis7/AggregateMarking.cpp index 28e21f62..5382f416 100644 --- a/src/dis7/AggregateMarking.cpp +++ b/src/dis7/AggregateMarking.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AggregateMarking.h" using namespace DIS; diff --git a/src/dis7/AggregateMarking.h b/src/dis7/AggregateMarking.h index a314d4a2..e41f4176 100644 --- a/src/dis7/AggregateMarking.h +++ b/src/dis7/AggregateMarking.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Specifies the character set used in the first byte, followed by up to 31 diff --git a/src/dis7/AggregateType.cpp b/src/dis7/AggregateType.cpp index dd5d973d..afb58d92 100644 --- a/src/dis7/AggregateType.cpp +++ b/src/dis7/AggregateType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AggregateType.h" using namespace DIS; diff --git a/src/dis7/AggregateType.h b/src/dis7/AggregateType.h index 82082b2a..2d9b6ad9 100644 --- a/src/dis7/AggregateType.h +++ b/src/dis7/AggregateType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Identifies the type and organization of an aggregate. Section 6.2.5 diff --git a/src/dis7/AngleDeception.cpp b/src/dis7/AngleDeception.cpp index e5a2a321..0e84782a 100644 --- a/src/dis7/AngleDeception.cpp +++ b/src/dis7/AngleDeception.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AngleDeception.h" using namespace DIS; diff --git a/src/dis7/AngleDeception.h b/src/dis7/AngleDeception.h index fc860711..55a640fb 100644 --- a/src/dis7/AngleDeception.h +++ b/src/dis7/AngleDeception.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The Angle Deception attribute record may be used to communicate discrete diff --git a/src/dis7/AngularVelocityVector.cpp b/src/dis7/AngularVelocityVector.cpp index 18bc2c34..fdac9c53 100644 --- a/src/dis7/AngularVelocityVector.cpp +++ b/src/dis7/AngularVelocityVector.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AngularVelocityVector.h" using namespace DIS; diff --git a/src/dis7/AngularVelocityVector.h b/src/dis7/AngularVelocityVector.h index cde6b607..619f011e 100644 --- a/src/dis7/AngularVelocityVector.h +++ b/src/dis7/AngularVelocityVector.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Angular velocity measured in radians per second out each of the entity's own diff --git a/src/dis7/AntennaLocation.cpp b/src/dis7/AntennaLocation.cpp index 0dacfb27..fe9ac3b8 100644 --- a/src/dis7/AntennaLocation.cpp +++ b/src/dis7/AntennaLocation.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AntennaLocation.h" using namespace DIS; diff --git a/src/dis7/AntennaLocation.h b/src/dis7/AntennaLocation.h index 0e80193a..49f0f0d1 100644 --- a/src/dis7/AntennaLocation.h +++ b/src/dis7/AntennaLocation.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/Vector3Double.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Location of the radiating portion of the antenna, specified in world diff --git a/src/dis7/ArealObjectStatePdu.cpp b/src/dis7/ArealObjectStatePdu.cpp index 4881b154..446d395f 100644 --- a/src/dis7/ArealObjectStatePdu.cpp +++ b/src/dis7/ArealObjectStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ArealObjectStatePdu.h" using namespace DIS; diff --git a/src/dis7/ArealObjectStatePdu.h b/src/dis7/ArealObjectStatePdu.h index cc85b88a..ec7c83ad 100644 --- a/src/dis7/ArealObjectStatePdu.h +++ b/src/dis7/ArealObjectStatePdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EntityType.h" +#include "dis7/SimulationAddress.h" +#include "dis7/SyntheticEnvironmentFamilyPdu.h" +#include "dis7/Vector3Double.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about the addition/modification of an oobject that is diff --git a/src/dis7/ArticulatedParts.cpp b/src/dis7/ArticulatedParts.cpp index bcc42753..a255524e 100644 --- a/src/dis7/ArticulatedParts.cpp +++ b/src/dis7/ArticulatedParts.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ArticulatedParts.h" using namespace DIS; diff --git a/src/dis7/ArticulatedParts.h b/src/dis7/ArticulatedParts.h index fbf719d5..6ff9abf5 100644 --- a/src/dis7/ArticulatedParts.h +++ b/src/dis7/ArticulatedParts.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // articulated parts for movable parts and a combination of moveable/attached diff --git a/src/dis7/Association.cpp b/src/dis7/Association.cpp index 1803d92a..da36a53d 100644 --- a/src/dis7/Association.cpp +++ b/src/dis7/Association.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Association.h" using namespace DIS; diff --git a/src/dis7/Association.h b/src/dis7/Association.h index e578595b..d8b8cf5c 100644 --- a/src/dis7/Association.h +++ b/src/dis7/Association.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/Vector3Double.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // An entity's associations with other entities and/or locations. For each diff --git a/src/dis7/AttachedParts.cpp b/src/dis7/AttachedParts.cpp index bac0c7fc..41b0ed09 100644 --- a/src/dis7/AttachedParts.cpp +++ b/src/dis7/AttachedParts.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AttachedParts.h" using namespace DIS; diff --git a/src/dis7/AttachedParts.h b/src/dis7/AttachedParts.h index 35e7001f..e667be95 100644 --- a/src/dis7/AttachedParts.h +++ b/src/dis7/AttachedParts.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Removable parts that may be attached to an entity. Section 6.2.94.3 diff --git a/src/dis7/Attribute.cpp b/src/dis7/Attribute.cpp index 379be89e..60b2396b 100644 --- a/src/dis7/Attribute.cpp +++ b/src/dis7/Attribute.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Attribute.h" using namespace DIS; diff --git a/src/dis7/Attribute.h b/src/dis7/Attribute.h index e44fdf0d..a46b1686 100644 --- a/src/dis7/Attribute.h +++ b/src/dis7/Attribute.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Used to convey information for one or more attributes. Attributes conform to diff --git a/src/dis7/AttributePdu.cpp b/src/dis7/AttributePdu.cpp index 5e695ff1..1562c3f8 100644 --- a/src/dis7/AttributePdu.cpp +++ b/src/dis7/AttributePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/AttributePdu.h" using namespace DIS; diff --git a/src/dis7/AttributePdu.h b/src/dis7/AttributePdu.h index ffcca9be..3b2af980 100644 --- a/src/dis7/AttributePdu.h +++ b/src/dis7/AttributePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityInformationFamilyPdu.h" +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about individual attributes for a particular entity, other diff --git a/src/dis7/BeamAntennaPattern.cpp b/src/dis7/BeamAntennaPattern.cpp index 984bd150..8507e95f 100644 --- a/src/dis7/BeamAntennaPattern.cpp +++ b/src/dis7/BeamAntennaPattern.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/BeamAntennaPattern.h" using namespace DIS; diff --git a/src/dis7/BeamAntennaPattern.h b/src/dis7/BeamAntennaPattern.h index c83a0cef..d83567f8 100644 --- a/src/dis7/BeamAntennaPattern.h +++ b/src/dis7/BeamAntennaPattern.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EulerAngles.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Used when the antenna pattern type field has a value of 1. Specifies the diff --git a/src/dis7/BeamData.cpp b/src/dis7/BeamData.cpp index 4098170a..4f002bd2 100644 --- a/src/dis7/BeamData.cpp +++ b/src/dis7/BeamData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/BeamData.h" using namespace DIS; diff --git a/src/dis7/BeamData.h b/src/dis7/BeamData.h index e2d57a21..a79aba55 100644 --- a/src/dis7/BeamData.h +++ b/src/dis7/BeamData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Describes the scan volue of an emitter beam. Section 6.2.13. diff --git a/src/dis7/BeamStatus.cpp b/src/dis7/BeamStatus.cpp index 9c8b8387..59902230 100644 --- a/src/dis7/BeamStatus.cpp +++ b/src/dis7/BeamStatus.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/BeamStatus.h" using namespace DIS; diff --git a/src/dis7/BeamStatus.h b/src/dis7/BeamStatus.h index 8430619d..7e22ac46 100644 --- a/src/dis7/BeamStatus.h +++ b/src/dis7/BeamStatus.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information related to the status of a beam. This is contained in the beam diff --git a/src/dis7/BlankingSector.cpp b/src/dis7/BlankingSector.cpp index aac53ba3..b37b2686 100644 --- a/src/dis7/BlankingSector.cpp +++ b/src/dis7/BlankingSector.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/BlankingSector.h" using namespace DIS; diff --git a/src/dis7/BlankingSector.h b/src/dis7/BlankingSector.h index 0032de63..8eb2984f 100644 --- a/src/dis7/BlankingSector.h +++ b/src/dis7/BlankingSector.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The Blanking Sector attribute record may be used to convey persistent areas diff --git a/src/dis7/ClockTime.cpp b/src/dis7/ClockTime.cpp index 498c4b04..f0a0a41b 100644 --- a/src/dis7/ClockTime.cpp +++ b/src/dis7/ClockTime.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ClockTime.h" using namespace DIS; diff --git a/src/dis7/ClockTime.h b/src/dis7/ClockTime.h index 1b4d97cf..60b1165b 100644 --- a/src/dis7/ClockTime.h +++ b/src/dis7/ClockTime.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Time measurements that exceed one hour are represented by this record. The diff --git a/src/dis7/CollisionElasticPdu.cpp b/src/dis7/CollisionElasticPdu.cpp index 24292486..ccf06e44 100644 --- a/src/dis7/CollisionElasticPdu.cpp +++ b/src/dis7/CollisionElasticPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/CollisionElasticPdu.h" using namespace DIS; diff --git a/src/dis7/CollisionElasticPdu.h b/src/dis7/CollisionElasticPdu.h index c8c971db..8b88c4ef 100644 --- a/src/dis7/CollisionElasticPdu.h +++ b/src/dis7/CollisionElasticPdu.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EntityInformationFamilyPdu.h" +#include "dis7/EventIdentifier.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about elastic collisions in a DIS exercise shall be communicated diff --git a/src/dis7/CollisionPdu.cpp b/src/dis7/CollisionPdu.cpp index 0c5bd675..53bef36a 100644 --- a/src/dis7/CollisionPdu.cpp +++ b/src/dis7/CollisionPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/CollisionPdu.h" using namespace DIS; diff --git a/src/dis7/CollisionPdu.h b/src/dis7/CollisionPdu.h index c32cdb9d..2fb12e1c 100644 --- a/src/dis7/CollisionPdu.h +++ b/src/dis7/CollisionPdu.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EntityInformationFamilyPdu.h" +#include "dis7/EventIdentifier.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.2.3 Collisions between entities shall be communicated by issuing a diff --git a/src/dis7/CommentPdu.cpp b/src/dis7/CommentPdu.cpp index bd8f1d9f..40e09e8a 100644 --- a/src/dis7/CommentPdu.cpp +++ b/src/dis7/CommentPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/CommentPdu.h" using namespace DIS; diff --git a/src/dis7/CommentPdu.h b/src/dis7/CommentPdu.h index 599e2bcf..c1085a19 100644 --- a/src/dis7/CommentPdu.h +++ b/src/dis7/CommentPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Arbitrary messages can be entered into the data stream via use of this PDU. diff --git a/src/dis7/CommentReliablePdu.cpp b/src/dis7/CommentReliablePdu.cpp index 6b7cbf2d..b9123865 100644 --- a/src/dis7/CommentReliablePdu.cpp +++ b/src/dis7/CommentReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/CommentReliablePdu.h" using namespace DIS; diff --git a/src/dis7/CommentReliablePdu.h b/src/dis7/CommentReliablePdu.h index 5df8e422..deab8430 100644 --- a/src/dis7/CommentReliablePdu.h +++ b/src/dis7/CommentReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual diff --git a/src/dis7/CommunicationsNodeID.cpp b/src/dis7/CommunicationsNodeID.cpp index 39e87b36..943425de 100644 --- a/src/dis7/CommunicationsNodeID.cpp +++ b/src/dis7/CommunicationsNodeID.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/CommunicationsNodeID.h" using namespace DIS; diff --git a/src/dis7/CommunicationsNodeID.h b/src/dis7/CommunicationsNodeID.h index 6f7b7553..cc197f4e 100644 --- a/src/dis7/CommunicationsNodeID.h +++ b/src/dis7/CommunicationsNodeID.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Identity of a communications node. Section 6.2.49.4 diff --git a/src/dis7/CreateEntityPdu.cpp b/src/dis7/CreateEntityPdu.cpp index 36689353..4dac4580 100644 --- a/src/dis7/CreateEntityPdu.cpp +++ b/src/dis7/CreateEntityPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/CreateEntityPdu.h" using namespace DIS; diff --git a/src/dis7/CreateEntityPdu.h b/src/dis7/CreateEntityPdu.h index b8d7c162..da5759e8 100644 --- a/src/dis7/CreateEntityPdu.h +++ b/src/dis7/CreateEntityPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.2. Create a new entity. COMPLETE diff --git a/src/dis7/CreateEntityReliablePdu.cpp b/src/dis7/CreateEntityReliablePdu.cpp index 6b684a27..173053f2 100644 --- a/src/dis7/CreateEntityReliablePdu.cpp +++ b/src/dis7/CreateEntityReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/CreateEntityReliablePdu.h" using namespace DIS; diff --git a/src/dis7/CreateEntityReliablePdu.h b/src/dis7/CreateEntityReliablePdu.h index 53498ec5..9e8bba69 100644 --- a/src/dis7/CreateEntityReliablePdu.h +++ b/src/dis7/CreateEntityReliablePdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.1: creation of an entity , reliable. COMPLETE diff --git a/src/dis7/DataPdu.cpp b/src/dis7/DataPdu.cpp index c8b210cd..5b27cdfd 100644 --- a/src/dis7/DataPdu.cpp +++ b/src/dis7/DataPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DataPdu.h" using namespace DIS; diff --git a/src/dis7/DataPdu.h b/src/dis7/DataPdu.h index 8dc4719f..7ad26500 100644 --- a/src/dis7/DataPdu.h +++ b/src/dis7/DataPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information issued in response to a data query pdu or a set data pdu is diff --git a/src/dis7/DataQueryDatumSpecification.cpp b/src/dis7/DataQueryDatumSpecification.cpp index d20c754b..f23bd734 100644 --- a/src/dis7/DataQueryDatumSpecification.cpp +++ b/src/dis7/DataQueryDatumSpecification.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DataQueryDatumSpecification.h" using namespace DIS; diff --git a/src/dis7/DataQueryDatumSpecification.h b/src/dis7/DataQueryDatumSpecification.h index 25e6f601..c6e42e2d 100644 --- a/src/dis7/DataQueryDatumSpecification.h +++ b/src/dis7/DataQueryDatumSpecification.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include "dis7/UnsignedDISInteger.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // List of fixed and variable datum records. Section 6.2.18 diff --git a/src/dis7/DataQueryPdu.cpp b/src/dis7/DataQueryPdu.cpp index 0b1aa951..e020b457 100644 --- a/src/dis7/DataQueryPdu.cpp +++ b/src/dis7/DataQueryPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DataQueryPdu.h" using namespace DIS; diff --git a/src/dis7/DataQueryPdu.h b/src/dis7/DataQueryPdu.h index 2195c1fb..26417f7c 100644 --- a/src/dis7/DataQueryPdu.h +++ b/src/dis7/DataQueryPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.9. Request for data from an entity. COMPLETE diff --git a/src/dis7/DataQueryReliablePdu.cpp b/src/dis7/DataQueryReliablePdu.cpp index a1752ed5..e0dd9505 100644 --- a/src/dis7/DataQueryReliablePdu.cpp +++ b/src/dis7/DataQueryReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DataQueryReliablePdu.h" using namespace DIS; diff --git a/src/dis7/DataQueryReliablePdu.h b/src/dis7/DataQueryReliablePdu.h index 190c28ae..e4500695 100644 --- a/src/dis7/DataQueryReliablePdu.h +++ b/src/dis7/DataQueryReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.8: request for data from an entity. COMPLETE diff --git a/src/dis7/DataReliablePdu.cpp b/src/dis7/DataReliablePdu.cpp index c73c519a..f95d93da 100644 --- a/src/dis7/DataReliablePdu.cpp +++ b/src/dis7/DataReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DataReliablePdu.h" using namespace DIS; diff --git a/src/dis7/DataReliablePdu.h b/src/dis7/DataReliablePdu.h index e1738acb..2635c935 100644 --- a/src/dis7/DataReliablePdu.h +++ b/src/dis7/DataReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.10: issued in response to a data query R or set dataR pdu. diff --git a/src/dis7/DatumSpecification.cpp b/src/dis7/DatumSpecification.cpp index f9811786..03e96e93 100644 --- a/src/dis7/DatumSpecification.cpp +++ b/src/dis7/DatumSpecification.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DatumSpecification.h" using namespace DIS; diff --git a/src/dis7/DatumSpecification.h b/src/dis7/DatumSpecification.h index de8dfa98..c388edd1 100644 --- a/src/dis7/DatumSpecification.h +++ b/src/dis7/DatumSpecification.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // List of fixed and variable datum records. Section 6.2.19 diff --git a/src/dis7/DeadReckoningParameters.cpp b/src/dis7/DeadReckoningParameters.cpp index b4377935..858ac8f5 100644 --- a/src/dis7/DeadReckoningParameters.cpp +++ b/src/dis7/DeadReckoningParameters.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DeadReckoningParameters.h" using namespace DIS; diff --git a/src/dis7/DeadReckoningParameters.h b/src/dis7/DeadReckoningParameters.h index aa8c398f..9b60390b 100644 --- a/src/dis7/DeadReckoningParameters.h +++ b/src/dis7/DeadReckoningParameters.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Not specified in the standard. This is used by the ESPDU diff --git a/src/dis7/DesignatorPdu.cpp b/src/dis7/DesignatorPdu.cpp index e7298ae2..0d0d1992 100644 --- a/src/dis7/DesignatorPdu.cpp +++ b/src/dis7/DesignatorPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DesignatorPdu.h" using namespace DIS; diff --git a/src/dis7/DesignatorPdu.h b/src/dis7/DesignatorPdu.h index 7f2ef166..19f56a38 100644 --- a/src/dis7/DesignatorPdu.h +++ b/src/dis7/DesignatorPdu.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "dis7/DistributedEmissionsFamilyPdu.h" +#include "dis7/EntityID.h" +#include "dis7/Vector3Double.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.7.2. Handles designating operations. COMPLETE diff --git a/src/dis7/DetonationPdu.cpp b/src/dis7/DetonationPdu.cpp index a996e236..0954cc42 100644 --- a/src/dis7/DetonationPdu.cpp +++ b/src/dis7/DetonationPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DetonationPdu.h" using namespace DIS; diff --git a/src/dis7/DetonationPdu.h b/src/dis7/DetonationPdu.h index 54620815..70b32bb2 100644 --- a/src/dis7/DetonationPdu.h +++ b/src/dis7/DetonationPdu.h @@ -2,15 +2,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EventIdentifier.h" +#include "dis7/MunitionDescriptor.h" +#include "dis7/VariableParameter.h" +#include "dis7/Vector3Double.h" +#include "dis7/Vector3Float.h" +#include "dis7/WarfareFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Detonation or impact of munitions, as well as, non-munition explosions, the diff --git a/src/dis7/DirectedEnergyAreaAimpoint.cpp b/src/dis7/DirectedEnergyAreaAimpoint.cpp index 1ca9093e..4568fce8 100644 --- a/src/dis7/DirectedEnergyAreaAimpoint.cpp +++ b/src/dis7/DirectedEnergyAreaAimpoint.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DirectedEnergyAreaAimpoint.h" using namespace DIS; diff --git a/src/dis7/DirectedEnergyAreaAimpoint.h b/src/dis7/DirectedEnergyAreaAimpoint.h index 119f3018..17d0a90c 100644 --- a/src/dis7/DirectedEnergyAreaAimpoint.h +++ b/src/dis7/DirectedEnergyAreaAimpoint.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis7/BeamAntennaPattern.h" +#include "dis7/DirectedEnergyTargetEnergyDeposition.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // DE Precision Aimpoint Record. NOT COMPLETE. Section 6.2.21.2 diff --git a/src/dis7/DirectedEnergyDamage.cpp b/src/dis7/DirectedEnergyDamage.cpp index 0ca7bfdc..5a144735 100644 --- a/src/dis7/DirectedEnergyDamage.cpp +++ b/src/dis7/DirectedEnergyDamage.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DirectedEnergyDamage.h" using namespace DIS; diff --git a/src/dis7/DirectedEnergyDamage.h b/src/dis7/DirectedEnergyDamage.h index 8eb140d9..c5d21dda 100644 --- a/src/dis7/DirectedEnergyDamage.h +++ b/src/dis7/DirectedEnergyDamage.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EventIdentifier.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Damage sustained by an entity due to directed energy. Location of the damage diff --git a/src/dis7/DirectedEnergyFirePdu.cpp b/src/dis7/DirectedEnergyFirePdu.cpp index 661fed22..d5ac9152 100644 --- a/src/dis7/DirectedEnergyFirePdu.cpp +++ b/src/dis7/DirectedEnergyFirePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DirectedEnergyFirePdu.h" using namespace DIS; diff --git a/src/dis7/DirectedEnergyFirePdu.h b/src/dis7/DirectedEnergyFirePdu.h index e5895588..fb75bb65 100644 --- a/src/dis7/DirectedEnergyFirePdu.h +++ b/src/dis7/DirectedEnergyFirePdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/ClockTime.h" +#include "dis7/EntityType.h" +#include "dis7/StandardVariableSpecification.h" +#include "dis7/Vector3Float.h" +#include "dis7/WarfareFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Firing of a directed energy weapon shall be communicated by issuing a diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.cpp b/src/dis7/DirectedEnergyPrecisionAimpoint.cpp index 4072e179..d7ecc2a9 100644 --- a/src/dis7/DirectedEnergyPrecisionAimpoint.cpp +++ b/src/dis7/DirectedEnergyPrecisionAimpoint.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DirectedEnergyPrecisionAimpoint.h" using namespace DIS; diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.h b/src/dis7/DirectedEnergyPrecisionAimpoint.h index ae534480..1e34f96c 100644 --- a/src/dis7/DirectedEnergyPrecisionAimpoint.h +++ b/src/dis7/DirectedEnergyPrecisionAimpoint.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/Vector3Double.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // DE Precision Aimpoint Record. Section 6.2.21.3 diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp b/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp index 7e8829d7..e525e95f 100644 --- a/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp +++ b/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DirectedEnergyTargetEnergyDeposition.h" using namespace DIS; diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.h b/src/dis7/DirectedEnergyTargetEnergyDeposition.h index a90f6209..8aabbe81 100644 --- a/src/dis7/DirectedEnergyTargetEnergyDeposition.h +++ b/src/dis7/DirectedEnergyTargetEnergyDeposition.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // DE energy depostion properties for a target entity. Section 6.2.21.4 diff --git a/src/dis7/DistributedEmissionsFamilyPdu.cpp b/src/dis7/DistributedEmissionsFamilyPdu.cpp index a2ff85dc..e6a3697e 100644 --- a/src/dis7/DistributedEmissionsFamilyPdu.cpp +++ b/src/dis7/DistributedEmissionsFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/DistributedEmissionsFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/DistributedEmissionsFamilyPdu.h b/src/dis7/DistributedEmissionsFamilyPdu.h index aa17461b..11cba817 100644 --- a/src/dis7/DistributedEmissionsFamilyPdu.h +++ b/src/dis7/DistributedEmissionsFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.7. Electromagnetic Emissions. Abstract superclass for distirubted diff --git a/src/dis7/EEFundamentalParameterData.cpp b/src/dis7/EEFundamentalParameterData.cpp index 75209d8f..787235ca 100644 --- a/src/dis7/EEFundamentalParameterData.cpp +++ b/src/dis7/EEFundamentalParameterData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EEFundamentalParameterData.h" using namespace DIS; diff --git a/src/dis7/EEFundamentalParameterData.h b/src/dis7/EEFundamentalParameterData.h index 6ed613e3..ad7d6ea4 100644 --- a/src/dis7/EEFundamentalParameterData.h +++ b/src/dis7/EEFundamentalParameterData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Contains electromagnetic emmission regeneration parameters that are variable diff --git a/src/dis7/EightByteChunk.cpp b/src/dis7/EightByteChunk.cpp index ed675af6..a0496fc5 100644 --- a/src/dis7/EightByteChunk.cpp +++ b/src/dis7/EightByteChunk.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EightByteChunk.h" using namespace DIS; diff --git a/src/dis7/EightByteChunk.h b/src/dis7/EightByteChunk.h index c45bff58..7995d211 100644 --- a/src/dis7/EightByteChunk.h +++ b/src/dis7/EightByteChunk.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // 64 bit piece of data diff --git a/src/dis7/ElectromagneticEmissionBeamData.cpp b/src/dis7/ElectromagneticEmissionBeamData.cpp index 34d0c6d4..f3edb5ac 100644 --- a/src/dis7/ElectromagneticEmissionBeamData.cpp +++ b/src/dis7/ElectromagneticEmissionBeamData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ElectromagneticEmissionBeamData.h" using namespace DIS; diff --git a/src/dis7/ElectromagneticEmissionBeamData.h b/src/dis7/ElectromagneticEmissionBeamData.h index 7377a002..9c95e929 100644 --- a/src/dis7/ElectromagneticEmissionBeamData.h +++ b/src/dis7/ElectromagneticEmissionBeamData.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis7/BeamData.h" +#include "dis7/EEFundamentalParameterData.h" +#include "dis7/JammingTechnique.h" +#include "dis7/TrackJamData.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Description of one electronic emission beam diff --git a/src/dis7/ElectromagneticEmissionSystemData.cpp b/src/dis7/ElectromagneticEmissionSystemData.cpp index c6d2a601..0750712c 100644 --- a/src/dis7/ElectromagneticEmissionSystemData.cpp +++ b/src/dis7/ElectromagneticEmissionSystemData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ElectromagneticEmissionSystemData.h" using namespace DIS; diff --git a/src/dis7/ElectromagneticEmissionSystemData.h b/src/dis7/ElectromagneticEmissionSystemData.h index 55f5f489..c7b747dd 100644 --- a/src/dis7/ElectromagneticEmissionSystemData.h +++ b/src/dis7/ElectromagneticEmissionSystemData.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include "dis7/ElectromagneticEmissionBeamData.h" +#include "dis7/EmitterSystem.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Contains electromagnetic emmission system diff --git a/src/dis7/ElectromagneticEmissionsPdu.cpp b/src/dis7/ElectromagneticEmissionsPdu.cpp index 526f4faf..fd0bf921 100644 --- a/src/dis7/ElectromagneticEmissionsPdu.cpp +++ b/src/dis7/ElectromagneticEmissionsPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ElectromagneticEmissionsPdu.h" using namespace DIS; diff --git a/src/dis7/ElectromagneticEmissionsPdu.h b/src/dis7/ElectromagneticEmissionsPdu.h index 2fbae78b..cd649dd3 100644 --- a/src/dis7/ElectromagneticEmissionsPdu.h +++ b/src/dis7/ElectromagneticEmissionsPdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/DistributedEmissionsFamilyPdu.h" +#include "dis7/ElectromagneticEmissionSystemData.h" +#include "dis7/EntityID.h" +#include "dis7/EventIdentifier.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.7.1. Information about active electronic warfare (EW) emissions diff --git a/src/dis7/EmitterSystem.cpp b/src/dis7/EmitterSystem.cpp index 893fb29f..f1350339 100644 --- a/src/dis7/EmitterSystem.cpp +++ b/src/dis7/EmitterSystem.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EmitterSystem.h" using namespace DIS; diff --git a/src/dis7/EmitterSystem.h b/src/dis7/EmitterSystem.h index 525e3a71..de49784a 100644 --- a/src/dis7/EmitterSystem.h +++ b/src/dis7/EmitterSystem.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // This field shall specify information about a particular emitter system. diff --git a/src/dis7/EngineFuel.cpp b/src/dis7/EngineFuel.cpp index 3df7f83f..12d8bb53 100644 --- a/src/dis7/EngineFuel.cpp +++ b/src/dis7/EngineFuel.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EngineFuel.h" using namespace DIS; diff --git a/src/dis7/EngineFuel.h b/src/dis7/EngineFuel.h index 981632a7..abc0db06 100644 --- a/src/dis7/EngineFuel.h +++ b/src/dis7/EngineFuel.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about an entity's engine fuel. Section 6.2.24. diff --git a/src/dis7/EngineFuelReload.cpp b/src/dis7/EngineFuelReload.cpp index eab5da58..8c807926 100644 --- a/src/dis7/EngineFuelReload.cpp +++ b/src/dis7/EngineFuelReload.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EngineFuelReload.h" using namespace DIS; diff --git a/src/dis7/EngineFuelReload.h b/src/dis7/EngineFuelReload.h index a04b96ff..4cb24848 100644 --- a/src/dis7/EngineFuelReload.h +++ b/src/dis7/EngineFuelReload.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // For each type or location of engine fuell, this record specifies the type, diff --git a/src/dis7/EntityAssociation.cpp b/src/dis7/EntityAssociation.cpp index cc17e41c..c545e5ba 100644 --- a/src/dis7/EntityAssociation.cpp +++ b/src/dis7/EntityAssociation.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityAssociation.h" using namespace DIS; diff --git a/src/dis7/EntityAssociation.h b/src/dis7/EntityAssociation.h index 3046b9f7..aa82f550 100644 --- a/src/dis7/EntityAssociation.h +++ b/src/dis7/EntityAssociation.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Association or disassociation of two entities. Section 6.2.93.4 diff --git a/src/dis7/EntityDamageStatusPdu.cpp b/src/dis7/EntityDamageStatusPdu.cpp index 52bf7385..cc2cbea2 100644 --- a/src/dis7/EntityDamageStatusPdu.cpp +++ b/src/dis7/EntityDamageStatusPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityDamageStatusPdu.h" using namespace DIS; diff --git a/src/dis7/EntityDamageStatusPdu.h b/src/dis7/EntityDamageStatusPdu.h index b181747a..8379bd63 100644 --- a/src/dis7/EntityDamageStatusPdu.h +++ b/src/dis7/EntityDamageStatusPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/DirectedEnergyDamage.h" +#include "dis7/EntityID.h" +#include "dis7/WarfareFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // shall be used to communicate detailed damage information sustained by an diff --git a/src/dis7/EntityID.cpp b/src/dis7/EntityID.cpp index 97cc6cfd..6bdea8de 100644 --- a/src/dis7/EntityID.cpp +++ b/src/dis7/EntityID.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityID.h" using namespace DIS; diff --git a/src/dis7/EntityID.h b/src/dis7/EntityID.h index 8ce733ab..ad0509ae 100644 --- a/src/dis7/EntityID.h +++ b/src/dis7/EntityID.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Entity Identifier. Unique ID for entities in the world. Consists of an diff --git a/src/dis7/EntityInformationFamilyPdu.cpp b/src/dis7/EntityInformationFamilyPdu.cpp index 2e93287f..cfa00ebf 100644 --- a/src/dis7/EntityInformationFamilyPdu.cpp +++ b/src/dis7/EntityInformationFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityInformationFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/EntityInformationFamilyPdu.h b/src/dis7/EntityInformationFamilyPdu.h index ca4182b8..365b7468 100644 --- a/src/dis7/EntityInformationFamilyPdu.h +++ b/src/dis7/EntityInformationFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.3. Common superclass for EntityState, Collision, diff --git a/src/dis7/EntityManagementFamilyPdu.cpp b/src/dis7/EntityManagementFamilyPdu.cpp index 54ad5b0d..73d70332 100644 --- a/src/dis7/EntityManagementFamilyPdu.cpp +++ b/src/dis7/EntityManagementFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityManagementFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/EntityManagementFamilyPdu.h b/src/dis7/EntityManagementFamilyPdu.h index 361f4444..65284d17 100644 --- a/src/dis7/EntityManagementFamilyPdu.h +++ b/src/dis7/EntityManagementFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Managment of grouping of PDUs, and more. Section 7.8 diff --git a/src/dis7/EntityMarking.cpp b/src/dis7/EntityMarking.cpp index 974d81f4..4d4dddd3 100644 --- a/src/dis7/EntityMarking.cpp +++ b/src/dis7/EntityMarking.cpp @@ -1,6 +1,6 @@ #include -#include +#include "dis7/EntityMarking.h" using namespace DIS; diff --git a/src/dis7/EntityMarking.h b/src/dis7/EntityMarking.h index 6807c2ff..3374792d 100644 --- a/src/dis7/EntityMarking.h +++ b/src/dis7/EntityMarking.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Specifies the character set used inthe first byte, followed by 11 characters diff --git a/src/dis7/EntityStatePdu.cpp b/src/dis7/EntityStatePdu.cpp index d8cb0c8c..48aacb96 100644 --- a/src/dis7/EntityStatePdu.cpp +++ b/src/dis7/EntityStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityStatePdu.h" using namespace DIS; diff --git a/src/dis7/EntityStatePdu.h b/src/dis7/EntityStatePdu.h index 29c8bcc5..ae907a82 100644 --- a/src/dis7/EntityStatePdu.h +++ b/src/dis7/EntityStatePdu.h @@ -2,17 +2,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/DeadReckoningParameters.h" +#include "dis7/EntityID.h" +#include "dis7/EntityInformationFamilyPdu.h" +#include "dis7/EntityMarking.h" +#include "dis7/EntityType.h" +#include "dis7/EulerAngles.h" +#include "dis7/VariableParameter.h" +#include "dis7/Vector3Double.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Represents the postion and state of one entity in the world. Section 7.2.2. diff --git a/src/dis7/EntityStateUpdatePdu.cpp b/src/dis7/EntityStateUpdatePdu.cpp index 37ce25ce..4801064e 100644 --- a/src/dis7/EntityStateUpdatePdu.cpp +++ b/src/dis7/EntityStateUpdatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityStateUpdatePdu.h" using namespace DIS; diff --git a/src/dis7/EntityStateUpdatePdu.h b/src/dis7/EntityStateUpdatePdu.h index 9f3b0a27..66e383a5 100644 --- a/src/dis7/EntityStateUpdatePdu.h +++ b/src/dis7/EntityStateUpdatePdu.h @@ -2,14 +2,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EntityInformationFamilyPdu.h" +#include "dis7/EulerAngles.h" +#include "dis7/VariableParameter.h" +#include "dis7/Vector3Double.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Nonstatic information about a particular entity may be communicated by diff --git a/src/dis7/EntityType.cpp b/src/dis7/EntityType.cpp index 379d101f..47c740a8 100644 --- a/src/dis7/EntityType.cpp +++ b/src/dis7/EntityType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityType.h" using namespace DIS; diff --git a/src/dis7/EntityType.h b/src/dis7/EntityType.h index 33944cdc..31ba6ce8 100644 --- a/src/dis7/EntityType.h +++ b/src/dis7/EntityType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Identifies the type of entity, including kind of entity, domain (surface, diff --git a/src/dis7/EntityTypeVP.cpp b/src/dis7/EntityTypeVP.cpp index 0e375f2a..7524c5b9 100644 --- a/src/dis7/EntityTypeVP.cpp +++ b/src/dis7/EntityTypeVP.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EntityTypeVP.h" using namespace DIS; diff --git a/src/dis7/EntityTypeVP.h b/src/dis7/EntityTypeVP.h index ce206e5e..d229b639 100644 --- a/src/dis7/EntityTypeVP.h +++ b/src/dis7/EntityTypeVP.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Association or disassociation of two entities. Section 6.2.93.5 diff --git a/src/dis7/Environment.cpp b/src/dis7/Environment.cpp index da9c1e72..dec1f7ff 100644 --- a/src/dis7/Environment.cpp +++ b/src/dis7/Environment.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Environment.h" using namespace DIS; diff --git a/src/dis7/Environment.h b/src/dis7/Environment.h index 7a63fa48..43dd568a 100644 --- a/src/dis7/Environment.h +++ b/src/dis7/Environment.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Incomplete environment record; requires hand coding to fix. Section 6.2.31.1 diff --git a/src/dis7/EnvironmentGeneral.cpp b/src/dis7/EnvironmentGeneral.cpp index 71152712..514bfb10 100644 --- a/src/dis7/EnvironmentGeneral.cpp +++ b/src/dis7/EnvironmentGeneral.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EnvironmentGeneral.h" using namespace DIS; diff --git a/src/dis7/EnvironmentGeneral.h b/src/dis7/EnvironmentGeneral.h index 8ea1cd5e..3fd8c32b 100644 --- a/src/dis7/EnvironmentGeneral.h +++ b/src/dis7/EnvironmentGeneral.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about a geometry, a state associated with a geometry, a bounding diff --git a/src/dis7/EnvironmentType.cpp b/src/dis7/EnvironmentType.cpp index 80730c62..7682d471 100644 --- a/src/dis7/EnvironmentType.cpp +++ b/src/dis7/EnvironmentType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EnvironmentType.h" using namespace DIS; diff --git a/src/dis7/EnvironmentType.h b/src/dis7/EnvironmentType.h index 4c3fdabd..269f70ab 100644 --- a/src/dis7/EnvironmentType.h +++ b/src/dis7/EnvironmentType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Description of environmental data in environmental process and gridded data diff --git a/src/dis7/EulerAngles.cpp b/src/dis7/EulerAngles.cpp index fdaece9e..e8889a97 100644 --- a/src/dis7/EulerAngles.cpp +++ b/src/dis7/EulerAngles.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EulerAngles.h" using namespace DIS; diff --git a/src/dis7/EulerAngles.h b/src/dis7/EulerAngles.h index 362433d3..cab26d14 100644 --- a/src/dis7/EulerAngles.h +++ b/src/dis7/EulerAngles.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Three floating point values representing an orientation, psi, theta, and phi, diff --git a/src/dis7/EventIdentifier.cpp b/src/dis7/EventIdentifier.cpp index ece06cd4..d081f08f 100644 --- a/src/dis7/EventIdentifier.cpp +++ b/src/dis7/EventIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EventIdentifier.h" using namespace DIS; diff --git a/src/dis7/EventIdentifier.h b/src/dis7/EventIdentifier.h index 52db134a..1467d001 100644 --- a/src/dis7/EventIdentifier.h +++ b/src/dis7/EventIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Identifies an event in the world. Use this format for every PDU EXCEPT the diff --git a/src/dis7/EventIdentifierLiveEntity.cpp b/src/dis7/EventIdentifierLiveEntity.cpp index aeed043d..409bec5b 100644 --- a/src/dis7/EventIdentifierLiveEntity.cpp +++ b/src/dis7/EventIdentifierLiveEntity.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EventIdentifierLiveEntity.h" using namespace DIS; diff --git a/src/dis7/EventIdentifierLiveEntity.h b/src/dis7/EventIdentifierLiveEntity.h index 804f456c..cd37c9a4 100644 --- a/src/dis7/EventIdentifierLiveEntity.h +++ b/src/dis7/EventIdentifierLiveEntity.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. diff --git a/src/dis7/EventReportPdu.cpp b/src/dis7/EventReportPdu.cpp index d1c08627..f7526d8e 100644 --- a/src/dis7/EventReportPdu.cpp +++ b/src/dis7/EventReportPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EventReportPdu.h" using namespace DIS; diff --git a/src/dis7/EventReportPdu.h b/src/dis7/EventReportPdu.h index dc99239a..94d83232 100644 --- a/src/dis7/EventReportPdu.h +++ b/src/dis7/EventReportPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Reports occurance of a significant event to the simulation manager. diff --git a/src/dis7/EventReportReliablePdu.cpp b/src/dis7/EventReportReliablePdu.cpp index 7b5c09ed..499dd205 100644 --- a/src/dis7/EventReportReliablePdu.cpp +++ b/src/dis7/EventReportReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/EventReportReliablePdu.h" using namespace DIS; diff --git a/src/dis7/EventReportReliablePdu.h b/src/dis7/EventReportReliablePdu.h index 1b39dda9..0604f764 100644 --- a/src/dis7/EventReportReliablePdu.h +++ b/src/dis7/EventReportReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.11: reports the occurance of a significatnt event to the diff --git a/src/dis7/Expendable.cpp b/src/dis7/Expendable.cpp index 1c45c867..73556925 100644 --- a/src/dis7/Expendable.cpp +++ b/src/dis7/Expendable.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Expendable.h" using namespace DIS; diff --git a/src/dis7/Expendable.h b/src/dis7/Expendable.h index 0bc76748..70d928c5 100644 --- a/src/dis7/Expendable.h +++ b/src/dis7/Expendable.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // An entity's expendable (chaff, flares, etc) information. Section 6.2.36 diff --git a/src/dis7/ExpendableDescriptor.cpp b/src/dis7/ExpendableDescriptor.cpp index ec272ad9..2bb1e931 100644 --- a/src/dis7/ExpendableDescriptor.cpp +++ b/src/dis7/ExpendableDescriptor.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ExpendableDescriptor.h" using namespace DIS; diff --git a/src/dis7/ExpendableDescriptor.h b/src/dis7/ExpendableDescriptor.h index 78551362..1c8e9f6d 100644 --- a/src/dis7/ExpendableDescriptor.h +++ b/src/dis7/ExpendableDescriptor.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Burst of chaff or expendible device. Section 6.2.20.4 diff --git a/src/dis7/ExpendableReload.cpp b/src/dis7/ExpendableReload.cpp index 05f4c55d..e1174b88 100644 --- a/src/dis7/ExpendableReload.cpp +++ b/src/dis7/ExpendableReload.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ExpendableReload.h" using namespace DIS; diff --git a/src/dis7/ExpendableReload.h b/src/dis7/ExpendableReload.h index 161396b5..fcfa77e1 100644 --- a/src/dis7/ExpendableReload.h +++ b/src/dis7/ExpendableReload.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // An entity's expendable (chaff, flares, etc) information. Section 6.2.37 diff --git a/src/dis7/ExplosionDescriptor.cpp b/src/dis7/ExplosionDescriptor.cpp index 54f15b37..5fa67989 100644 --- a/src/dis7/ExplosionDescriptor.cpp +++ b/src/dis7/ExplosionDescriptor.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ExplosionDescriptor.h" using namespace DIS; diff --git a/src/dis7/ExplosionDescriptor.h b/src/dis7/ExplosionDescriptor.h index 4f992a69..3b0db7bd 100644 --- a/src/dis7/ExplosionDescriptor.h +++ b/src/dis7/ExplosionDescriptor.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Explosion of a non-munition. Section 6.2.20.3 diff --git a/src/dis7/FalseTargetsAttribute.cpp b/src/dis7/FalseTargetsAttribute.cpp index a87b02ba..2ca561bb 100644 --- a/src/dis7/FalseTargetsAttribute.cpp +++ b/src/dis7/FalseTargetsAttribute.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/FalseTargetsAttribute.h" using namespace DIS; diff --git a/src/dis7/FalseTargetsAttribute.h b/src/dis7/FalseTargetsAttribute.h index 401cdb8a..c5c65293 100644 --- a/src/dis7/FalseTargetsAttribute.h +++ b/src/dis7/FalseTargetsAttribute.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The False Targets attribute record shall be used to communicate discrete diff --git a/src/dis7/FastEntityStatePdu.cpp b/src/dis7/FastEntityStatePdu.cpp index 68c46b8c..37e42dbe 100644 --- a/src/dis7/FastEntityStatePdu.cpp +++ b/src/dis7/FastEntityStatePdu.cpp @@ -1,6 +1,6 @@ #include -#include +#include "dis7/FastEntityStatePdu.h" using namespace DIS; diff --git a/src/dis7/FastEntityStatePdu.h b/src/dis7/FastEntityStatePdu.h index 8ba9efe2..2c858228 100644 --- a/src/dis7/FastEntityStatePdu.h +++ b/src/dis7/FastEntityStatePdu.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis7/EntityInformationFamilyPdu.h" +#include "dis7/VariableParameter.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Represents the postion and state of one entity in the world. This is diff --git a/src/dis7/FirePdu.cpp b/src/dis7/FirePdu.cpp index 09fec48a..9458ee4c 100644 --- a/src/dis7/FirePdu.cpp +++ b/src/dis7/FirePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/FirePdu.h" using namespace DIS; diff --git a/src/dis7/FirePdu.h b/src/dis7/FirePdu.h index 087530cb..9a3dcb90 100644 --- a/src/dis7/FirePdu.h +++ b/src/dis7/FirePdu.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EventIdentifier.h" +#include "dis7/MunitionDescriptor.h" +#include "dis7/Vector3Double.h" +#include "dis7/Vector3Float.h" +#include "dis7/WarfareFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The firing of a weapon or expendable shall be communicated by issuing a Fire diff --git a/src/dis7/FixedDatum.cpp b/src/dis7/FixedDatum.cpp index aa099240..fa772df8 100644 --- a/src/dis7/FixedDatum.cpp +++ b/src/dis7/FixedDatum.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/FixedDatum.h" using namespace DIS; diff --git a/src/dis7/FixedDatum.h b/src/dis7/FixedDatum.h index 4dce1945..9cb1ae72 100644 --- a/src/dis7/FixedDatum.h +++ b/src/dis7/FixedDatum.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Fixed Datum Record. Section 6.2.38 diff --git a/src/dis7/FourByteChunk.cpp b/src/dis7/FourByteChunk.cpp index 0ccf6a0b..eb075e12 100644 --- a/src/dis7/FourByteChunk.cpp +++ b/src/dis7/FourByteChunk.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/FourByteChunk.h" using namespace DIS; diff --git a/src/dis7/FourByteChunk.h b/src/dis7/FourByteChunk.h index 2b5ad8fa..07118f5a 100644 --- a/src/dis7/FourByteChunk.h +++ b/src/dis7/FourByteChunk.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // 32 bit piece of data diff --git a/src/dis7/FundamentalOperationalData.cpp b/src/dis7/FundamentalOperationalData.cpp index c7dd5b26..75c7b5b2 100644 --- a/src/dis7/FundamentalOperationalData.cpp +++ b/src/dis7/FundamentalOperationalData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/FundamentalOperationalData.h" using namespace DIS; diff --git a/src/dis7/FundamentalOperationalData.h b/src/dis7/FundamentalOperationalData.h index 2652f596..e68e531a 100644 --- a/src/dis7/FundamentalOperationalData.h +++ b/src/dis7/FundamentalOperationalData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Basic operational data for IFF. Section 6.2.40. diff --git a/src/dis7/GridAxis.cpp b/src/dis7/GridAxis.cpp index 2f90083c..d475be02 100644 --- a/src/dis7/GridAxis.cpp +++ b/src/dis7/GridAxis.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/GridAxis.h" using namespace DIS; diff --git a/src/dis7/GridAxis.h b/src/dis7/GridAxis.h index b3885845..d82384bc 100644 --- a/src/dis7/GridAxis.h +++ b/src/dis7/GridAxis.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Grid axis record for fixed data. Section 6.2.41 diff --git a/src/dis7/GroupIdentifier.cpp b/src/dis7/GroupIdentifier.cpp index a1693e7c..3d20d1c4 100644 --- a/src/dis7/GroupIdentifier.cpp +++ b/src/dis7/GroupIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/GroupIdentifier.h" using namespace DIS; diff --git a/src/dis7/GroupIdentifier.h b/src/dis7/GroupIdentifier.h index b08d58ad..e630c1fd 100644 --- a/src/dis7/GroupIdentifier.h +++ b/src/dis7/GroupIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Unique designation of a group of entities contained in the isGroupOfPdu. diff --git a/src/dis7/IFFFundamentalParameterData.cpp b/src/dis7/IFFFundamentalParameterData.cpp index 9793d627..4e5ad489 100644 --- a/src/dis7/IFFFundamentalParameterData.cpp +++ b/src/dis7/IFFFundamentalParameterData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IFFFundamentalParameterData.h" using namespace DIS; diff --git a/src/dis7/IFFFundamentalParameterData.h b/src/dis7/IFFFundamentalParameterData.h index d7b3a94d..a1d1aa15 100644 --- a/src/dis7/IFFFundamentalParameterData.h +++ b/src/dis7/IFFFundamentalParameterData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Fundamental IFF atc data. Section 6.2.45 diff --git a/src/dis7/IFFPdu.cpp b/src/dis7/IFFPdu.cpp index 652d03a3..c5174678 100644 --- a/src/dis7/IFFPdu.cpp +++ b/src/dis7/IFFPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IFFPdu.h" using namespace DIS; diff --git a/src/dis7/IFFPdu.h b/src/dis7/IFFPdu.h index eb1afea5..2be64f5e 100644 --- a/src/dis7/IFFPdu.h +++ b/src/dis7/IFFPdu.h @@ -2,18 +2,18 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/BeamData.h" +#include "dis7/DistributedEmissionsFamilyPdu.h" +#include "dis7/EntityID.h" +#include "dis7/EventIdentifier.h" +#include "dis7/FundamentalOperationalData.h" +#include "dis7/IFFFundamentalParameterData.h" +#include "dis7/LayerHeader.h" +#include "dis7/SecondaryOperationalData.h" +#include "dis7/SystemIdentifier.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // This PDU is written according SISO Standard, the link is on below: diff --git a/src/dis7/IOCommunicationsNode.cpp b/src/dis7/IOCommunicationsNode.cpp index 3fa605b4..7c02612d 100644 --- a/src/dis7/IOCommunicationsNode.cpp +++ b/src/dis7/IOCommunicationsNode.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IOCommunicationsNode.h" using namespace DIS; diff --git a/src/dis7/IOCommunicationsNode.h b/src/dis7/IOCommunicationsNode.h index c29ccb6d..8847d939 100644 --- a/src/dis7/IOCommunicationsNode.h +++ b/src/dis7/IOCommunicationsNode.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // A communications node that is part of a simulted communcations network. diff --git a/src/dis7/IOEffect.cpp b/src/dis7/IOEffect.cpp index 5ddc941c..8a610b07 100644 --- a/src/dis7/IOEffect.cpp +++ b/src/dis7/IOEffect.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IOEffect.h" using namespace DIS; diff --git a/src/dis7/IOEffect.h b/src/dis7/IOEffect.h index 295ee826..4c5a58e3 100644 --- a/src/dis7/IOEffect.h +++ b/src/dis7/IOEffect.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Effect of IO on an entity. Section 6.2.49.3 diff --git a/src/dis7/IffDataSpecification.cpp b/src/dis7/IffDataSpecification.cpp index cf514068..f0a1092f 100644 --- a/src/dis7/IffDataSpecification.cpp +++ b/src/dis7/IffDataSpecification.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IffDataSpecification.h" using namespace DIS; diff --git a/src/dis7/IffDataSpecification.h b/src/dis7/IffDataSpecification.h index 373391ed..0708973e 100644 --- a/src/dis7/IffDataSpecification.h +++ b/src/dis7/IffDataSpecification.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Requires hand coding to be useful. Section 6.2.44 diff --git a/src/dis7/IntercomCommunicationsParameters.cpp b/src/dis7/IntercomCommunicationsParameters.cpp index d8f16a19..a34d7ce1 100644 --- a/src/dis7/IntercomCommunicationsParameters.cpp +++ b/src/dis7/IntercomCommunicationsParameters.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IntercomCommunicationsParameters.h" using namespace DIS; diff --git a/src/dis7/IntercomCommunicationsParameters.h b/src/dis7/IntercomCommunicationsParameters.h index 294f7f2a..3b4d2b43 100644 --- a/src/dis7/IntercomCommunicationsParameters.h +++ b/src/dis7/IntercomCommunicationsParameters.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Intercom communcations parameters. Section 6.2.47. This requires hand coding diff --git a/src/dis7/IntercomIdentifier.cpp b/src/dis7/IntercomIdentifier.cpp index e2bba694..5014038b 100644 --- a/src/dis7/IntercomIdentifier.cpp +++ b/src/dis7/IntercomIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IntercomIdentifier.h" using namespace DIS; diff --git a/src/dis7/IntercomIdentifier.h b/src/dis7/IntercomIdentifier.h index f2dbd7f2..d614eeb8 100644 --- a/src/dis7/IntercomIdentifier.h +++ b/src/dis7/IntercomIdentifier.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Unique designation of an attached or unattached intercom in an event or diff --git a/src/dis7/IntercomSignalPdu.cpp b/src/dis7/IntercomSignalPdu.cpp index f070c019..c3ad997f 100644 --- a/src/dis7/IntercomSignalPdu.cpp +++ b/src/dis7/IntercomSignalPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IntercomSignalPdu.h" using namespace DIS; diff --git a/src/dis7/IntercomSignalPdu.h b/src/dis7/IntercomSignalPdu.h index 4adf9152..63f5b27b 100644 --- a/src/dis7/IntercomSignalPdu.h +++ b/src/dis7/IntercomSignalPdu.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/RadioCommunicationsFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Actual transmission of intercome voice data. Section 7.7.5. COMPLETE diff --git a/src/dis7/IsPartOfPdu.cpp b/src/dis7/IsPartOfPdu.cpp index 206a70e4..d20d38d7 100644 --- a/src/dis7/IsPartOfPdu.cpp +++ b/src/dis7/IsPartOfPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/IsPartOfPdu.h" using namespace DIS; diff --git a/src/dis7/IsPartOfPdu.h b/src/dis7/IsPartOfPdu.h index f97852d4..66b7ea3f 100644 --- a/src/dis7/IsPartOfPdu.h +++ b/src/dis7/IsPartOfPdu.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EntityManagementFamilyPdu.h" +#include "dis7/EntityType.h" +#include "dis7/NamedLocationIdentification.h" +#include "dis7/Relationship.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The joining of two or more simulation entities is communicated by this PDU. diff --git a/src/dis7/JammingTechnique.cpp b/src/dis7/JammingTechnique.cpp index b68b944a..7e5304f2 100644 --- a/src/dis7/JammingTechnique.cpp +++ b/src/dis7/JammingTechnique.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/JammingTechnique.h" using namespace DIS; diff --git a/src/dis7/JammingTechnique.h b/src/dis7/JammingTechnique.h index 6bebb53f..5700bb7d 100644 --- a/src/dis7/JammingTechnique.h +++ b/src/dis7/JammingTechnique.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Jamming technique. Section 6.2.50 diff --git a/src/dis7/LaunchedMunitionRecord.cpp b/src/dis7/LaunchedMunitionRecord.cpp index 13122f44..cb7d8508 100644 --- a/src/dis7/LaunchedMunitionRecord.cpp +++ b/src/dis7/LaunchedMunitionRecord.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LaunchedMunitionRecord.h" using namespace DIS; diff --git a/src/dis7/LaunchedMunitionRecord.h b/src/dis7/LaunchedMunitionRecord.h index 57101454..85481693 100644 --- a/src/dis7/LaunchedMunitionRecord.h +++ b/src/dis7/LaunchedMunitionRecord.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EventIdentifier.h" +#include "dis7/Vector3Double.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Identity of a communications node. Section 6.2.51 diff --git a/src/dis7/LayerHeader.cpp b/src/dis7/LayerHeader.cpp index b4db87b9..cef00e38 100644 --- a/src/dis7/LayerHeader.cpp +++ b/src/dis7/LayerHeader.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LayerHeader.h" using namespace DIS; diff --git a/src/dis7/LayerHeader.h b/src/dis7/LayerHeader.h index 24413564..8f761341 100644 --- a/src/dis7/LayerHeader.h +++ b/src/dis7/LayerHeader.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The identification of the additional information layer number, layer-specific diff --git a/src/dis7/LinearObjectStatePdu.cpp b/src/dis7/LinearObjectStatePdu.cpp index 90fcd10e..ceedf689 100644 --- a/src/dis7/LinearObjectStatePdu.cpp +++ b/src/dis7/LinearObjectStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LinearObjectStatePdu.h" using namespace DIS; diff --git a/src/dis7/LinearObjectStatePdu.h b/src/dis7/LinearObjectStatePdu.h index 1ab66cd3..0732792a 100644 --- a/src/dis7/LinearObjectStatePdu.h +++ b/src/dis7/LinearObjectStatePdu.h @@ -2,13 +2,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/LinearSegmentParameter.h" +#include "dis7/ObjectType.h" +#include "dis7/SimulationAddress.h" +#include "dis7/SyntheticEnvironmentFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // : Information abut the addition or modification of a synthecic enviroment diff --git a/src/dis7/LinearSegmentParameter.cpp b/src/dis7/LinearSegmentParameter.cpp index 0d68c2b0..97358427 100644 --- a/src/dis7/LinearSegmentParameter.cpp +++ b/src/dis7/LinearSegmentParameter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LinearSegmentParameter.h" using namespace DIS; diff --git a/src/dis7/LinearSegmentParameter.h b/src/dis7/LinearSegmentParameter.h index 872c6d6e..4dc73ac1 100644 --- a/src/dis7/LinearSegmentParameter.h +++ b/src/dis7/LinearSegmentParameter.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EulerAngles.h" +#include "dis7/Vector3Double.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The specification of an individual segment of a linear segment synthetic diff --git a/src/dis7/LiveEntityIdentifier.cpp b/src/dis7/LiveEntityIdentifier.cpp index 7e8da003..79292270 100644 --- a/src/dis7/LiveEntityIdentifier.cpp +++ b/src/dis7/LiveEntityIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LiveEntityIdentifier.h" using namespace DIS; diff --git a/src/dis7/LiveEntityIdentifier.h b/src/dis7/LiveEntityIdentifier.h index c6918adb..4976c007 100644 --- a/src/dis7/LiveEntityIdentifier.h +++ b/src/dis7/LiveEntityIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/LiveSimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of each entity in an event or exercise that is diff --git a/src/dis7/LiveEntityPdu.cpp b/src/dis7/LiveEntityPdu.cpp index fdb52abd..08ea2268 100644 --- a/src/dis7/LiveEntityPdu.cpp +++ b/src/dis7/LiveEntityPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LiveEntityPdu.h" using namespace DIS; diff --git a/src/dis7/LiveEntityPdu.h b/src/dis7/LiveEntityPdu.h index 419d84ed..a960faa1 100644 --- a/src/dis7/LiveEntityPdu.h +++ b/src/dis7/LiveEntityPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/PduSuperclass.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The live entity PDUs have a header with some different field names, but the diff --git a/src/dis7/LiveSimulationAddress.cpp b/src/dis7/LiveSimulationAddress.cpp index e45206e1..e4162f38 100644 --- a/src/dis7/LiveSimulationAddress.cpp +++ b/src/dis7/LiveSimulationAddress.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LiveSimulationAddress.h" using namespace DIS; diff --git a/src/dis7/LiveSimulationAddress.h b/src/dis7/LiveSimulationAddress.h index b121063c..a23f0691 100644 --- a/src/dis7/LiveSimulationAddress.h +++ b/src/dis7/LiveSimulationAddress.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // A simulation's designation associated with all Live Entity IDs contained in diff --git a/src/dis7/LogisticsFamilyPdu.cpp b/src/dis7/LogisticsFamilyPdu.cpp index c1c7e5ed..1ab339d5 100644 --- a/src/dis7/LogisticsFamilyPdu.cpp +++ b/src/dis7/LogisticsFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/LogisticsFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/LogisticsFamilyPdu.h b/src/dis7/LogisticsFamilyPdu.h index 004b6839..0d7dd9bc 100644 --- a/src/dis7/LogisticsFamilyPdu.h +++ b/src/dis7/LogisticsFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Abstract superclass for logistics PDUs. Section 7.4 COMPLETE diff --git a/src/dis7/MineEntityIdentifier.cpp b/src/dis7/MineEntityIdentifier.cpp index 9c3934b5..f540b891 100644 --- a/src/dis7/MineEntityIdentifier.cpp +++ b/src/dis7/MineEntityIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/MineEntityIdentifier.h" using namespace DIS; diff --git a/src/dis7/MineEntityIdentifier.h b/src/dis7/MineEntityIdentifier.h index 1fbe4183..b509e706 100644 --- a/src/dis7/MineEntityIdentifier.h +++ b/src/dis7/MineEntityIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of a mine contained in the Minefield Data PDU. No diff --git a/src/dis7/MinefieldFamilyPdu.cpp b/src/dis7/MinefieldFamilyPdu.cpp index 2bff3b79..50940679 100644 --- a/src/dis7/MinefieldFamilyPdu.cpp +++ b/src/dis7/MinefieldFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/MinefieldFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/MinefieldFamilyPdu.h b/src/dis7/MinefieldFamilyPdu.h index 005db08c..edad597e 100644 --- a/src/dis7/MinefieldFamilyPdu.h +++ b/src/dis7/MinefieldFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Abstract superclass for PDUs relating to minefields. Section 7.9 diff --git a/src/dis7/MinefieldIdentifier.cpp b/src/dis7/MinefieldIdentifier.cpp index 023ac7c4..95551579 100644 --- a/src/dis7/MinefieldIdentifier.cpp +++ b/src/dis7/MinefieldIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/MinefieldIdentifier.h" using namespace DIS; diff --git a/src/dis7/MinefieldIdentifier.h b/src/dis7/MinefieldIdentifier.h index 5be13c46..b76295a9 100644 --- a/src/dis7/MinefieldIdentifier.h +++ b/src/dis7/MinefieldIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of a minefield Section 6.2.57 diff --git a/src/dis7/MinefieldResponseNackPdu.cpp b/src/dis7/MinefieldResponseNackPdu.cpp index 09462564..c5014a43 100644 --- a/src/dis7/MinefieldResponseNackPdu.cpp +++ b/src/dis7/MinefieldResponseNackPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/MinefieldResponseNackPdu.h" using namespace DIS; diff --git a/src/dis7/MinefieldResponseNackPdu.h b/src/dis7/MinefieldResponseNackPdu.h index 94159af2..62c0d665 100644 --- a/src/dis7/MinefieldResponseNackPdu.h +++ b/src/dis7/MinefieldResponseNackPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/EightByteChunk.h" +#include "dis7/EntityID.h" +#include "dis7/MinefieldFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // proivde the means to request a retransmit of a minefield data pdu. diff --git a/src/dis7/MinefieldStatePdu.cpp b/src/dis7/MinefieldStatePdu.cpp index de96cddc..b37ddf7a 100644 --- a/src/dis7/MinefieldStatePdu.cpp +++ b/src/dis7/MinefieldStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/MinefieldStatePdu.h" using namespace DIS; diff --git a/src/dis7/MinefieldStatePdu.h b/src/dis7/MinefieldStatePdu.h index fb2ef157..4d0cf8c4 100644 --- a/src/dis7/MinefieldStatePdu.h +++ b/src/dis7/MinefieldStatePdu.h @@ -2,14 +2,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/EulerAngles.h" +#include "dis7/MinefieldFamilyPdu.h" +#include "dis7/MinefieldIdentifier.h" +#include "dis7/Vector2Float.h" +#include "dis7/Vector3Double.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // information about the complete minefield. The minefield presence, perimiter, diff --git a/src/dis7/ModulationParameters.cpp b/src/dis7/ModulationParameters.cpp index 51946b85..ae3d216d 100644 --- a/src/dis7/ModulationParameters.cpp +++ b/src/dis7/ModulationParameters.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ModulationParameters.h" using namespace DIS; diff --git a/src/dis7/ModulationParameters.h b/src/dis7/ModulationParameters.h index 7f24369d..ee65c796 100644 --- a/src/dis7/ModulationParameters.h +++ b/src/dis7/ModulationParameters.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Modulation parameters associated with a specific radio system. diff --git a/src/dis7/ModulationType.cpp b/src/dis7/ModulationType.cpp index 092c2f48..973a0fdf 100644 --- a/src/dis7/ModulationType.cpp +++ b/src/dis7/ModulationType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ModulationType.h" using namespace DIS; diff --git a/src/dis7/ModulationType.h b/src/dis7/ModulationType.h index 9484e190..c5eb0295 100644 --- a/src/dis7/ModulationType.h +++ b/src/dis7/ModulationType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about the type of modulation used for radio transmission. 6.2.59 diff --git a/src/dis7/Munition.cpp b/src/dis7/Munition.cpp index 8170f942..97688878 100644 --- a/src/dis7/Munition.cpp +++ b/src/dis7/Munition.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Munition.h" using namespace DIS; diff --git a/src/dis7/Munition.h b/src/dis7/Munition.h index 86c3fcdd..7436babc 100644 --- a/src/dis7/Munition.h +++ b/src/dis7/Munition.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // An entity's munition (e.g., bomb, missile) information shall be represented diff --git a/src/dis7/MunitionDescriptor.cpp b/src/dis7/MunitionDescriptor.cpp index ae1c2576..1f5024e2 100644 --- a/src/dis7/MunitionDescriptor.cpp +++ b/src/dis7/MunitionDescriptor.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/MunitionDescriptor.h" using namespace DIS; diff --git a/src/dis7/MunitionDescriptor.h b/src/dis7/MunitionDescriptor.h index a75a2dbc..8fd3c644 100644 --- a/src/dis7/MunitionDescriptor.h +++ b/src/dis7/MunitionDescriptor.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Represents the firing or detonation of a munition. Section 6.2.20.2 diff --git a/src/dis7/MunitionReload.cpp b/src/dis7/MunitionReload.cpp index 0d849cee..556b9b31 100644 --- a/src/dis7/MunitionReload.cpp +++ b/src/dis7/MunitionReload.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/MunitionReload.h" using namespace DIS; diff --git a/src/dis7/MunitionReload.h b/src/dis7/MunitionReload.h index e2a1e309..6a65ef59 100644 --- a/src/dis7/MunitionReload.h +++ b/src/dis7/MunitionReload.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // indicate weapons (munitions) previously communicated via the Munition record. diff --git a/src/dis7/NamedLocationIdentification.cpp b/src/dis7/NamedLocationIdentification.cpp index 8960ced6..27a26226 100644 --- a/src/dis7/NamedLocationIdentification.cpp +++ b/src/dis7/NamedLocationIdentification.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/NamedLocationIdentification.h" using namespace DIS; diff --git a/src/dis7/NamedLocationIdentification.h b/src/dis7/NamedLocationIdentification.h index 8c82a671..ee1aead7 100644 --- a/src/dis7/NamedLocationIdentification.h +++ b/src/dis7/NamedLocationIdentification.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about the discrete positional relationship of the part entity diff --git a/src/dis7/ObjectIdentifier.cpp b/src/dis7/ObjectIdentifier.cpp index 5584a797..d3d35dd7 100644 --- a/src/dis7/ObjectIdentifier.cpp +++ b/src/dis7/ObjectIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ObjectIdentifier.h" using namespace DIS; diff --git a/src/dis7/ObjectIdentifier.h b/src/dis7/ObjectIdentifier.h index 9a0f7c2b..a4a3ea0f 100644 --- a/src/dis7/ObjectIdentifier.h +++ b/src/dis7/ObjectIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of an environmental object. Section 6.2.63 diff --git a/src/dis7/ObjectType.cpp b/src/dis7/ObjectType.cpp index c390fcb4..c7a9e4f4 100644 --- a/src/dis7/ObjectType.cpp +++ b/src/dis7/ObjectType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ObjectType.h" using namespace DIS; diff --git a/src/dis7/ObjectType.h b/src/dis7/ObjectType.h index 7c006421..baa0735e 100644 --- a/src/dis7/ObjectType.h +++ b/src/dis7/ObjectType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of an environmental object. Section 6.2.64 diff --git a/src/dis7/OwnershipStatus.cpp b/src/dis7/OwnershipStatus.cpp index dbfe83b1..e04f1c37 100644 --- a/src/dis7/OwnershipStatus.cpp +++ b/src/dis7/OwnershipStatus.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/OwnershipStatus.h" using namespace DIS; diff --git a/src/dis7/OwnershipStatus.h b/src/dis7/OwnershipStatus.h index 456e9229..c95c5f73 100644 --- a/src/dis7/OwnershipStatus.h +++ b/src/dis7/OwnershipStatus.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // used to convey entity and conflict status information associated with diff --git a/src/dis7/Pdu.cpp b/src/dis7/Pdu.cpp index 7e7d5a67..671519fe 100644 --- a/src/dis7/Pdu.cpp +++ b/src/dis7/Pdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Pdu.h" using namespace DIS; diff --git a/src/dis7/Pdu.h b/src/dis7/Pdu.h index f961892d..844c1e71 100644 --- a/src/dis7/Pdu.h +++ b/src/dis7/Pdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/PduSuperclass.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Adds some fields to the the classic PDU diff --git a/src/dis7/PduContainer.cpp b/src/dis7/PduContainer.cpp index 0f86cad5..fc1a5785 100644 --- a/src/dis7/PduContainer.cpp +++ b/src/dis7/PduContainer.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/PduContainer.h" using namespace DIS; diff --git a/src/dis7/PduContainer.h b/src/dis7/PduContainer.h index 23faaa89..9dd0145c 100644 --- a/src/dis7/PduContainer.h +++ b/src/dis7/PduContainer.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Used for XML compatability. A container that holds PDUs diff --git a/src/dis7/PduHeader.cpp b/src/dis7/PduHeader.cpp index 14e82e63..41c433d1 100644 --- a/src/dis7/PduHeader.cpp +++ b/src/dis7/PduHeader.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/PduHeader.h" using namespace DIS; diff --git a/src/dis7/PduHeader.h b/src/dis7/PduHeader.h index 0f3ad746..5ef985de 100644 --- a/src/dis7/PduHeader.h +++ b/src/dis7/PduHeader.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Not used. The PDU Header Record is directly incoroporated into the PDU class. diff --git a/src/dis7/PduStatus.cpp b/src/dis7/PduStatus.cpp index 5a61937e..05e8f993 100644 --- a/src/dis7/PduStatus.cpp +++ b/src/dis7/PduStatus.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/PduStatus.h" using namespace DIS; diff --git a/src/dis7/PduStatus.h b/src/dis7/PduStatus.h index 76d7ebfd..85fb11c1 100644 --- a/src/dis7/PduStatus.h +++ b/src/dis7/PduStatus.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // PDU Status. These are a series of bit fields. Represented here as just a diff --git a/src/dis7/PduSuperclass.cpp b/src/dis7/PduSuperclass.cpp index 4b7608ad..a4a2e1ac 100644 --- a/src/dis7/PduSuperclass.cpp +++ b/src/dis7/PduSuperclass.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/PduSuperclass.h" using namespace DIS; diff --git a/src/dis7/PduSuperclass.h b/src/dis7/PduSuperclass.h index 231b2521..4a64e043 100644 --- a/src/dis7/PduSuperclass.h +++ b/src/dis7/PduSuperclass.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The superclass for all PDUs, including classic and Live Entity (LE) PDUs. diff --git a/src/dis7/PointObjectStatePdu.cpp b/src/dis7/PointObjectStatePdu.cpp index da1f6d4e..2375d88d 100644 --- a/src/dis7/PointObjectStatePdu.cpp +++ b/src/dis7/PointObjectStatePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/PointObjectStatePdu.h" using namespace DIS; diff --git a/src/dis7/PointObjectStatePdu.h b/src/dis7/PointObjectStatePdu.h index a965c84f..bd62cdcf 100644 --- a/src/dis7/PointObjectStatePdu.h +++ b/src/dis7/PointObjectStatePdu.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/EulerAngles.h" +#include "dis7/ObjectType.h" +#include "dis7/SimulationAddress.h" +#include "dis7/SyntheticEnvironmentFamilyPdu.h" +#include "dis7/Vector3Double.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // : Inormation abut the addition or modification of a synthecic enviroment diff --git a/src/dis7/PropulsionSystemData.cpp b/src/dis7/PropulsionSystemData.cpp index 2f64c1b3..1be2d64a 100644 --- a/src/dis7/PropulsionSystemData.cpp +++ b/src/dis7/PropulsionSystemData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/PropulsionSystemData.h" using namespace DIS; diff --git a/src/dis7/PropulsionSystemData.h b/src/dis7/PropulsionSystemData.h index 362c5c5d..2646c372 100644 --- a/src/dis7/PropulsionSystemData.h +++ b/src/dis7/PropulsionSystemData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // contains information describing the propulsion systems of the entity. This diff --git a/src/dis7/RadioCommunicationsFamilyPdu.cpp b/src/dis7/RadioCommunicationsFamilyPdu.cpp index 99da939b..f00d5881 100644 --- a/src/dis7/RadioCommunicationsFamilyPdu.cpp +++ b/src/dis7/RadioCommunicationsFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RadioCommunicationsFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/RadioCommunicationsFamilyPdu.h b/src/dis7/RadioCommunicationsFamilyPdu.h index 6fd387ab..dfe56bbd 100644 --- a/src/dis7/RadioCommunicationsFamilyPdu.h +++ b/src/dis7/RadioCommunicationsFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Abstract superclass for radio communications PDUs. Section 7.7 diff --git a/src/dis7/RadioIdentifier.cpp b/src/dis7/RadioIdentifier.cpp index 39561d09..005f5d32 100644 --- a/src/dis7/RadioIdentifier.cpp +++ b/src/dis7/RadioIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RadioIdentifier.h" using namespace DIS; diff --git a/src/dis7/RadioIdentifier.h b/src/dis7/RadioIdentifier.h index 92ddf3f6..4df25b99 100644 --- a/src/dis7/RadioIdentifier.h +++ b/src/dis7/RadioIdentifier.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of an attached or unattached radio in an event or diff --git a/src/dis7/RadioType.cpp b/src/dis7/RadioType.cpp index b500d883..5daa6b6c 100644 --- a/src/dis7/RadioType.cpp +++ b/src/dis7/RadioType.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RadioType.h" using namespace DIS; diff --git a/src/dis7/RadioType.h b/src/dis7/RadioType.h index 3e778a86..58ee55ef 100644 --- a/src/dis7/RadioType.h +++ b/src/dis7/RadioType.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Identifies the type of radio. Section 6.2.70 diff --git a/src/dis7/ReceiverPdu.cpp b/src/dis7/ReceiverPdu.cpp index a7f2fa7a..8137cc12 100644 --- a/src/dis7/ReceiverPdu.cpp +++ b/src/dis7/ReceiverPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ReceiverPdu.h" using namespace DIS; diff --git a/src/dis7/ReceiverPdu.h b/src/dis7/ReceiverPdu.h index 48628917..e9360518 100644 --- a/src/dis7/ReceiverPdu.h +++ b/src/dis7/ReceiverPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/RadioCommunicationsFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Communication of a receiver state. Section 7.7.4 COMPLETE diff --git a/src/dis7/RecordQueryReliablePdu.cpp b/src/dis7/RecordQueryReliablePdu.cpp index 3dd69575..018e89d9 100644 --- a/src/dis7/RecordQueryReliablePdu.cpp +++ b/src/dis7/RecordQueryReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RecordQueryReliablePdu.h" using namespace DIS; diff --git a/src/dis7/RecordQueryReliablePdu.h b/src/dis7/RecordQueryReliablePdu.h index dad821b5..82a4bd61 100644 --- a/src/dis7/RecordQueryReliablePdu.h +++ b/src/dis7/RecordQueryReliablePdu.h @@ -2,10 +2,10 @@ #include -#include -#include -#include -#include +#include "dis7/FourByteChunk.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.13: A request for one or more records of data from an entity. diff --git a/src/dis7/RecordQuerySpecification.cpp b/src/dis7/RecordQuerySpecification.cpp index 4a606646..6bae53f8 100644 --- a/src/dis7/RecordQuerySpecification.cpp +++ b/src/dis7/RecordQuerySpecification.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RecordQuerySpecification.h" using namespace DIS; diff --git a/src/dis7/RecordQuerySpecification.h b/src/dis7/RecordQuerySpecification.h index 95dc6273..85add2c4 100644 --- a/src/dis7/RecordQuerySpecification.h +++ b/src/dis7/RecordQuerySpecification.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include "dis7/FourByteChunk.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The identification of the records being queried 6.2.71 diff --git a/src/dis7/RecordSpecification.cpp b/src/dis7/RecordSpecification.cpp index 950c9cf1..d2ce8811 100644 --- a/src/dis7/RecordSpecification.cpp +++ b/src/dis7/RecordSpecification.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RecordSpecification.h" using namespace DIS; diff --git a/src/dis7/RecordSpecification.h b/src/dis7/RecordSpecification.h index 6823a2c8..7d42fa4d 100644 --- a/src/dis7/RecordSpecification.h +++ b/src/dis7/RecordSpecification.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include "dis7/RecordSpecificationElement.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // This record shall specify the number of record sets contained in the Record diff --git a/src/dis7/RecordSpecificationElement.cpp b/src/dis7/RecordSpecificationElement.cpp index 35bc3158..8decc3df 100644 --- a/src/dis7/RecordSpecificationElement.cpp +++ b/src/dis7/RecordSpecificationElement.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RecordSpecificationElement.h" using namespace DIS; diff --git a/src/dis7/RecordSpecificationElement.h b/src/dis7/RecordSpecificationElement.h index df3c0d6d..13169eaa 100644 --- a/src/dis7/RecordSpecificationElement.h +++ b/src/dis7/RecordSpecificationElement.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Synthetic record, made up from section 6.2.72. This is used to acheive a diff --git a/src/dis7/Relationship.cpp b/src/dis7/Relationship.cpp index d0511784..830145e5 100644 --- a/src/dis7/Relationship.cpp +++ b/src/dis7/Relationship.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Relationship.h" using namespace DIS; diff --git a/src/dis7/Relationship.h b/src/dis7/Relationship.h index f3be4ec5..c1591701 100644 --- a/src/dis7/Relationship.h +++ b/src/dis7/Relationship.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The relationship of the part entity to its host entity. Section 6.2.73. diff --git a/src/dis7/RemoveEntityPdu.cpp b/src/dis7/RemoveEntityPdu.cpp index 4479e6d0..0e10ef2e 100644 --- a/src/dis7/RemoveEntityPdu.cpp +++ b/src/dis7/RemoveEntityPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RemoveEntityPdu.h" using namespace DIS; diff --git a/src/dis7/RemoveEntityPdu.h b/src/dis7/RemoveEntityPdu.h index 094d293b..ed250157 100644 --- a/src/dis7/RemoveEntityPdu.h +++ b/src/dis7/RemoveEntityPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.3 The removal of an entity from an exercise shall be communicated diff --git a/src/dis7/RemoveEntityReliablePdu.cpp b/src/dis7/RemoveEntityReliablePdu.cpp index 986fcb67..81a064e8 100644 --- a/src/dis7/RemoveEntityReliablePdu.cpp +++ b/src/dis7/RemoveEntityReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RemoveEntityReliablePdu.h" using namespace DIS; diff --git a/src/dis7/RemoveEntityReliablePdu.h b/src/dis7/RemoveEntityReliablePdu.h index e2fa10e5..c9915547 100644 --- a/src/dis7/RemoveEntityReliablePdu.h +++ b/src/dis7/RemoveEntityReliablePdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.2: Removal of an entity , reliable. COMPLETE diff --git a/src/dis7/RepairCompletePdu.cpp b/src/dis7/RepairCompletePdu.cpp index bebfe483..298bc739 100644 --- a/src/dis7/RepairCompletePdu.cpp +++ b/src/dis7/RepairCompletePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RepairCompletePdu.h" using namespace DIS; diff --git a/src/dis7/RepairCompletePdu.h b/src/dis7/RepairCompletePdu.h index 02577915..142ed94a 100644 --- a/src/dis7/RepairCompletePdu.h +++ b/src/dis7/RepairCompletePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/LogisticsFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.4.6. Service Request PDU is received and repair is complete. diff --git a/src/dis7/RepairResponsePdu.cpp b/src/dis7/RepairResponsePdu.cpp index e0aa1da2..dbc0d8dd 100644 --- a/src/dis7/RepairResponsePdu.cpp +++ b/src/dis7/RepairResponsePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/RepairResponsePdu.h" using namespace DIS; diff --git a/src/dis7/RepairResponsePdu.h b/src/dis7/RepairResponsePdu.h index 7e9be190..15713787 100644 --- a/src/dis7/RepairResponsePdu.h +++ b/src/dis7/RepairResponsePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/LogisticsFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.4.7. Sent after repair complete PDU. COMPLETE diff --git a/src/dis7/ResupplyOfferPdu.cpp b/src/dis7/ResupplyOfferPdu.cpp index 1784fb28..42434a4f 100644 --- a/src/dis7/ResupplyOfferPdu.cpp +++ b/src/dis7/ResupplyOfferPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ResupplyOfferPdu.h" using namespace DIS; diff --git a/src/dis7/ResupplyOfferPdu.h b/src/dis7/ResupplyOfferPdu.h index 74cd44dd..53373013 100644 --- a/src/dis7/ResupplyOfferPdu.h +++ b/src/dis7/ResupplyOfferPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/LogisticsFamilyPdu.h" +#include "dis7/SupplyQuantity.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information used to communicate the offer of supplies by a supplying entity diff --git a/src/dis7/ResupplyReceivedPdu.cpp b/src/dis7/ResupplyReceivedPdu.cpp index 0defe26d..98bb658f 100644 --- a/src/dis7/ResupplyReceivedPdu.cpp +++ b/src/dis7/ResupplyReceivedPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ResupplyReceivedPdu.h" using namespace DIS; diff --git a/src/dis7/ResupplyReceivedPdu.h b/src/dis7/ResupplyReceivedPdu.h index 3baae502..ef38a79c 100644 --- a/src/dis7/ResupplyReceivedPdu.h +++ b/src/dis7/ResupplyReceivedPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/LogisticsFamilyPdu.h" +#include "dis7/SupplyQuantity.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.4.4. Receipt of supplies is communicated by issuing Resupply diff --git a/src/dis7/SecondaryOperationalData.cpp b/src/dis7/SecondaryOperationalData.cpp index ef86de3b..894dd69b 100644 --- a/src/dis7/SecondaryOperationalData.cpp +++ b/src/dis7/SecondaryOperationalData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SecondaryOperationalData.h" using namespace DIS; diff --git a/src/dis7/SecondaryOperationalData.h b/src/dis7/SecondaryOperationalData.h index 4a233dea..8f286edc 100644 --- a/src/dis7/SecondaryOperationalData.h +++ b/src/dis7/SecondaryOperationalData.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Additional operational data for an IFF emitting system and the number of IFF diff --git a/src/dis7/SeesPdu.cpp b/src/dis7/SeesPdu.cpp index fecb2176..4febaaec 100644 --- a/src/dis7/SeesPdu.cpp +++ b/src/dis7/SeesPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SeesPdu.h" using namespace DIS; diff --git a/src/dis7/SeesPdu.h b/src/dis7/SeesPdu.h index f25d1b1b..091c6c4d 100644 --- a/src/dis7/SeesPdu.h +++ b/src/dis7/SeesPdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis7/DistributedEmissionsFamilyPdu.h" +#include "dis7/EntityID.h" +#include "dis7/PropulsionSystemData.h" +#include "dis7/VectoringNozzleSystem.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // SEES PDU, supplemental emissions entity state information. Section 7.6.6 diff --git a/src/dis7/Sensor.cpp b/src/dis7/Sensor.cpp index 17400f05..0c904aa4 100644 --- a/src/dis7/Sensor.cpp +++ b/src/dis7/Sensor.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Sensor.h" using namespace DIS; diff --git a/src/dis7/Sensor.h b/src/dis7/Sensor.h index 656b7262..d7841003 100644 --- a/src/dis7/Sensor.h +++ b/src/dis7/Sensor.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // An entity's sensor information. Section 6.2.77. diff --git a/src/dis7/SeparationVP.cpp b/src/dis7/SeparationVP.cpp index 4539d301..212480e1 100644 --- a/src/dis7/SeparationVP.cpp +++ b/src/dis7/SeparationVP.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SeparationVP.h" using namespace DIS; diff --git a/src/dis7/SeparationVP.h b/src/dis7/SeparationVP.h index bcfa392b..343a042c 100644 --- a/src/dis7/SeparationVP.h +++ b/src/dis7/SeparationVP.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Physical separation of an entity from another entity. Section 6.2.93.6 diff --git a/src/dis7/ServiceRequestPdu.cpp b/src/dis7/ServiceRequestPdu.cpp index 92560a4d..9ef835ad 100644 --- a/src/dis7/ServiceRequestPdu.cpp +++ b/src/dis7/ServiceRequestPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/ServiceRequestPdu.h" using namespace DIS; diff --git a/src/dis7/ServiceRequestPdu.h b/src/dis7/ServiceRequestPdu.h index b3147de3..ff2a779f 100644 --- a/src/dis7/ServiceRequestPdu.h +++ b/src/dis7/ServiceRequestPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/LogisticsFamilyPdu.h" +#include "dis7/SupplyQuantity.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Service Request PDU shall be used to communicate information associated with diff --git a/src/dis7/SetDataPdu.cpp b/src/dis7/SetDataPdu.cpp index 5b35ed11..b3e02edf 100644 --- a/src/dis7/SetDataPdu.cpp +++ b/src/dis7/SetDataPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SetDataPdu.h" using namespace DIS; diff --git a/src/dis7/SetDataPdu.h b/src/dis7/SetDataPdu.h index 8d27ecef..85611343 100644 --- a/src/dis7/SetDataPdu.h +++ b/src/dis7/SetDataPdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.10. Change state information with the data contained in this. diff --git a/src/dis7/SetDataReliablePdu.cpp b/src/dis7/SetDataReliablePdu.cpp index 8fdc37d3..34341c00 100644 --- a/src/dis7/SetDataReliablePdu.cpp +++ b/src/dis7/SetDataReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SetDataReliablePdu.h" using namespace DIS; diff --git a/src/dis7/SetDataReliablePdu.h b/src/dis7/SetDataReliablePdu.h index 23a1b115..e0e48033 100644 --- a/src/dis7/SetDataReliablePdu.h +++ b/src/dis7/SetDataReliablePdu.h @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "dis7/FixedDatum.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/VariableDatum.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.9: initializing or chaning internal state information, diff --git a/src/dis7/SimulationAddress.cpp b/src/dis7/SimulationAddress.cpp index 9f5911ba..d664fd72 100644 --- a/src/dis7/SimulationAddress.cpp +++ b/src/dis7/SimulationAddress.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SimulationAddress.h" using namespace DIS; diff --git a/src/dis7/SimulationAddress.h b/src/dis7/SimulationAddress.h index 692dbdcf..b299dc8c 100644 --- a/src/dis7/SimulationAddress.h +++ b/src/dis7/SimulationAddress.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // A Simulation Address record shall consist of the Site Identification number diff --git a/src/dis7/SimulationIdentifier.cpp b/src/dis7/SimulationIdentifier.cpp index 809c1580..ca3ead09 100644 --- a/src/dis7/SimulationIdentifier.cpp +++ b/src/dis7/SimulationIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SimulationIdentifier.h" using namespace DIS; diff --git a/src/dis7/SimulationIdentifier.h b/src/dis7/SimulationIdentifier.h index 73f390b1..7124daac 100644 --- a/src/dis7/SimulationIdentifier.h +++ b/src/dis7/SimulationIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of a simulation when using the 48-bit identifier diff --git a/src/dis7/SimulationManagementFamilyPdu.cpp b/src/dis7/SimulationManagementFamilyPdu.cpp index 3f8c0657..e6855f05 100644 --- a/src/dis7/SimulationManagementFamilyPdu.cpp +++ b/src/dis7/SimulationManagementFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SimulationManagementFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/SimulationManagementFamilyPdu.h b/src/dis7/SimulationManagementFamilyPdu.h index ec5d097b..6b545f48 100644 --- a/src/dis7/SimulationManagementFamilyPdu.h +++ b/src/dis7/SimulationManagementFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5 Abstract superclass for PDUs relating to the simulation itself. diff --git a/src/dis7/SimulationManagementPduHeader.cpp b/src/dis7/SimulationManagementPduHeader.cpp index 42fd8a5f..2f0df0e7 100644 --- a/src/dis7/SimulationManagementPduHeader.cpp +++ b/src/dis7/SimulationManagementPduHeader.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SimulationManagementPduHeader.h" using namespace DIS; diff --git a/src/dis7/SimulationManagementPduHeader.h b/src/dis7/SimulationManagementPduHeader.h index 5051dba6..c0cc6a7b 100644 --- a/src/dis7/SimulationManagementPduHeader.h +++ b/src/dis7/SimulationManagementPduHeader.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/PduHeader.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // First part of a simulation management (SIMAN) PDU and SIMAN-Reliability diff --git a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp index 4e9ba79b..3b223c1f 100644 --- a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp +++ b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h index fe48fbb5..b3f6548c 100644 --- a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h +++ b/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12: Abstract superclass for reliable simulation management PDUs diff --git a/src/dis7/StandardVariableSpecification.cpp b/src/dis7/StandardVariableSpecification.cpp index 29f6456c..ff48d6f6 100644 --- a/src/dis7/StandardVariableSpecification.cpp +++ b/src/dis7/StandardVariableSpecification.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/StandardVariableSpecification.h" using namespace DIS; diff --git a/src/dis7/StandardVariableSpecification.h b/src/dis7/StandardVariableSpecification.h index 85f62e4b..e24c546f 100644 --- a/src/dis7/StandardVariableSpecification.h +++ b/src/dis7/StandardVariableSpecification.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include "dis7/SimulationManagementPduHeader.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Does not work, and causes failure in anything it is embedded in. diff --git a/src/dis7/StartResumePdu.cpp b/src/dis7/StartResumePdu.cpp index 7d7433af..29a4f0bd 100644 --- a/src/dis7/StartResumePdu.cpp +++ b/src/dis7/StartResumePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/StartResumePdu.h" using namespace DIS; diff --git a/src/dis7/StartResumePdu.h b/src/dis7/StartResumePdu.h index b4ecd490..2c437de0 100644 --- a/src/dis7/StartResumePdu.h +++ b/src/dis7/StartResumePdu.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include "dis7/ClockTime.h" +#include "dis7/EntityID.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.4. Start or resume an exercise. COMPLETE diff --git a/src/dis7/StartResumeReliablePdu.cpp b/src/dis7/StartResumeReliablePdu.cpp index c37802f0..cec58eeb 100644 --- a/src/dis7/StartResumeReliablePdu.cpp +++ b/src/dis7/StartResumeReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/StartResumeReliablePdu.h" using namespace DIS; diff --git a/src/dis7/StartResumeReliablePdu.h b/src/dis7/StartResumeReliablePdu.h index 5e7465da..ad3064c2 100644 --- a/src/dis7/StartResumeReliablePdu.h +++ b/src/dis7/StartResumeReliablePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/ClockTime.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.3: Start resume simulation, relaible. COMPLETE diff --git a/src/dis7/StopFreezePdu.cpp b/src/dis7/StopFreezePdu.cpp index 7b8a9cf6..e7f7b551 100644 --- a/src/dis7/StopFreezePdu.cpp +++ b/src/dis7/StopFreezePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/StopFreezePdu.h" using namespace DIS; diff --git a/src/dis7/StopFreezePdu.h b/src/dis7/StopFreezePdu.h index 0d17dd2f..1f5067e4 100644 --- a/src/dis7/StopFreezePdu.h +++ b/src/dis7/StopFreezePdu.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include "dis7/ClockTime.h" +#include "dis7/EntityID.h" +#include "dis7/SimulationManagementFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 7.5.5. Stop or freeze an enity (or exercise). COMPLETE diff --git a/src/dis7/StopFreezeReliablePdu.cpp b/src/dis7/StopFreezeReliablePdu.cpp index 7a3bb8e5..ca0948cc 100644 --- a/src/dis7/StopFreezeReliablePdu.cpp +++ b/src/dis7/StopFreezeReliablePdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/StopFreezeReliablePdu.h" using namespace DIS; diff --git a/src/dis7/StopFreezeReliablePdu.h b/src/dis7/StopFreezeReliablePdu.h index 99d49823..23c59e7c 100644 --- a/src/dis7/StopFreezeReliablePdu.h +++ b/src/dis7/StopFreezeReliablePdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/ClockTime.h" +#include "dis7/SimulationManagementWithReliabilityFamilyPdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE diff --git a/src/dis7/StorageFuel.cpp b/src/dis7/StorageFuel.cpp index 9dbe7cdb..eb7b062e 100644 --- a/src/dis7/StorageFuel.cpp +++ b/src/dis7/StorageFuel.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/StorageFuel.h" using namespace DIS; diff --git a/src/dis7/StorageFuel.h b/src/dis7/StorageFuel.h index 08418e7c..faf6f361 100644 --- a/src/dis7/StorageFuel.h +++ b/src/dis7/StorageFuel.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about an entity's engine fuel. Section 6.2.83. diff --git a/src/dis7/StorageFuelReload.cpp b/src/dis7/StorageFuelReload.cpp index 3bdd101c..78b43311 100644 --- a/src/dis7/StorageFuelReload.cpp +++ b/src/dis7/StorageFuelReload.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/StorageFuelReload.h" using namespace DIS; diff --git a/src/dis7/StorageFuelReload.h b/src/dis7/StorageFuelReload.h index f7bfe559..c083115d 100644 --- a/src/dis7/StorageFuelReload.h +++ b/src/dis7/StorageFuelReload.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // For each type or location of Storage Fuel, this record shall specify the diff --git a/src/dis7/SupplyQuantity.cpp b/src/dis7/SupplyQuantity.cpp index 43a624a8..1659e888 100644 --- a/src/dis7/SupplyQuantity.cpp +++ b/src/dis7/SupplyQuantity.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SupplyQuantity.h" using namespace DIS; diff --git a/src/dis7/SupplyQuantity.h b/src/dis7/SupplyQuantity.h index 4bc1f31a..eb032bba 100644 --- a/src/dis7/SupplyQuantity.h +++ b/src/dis7/SupplyQuantity.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityType.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // A supply, and the amount of that supply. Section 6.2.85 diff --git a/src/dis7/SyntheticEnvironmentFamilyPdu.cpp b/src/dis7/SyntheticEnvironmentFamilyPdu.cpp index 2b9c6590..5bdf1acf 100644 --- a/src/dis7/SyntheticEnvironmentFamilyPdu.cpp +++ b/src/dis7/SyntheticEnvironmentFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SyntheticEnvironmentFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/SyntheticEnvironmentFamilyPdu.h b/src/dis7/SyntheticEnvironmentFamilyPdu.h index 5147ddf1..91d767a4 100644 --- a/src/dis7/SyntheticEnvironmentFamilyPdu.h +++ b/src/dis7/SyntheticEnvironmentFamilyPdu.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Section 5.3.11: Abstract superclass for synthetic environment PDUs diff --git a/src/dis7/SystemIdentifier.cpp b/src/dis7/SystemIdentifier.cpp index 2a83ed02..e8d51943 100644 --- a/src/dis7/SystemIdentifier.cpp +++ b/src/dis7/SystemIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/SystemIdentifier.h" using namespace DIS; diff --git a/src/dis7/SystemIdentifier.h b/src/dis7/SystemIdentifier.h index 14824134..3177e54d 100644 --- a/src/dis7/SystemIdentifier.h +++ b/src/dis7/SystemIdentifier.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The ID of the IFF emitting system. NOT COMPLETE. Section 6.2.86 diff --git a/src/dis7/TotalRecordSets.cpp b/src/dis7/TotalRecordSets.cpp index 56445417..aa09d137 100644 --- a/src/dis7/TotalRecordSets.cpp +++ b/src/dis7/TotalRecordSets.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/TotalRecordSets.h" using namespace DIS; diff --git a/src/dis7/TotalRecordSets.h b/src/dis7/TotalRecordSets.h index 3332912d..27928ea1 100644 --- a/src/dis7/TotalRecordSets.h +++ b/src/dis7/TotalRecordSets.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Total number of record sets contained in a logical set of one or more PDUs. diff --git a/src/dis7/TrackJamData.cpp b/src/dis7/TrackJamData.cpp index 14c23831..706e8b86 100644 --- a/src/dis7/TrackJamData.cpp +++ b/src/dis7/TrackJamData.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/TrackJamData.h" using namespace DIS; diff --git a/src/dis7/TrackJamData.h b/src/dis7/TrackJamData.h index 03fcd0a2..69903c0b 100644 --- a/src/dis7/TrackJamData.h +++ b/src/dis7/TrackJamData.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Track-Jam data Section 6.2.89 diff --git a/src/dis7/TwoByteChunk.cpp b/src/dis7/TwoByteChunk.cpp index c3d829ac..377921ba 100644 --- a/src/dis7/TwoByteChunk.cpp +++ b/src/dis7/TwoByteChunk.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/TwoByteChunk.h" using namespace DIS; diff --git a/src/dis7/TwoByteChunk.h b/src/dis7/TwoByteChunk.h index ce42a096..2f0e76a3 100644 --- a/src/dis7/TwoByteChunk.h +++ b/src/dis7/TwoByteChunk.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // 16 bit piece of data diff --git a/src/dis7/UAFundamentalParameter.cpp b/src/dis7/UAFundamentalParameter.cpp index 2b9f99a0..ecfcc57b 100644 --- a/src/dis7/UAFundamentalParameter.cpp +++ b/src/dis7/UAFundamentalParameter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/UAFundamentalParameter.h" using namespace DIS; diff --git a/src/dis7/UAFundamentalParameter.h b/src/dis7/UAFundamentalParameter.h index f6b4c10d..cb4a70ce 100644 --- a/src/dis7/UAFundamentalParameter.h +++ b/src/dis7/UAFundamentalParameter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Regeneration parameters for active emission systems that are variable diff --git a/src/dis7/UaPdu.cpp b/src/dis7/UaPdu.cpp index dd121a7c..e5ae5527 100644 --- a/src/dis7/UaPdu.cpp +++ b/src/dis7/UaPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/UaPdu.h" using namespace DIS; diff --git a/src/dis7/UaPdu.h b/src/dis7/UaPdu.h index f3e0f5e5..0b46d3fb 100644 --- a/src/dis7/UaPdu.h +++ b/src/dis7/UaPdu.h @@ -2,12 +2,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "dis7/DistributedEmissionsFamilyPdu.h" +#include "dis7/EntityID.h" +#include "dis7/EventIdentifier.h" +#include "dis7/Vector3Float.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Information about underwater acoustic emmissions. This requires manual diff --git a/src/dis7/UnattachedIdentifier.cpp b/src/dis7/UnattachedIdentifier.cpp index fc93b903..cc8e73f5 100644 --- a/src/dis7/UnattachedIdentifier.cpp +++ b/src/dis7/UnattachedIdentifier.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/UnattachedIdentifier.h" using namespace DIS; diff --git a/src/dis7/UnattachedIdentifier.h b/src/dis7/UnattachedIdentifier.h index 7f822288..17217789 100644 --- a/src/dis7/UnattachedIdentifier.h +++ b/src/dis7/UnattachedIdentifier.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "dis7/SimulationAddress.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // The unique designation of one or more unattached radios in an event or diff --git a/src/dis7/UnsignedDISInteger.cpp b/src/dis7/UnsignedDISInteger.cpp index accacf4c..87f842a9 100644 --- a/src/dis7/UnsignedDISInteger.cpp +++ b/src/dis7/UnsignedDISInteger.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/UnsignedDISInteger.h" using namespace DIS; diff --git a/src/dis7/UnsignedDISInteger.h b/src/dis7/UnsignedDISInteger.h index 9229524a..e28c141a 100644 --- a/src/dis7/UnsignedDISInteger.h +++ b/src/dis7/UnsignedDISInteger.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // container class not in specification diff --git a/src/dis7/VariableDatum.cpp b/src/dis7/VariableDatum.cpp index 2a6e8272..63a661dd 100644 --- a/src/dis7/VariableDatum.cpp +++ b/src/dis7/VariableDatum.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/VariableDatum.h" using namespace DIS; diff --git a/src/dis7/VariableDatum.h b/src/dis7/VariableDatum.h index afc6c97a..416b2886 100644 --- a/src/dis7/VariableDatum.h +++ b/src/dis7/VariableDatum.h @@ -2,9 +2,9 @@ #include -#include -#include -#include +#include "dis7/EightByteChunk.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // the variable datum type, the datum length, and the value for that variable diff --git a/src/dis7/VariableParameter.cpp b/src/dis7/VariableParameter.cpp index 9220a288..4ae30336 100644 --- a/src/dis7/VariableParameter.cpp +++ b/src/dis7/VariableParameter.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/VariableParameter.h" using namespace DIS; diff --git a/src/dis7/VariableParameter.h b/src/dis7/VariableParameter.h index b7d04ef5..33b80a5a 100644 --- a/src/dis7/VariableParameter.h +++ b/src/dis7/VariableParameter.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // specification of additional information associated with an entity or diff --git a/src/dis7/VariableTransmitterParameters.cpp b/src/dis7/VariableTransmitterParameters.cpp index 4c292d8f..62a697df 100644 --- a/src/dis7/VariableTransmitterParameters.cpp +++ b/src/dis7/VariableTransmitterParameters.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/VariableTransmitterParameters.h" using namespace DIS; diff --git a/src/dis7/VariableTransmitterParameters.h b/src/dis7/VariableTransmitterParameters.h index 9dc494c6..bac61114 100644 --- a/src/dis7/VariableTransmitterParameters.h +++ b/src/dis7/VariableTransmitterParameters.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Relates to radios. NOT COMPLETE. Section 6.2.94 diff --git a/src/dis7/Vector2Float.cpp b/src/dis7/Vector2Float.cpp index d9444f35..a1ba65dd 100644 --- a/src/dis7/Vector2Float.cpp +++ b/src/dis7/Vector2Float.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Vector2Float.h" using namespace DIS; diff --git a/src/dis7/Vector2Float.h b/src/dis7/Vector2Float.h index 056f204b..cf10bb59 100644 --- a/src/dis7/Vector2Float.h +++ b/src/dis7/Vector2Float.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Two floating point values, x, y diff --git a/src/dis7/Vector3Double.cpp b/src/dis7/Vector3Double.cpp index 6a74895e..52338305 100644 --- a/src/dis7/Vector3Double.cpp +++ b/src/dis7/Vector3Double.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Vector3Double.h" using namespace DIS; diff --git a/src/dis7/Vector3Double.h b/src/dis7/Vector3Double.h index 53ecd505..2d494f37 100644 --- a/src/dis7/Vector3Double.h +++ b/src/dis7/Vector3Double.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Three double precision floating point values, x, y, and z. Used for world diff --git a/src/dis7/Vector3Float.cpp b/src/dis7/Vector3Float.cpp index 66e857b0..921a219d 100644 --- a/src/dis7/Vector3Float.cpp +++ b/src/dis7/Vector3Float.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/Vector3Float.h" using namespace DIS; diff --git a/src/dis7/Vector3Float.h b/src/dis7/Vector3Float.h index 12ddc338..375bf676 100644 --- a/src/dis7/Vector3Float.h +++ b/src/dis7/Vector3Float.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Three floating point values, x, y, and z. Section 6.2.95 diff --git a/src/dis7/VectoringNozzleSystem.cpp b/src/dis7/VectoringNozzleSystem.cpp index 9c1e8900..0f72499d 100644 --- a/src/dis7/VectoringNozzleSystem.cpp +++ b/src/dis7/VectoringNozzleSystem.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/VectoringNozzleSystem.h" using namespace DIS; diff --git a/src/dis7/VectoringNozzleSystem.h b/src/dis7/VectoringNozzleSystem.h index d73f04ea..b4cdadac 100644 --- a/src/dis7/VectoringNozzleSystem.h +++ b/src/dis7/VectoringNozzleSystem.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // Operational data for describing the vectoring nozzle systems Section 6.2.96 diff --git a/src/dis7/WarfareFamilyPdu.cpp b/src/dis7/WarfareFamilyPdu.cpp index 33ae0bc6..145adbc2 100644 --- a/src/dis7/WarfareFamilyPdu.cpp +++ b/src/dis7/WarfareFamilyPdu.cpp @@ -1,4 +1,4 @@ -#include +#include "dis7/WarfareFamilyPdu.h" using namespace DIS; diff --git a/src/dis7/WarfareFamilyPdu.h b/src/dis7/WarfareFamilyPdu.h index a82e80d5..33f9cf30 100644 --- a/src/dis7/WarfareFamilyPdu.h +++ b/src/dis7/WarfareFamilyPdu.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "dis7/EntityID.h" +#include "dis7/Pdu.h" +#include "dis7/opendis7_export.h" +#include "dis7/utils/DataStream.h" namespace DIS { // abstract superclass for fire and detonation pdus that have shared From 8a2caa0c9ad7418e502c40240e389c14f4519ed9 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Thu, 27 Apr 2023 02:27:38 +0000 Subject: [PATCH 06/22] Cpplint and clang updates for dis7 --- src/dis7/AcknowledgePdu.cpp | 12 +- src/dis7/AcknowledgePdu.h | 18 +-- src/dis7/AcknowledgeReliablePdu.cpp | 12 +- src/dis7/AcknowledgeReliablePdu.h | 18 +-- src/dis7/AcousticEmitter.cpp | 12 +- src/dis7/AcousticEmitter.h | 18 +-- src/dis7/ActionRequestPdu.cpp | 20 +-- src/dis7/ActionRequestPdu.h | 20 +-- src/dis7/ActionRequestReliablePdu.cpp | 32 ++--- src/dis7/ActionRequestReliablePdu.h | 38 +++--- src/dis7/ActionResponsePdu.cpp | 20 +-- src/dis7/ActionResponsePdu.h | 20 +-- src/dis7/ActionResponseReliablePdu.cpp | 20 +-- src/dis7/ActionResponseReliablePdu.h | 20 +-- src/dis7/AggregateIdentifier.cpp | 4 +- src/dis7/AggregateIdentifier.h | 6 +- src/dis7/AggregateMarking.cpp | 12 +- src/dis7/AggregateMarking.h | 14 +-- src/dis7/AggregateType.cpp | 28 ++--- src/dis7/AggregateType.h | 42 +++---- src/dis7/AngleDeception.cpp | 32 ++--- src/dis7/AngleDeception.h | 48 ++++---- src/dis7/ArealObjectStatePdu.cpp | 26 ++-- src/dis7/ArealObjectStatePdu.h | 34 ++--- src/dis7/ArticulatedParts.cpp | 16 +-- src/dis7/ArticulatedParts.h | 26 ++-- src/dis7/Association.cpp | 8 +- src/dis7/Association.h | 12 +- src/dis7/AttachedParts.cpp | 20 +-- src/dis7/AttachedParts.h | 30 ++--- src/dis7/Attribute.cpp | 12 +- src/dis7/Attribute.h | 18 +-- src/dis7/AttributePdu.cpp | 24 ++-- src/dis7/AttributePdu.h | 36 +++--- src/dis7/BeamAntennaPattern.cpp | 12 +- src/dis7/BeamAntennaPattern.h | 18 +-- src/dis7/BeamStatus.cpp | 4 +- src/dis7/BeamStatus.h | 6 +- src/dis7/BlankingSector.cpp | 20 +-- src/dis7/BlankingSector.h | 30 ++--- src/dis7/ClockTime.cpp | 8 +- src/dis7/ClockTime.h | 12 +- src/dis7/CollisionElasticPdu.cpp | 4 +- src/dis7/CollisionElasticPdu.h | 6 +- src/dis7/CollisionPdu.cpp | 4 +- src/dis7/CollisionPdu.h | 6 +- src/dis7/CommentPdu.cpp | 12 +- src/dis7/CommentPdu.h | 8 +- src/dis7/CommentReliablePdu.cpp | 12 +- src/dis7/CommentReliablePdu.h | 8 +- src/dis7/CommunicationsNodeID.cpp | 4 +- src/dis7/CommunicationsNodeID.h | 6 +- src/dis7/CreateEntityPdu.cpp | 4 +- src/dis7/CreateEntityPdu.h | 6 +- src/dis7/CreateEntityReliablePdu.cpp | 16 +-- src/dis7/CreateEntityReliablePdu.h | 24 ++-- src/dis7/DataPdu.cpp | 20 +-- src/dis7/DataPdu.h | 20 +-- src/dis7/DataQueryDatumSpecification.cpp | 12 +- src/dis7/DataQueryDatumSpecification.h | 8 +- src/dis7/DataQueryPdu.cpp | 20 +-- src/dis7/DataQueryPdu.h | 20 +-- src/dis7/DataQueryReliablePdu.cpp | 32 ++--- src/dis7/DataQueryReliablePdu.h | 38 +++--- src/dis7/DataReliablePdu.cpp | 28 ++--- src/dis7/DataReliablePdu.h | 32 ++--- src/dis7/DatumSpecification.cpp | 12 +- src/dis7/DatumSpecification.h | 8 +- src/dis7/DeadReckoningParameters.cpp | 12 +- src/dis7/DeadReckoningParameters.h | 14 +-- src/dis7/DesignatorPdu.cpp | 12 +- src/dis7/DesignatorPdu.h | 18 +-- src/dis7/DetonationPdu.cpp | 14 +-- src/dis7/DetonationPdu.h | 16 +-- src/dis7/DirectedEnergyAreaAimpoint.cpp | 24 ++-- src/dis7/DirectedEnergyAreaAimpoint.h | 26 ++-- src/dis7/DirectedEnergyDamage.cpp | 32 ++--- src/dis7/DirectedEnergyDamage.h | 48 ++++---- src/dis7/DirectedEnergyFirePdu.cpp | 18 +-- src/dis7/DirectedEnergyFirePdu.h | 22 ++-- src/dis7/DirectedEnergyPrecisionAimpoint.cpp | 20 +-- src/dis7/DirectedEnergyPrecisionAimpoint.h | 30 ++--- .../DirectedEnergyTargetEnergyDeposition.cpp | 4 +- .../DirectedEnergyTargetEnergyDeposition.h | 6 +- src/dis7/EightByteChunk.cpp | 2 +- src/dis7/ElectromagneticEmissionBeamData.cpp | 30 ++--- src/dis7/ElectromagneticEmissionBeamData.h | 40 +++--- .../ElectromagneticEmissionSystemData.cpp | 10 +- src/dis7/ElectromagneticEmissionSystemData.h | 18 +-- src/dis7/ElectromagneticEmissionsPdu.cpp | 14 +-- src/dis7/ElectromagneticEmissionsPdu.h | 16 +-- src/dis7/EmitterSystem.cpp | 12 +- src/dis7/EmitterSystem.h | 18 +-- src/dis7/EngineFuel.cpp | 20 +-- src/dis7/EngineFuel.h | 30 ++--- src/dis7/EngineFuelReload.cpp | 28 ++--- src/dis7/EngineFuelReload.h | 42 +++---- src/dis7/EntityAssociation.cpp | 32 ++--- src/dis7/EntityAssociation.h | 48 ++++---- src/dis7/EntityDamageStatusPdu.cpp | 14 +-- src/dis7/EntityDamageStatusPdu.h | 16 +-- src/dis7/EntityID.cpp | 4 +- src/dis7/EntityID.h | 6 +- src/dis7/EntityMarking.cpp | 6 +- src/dis7/EntityMarking.h | 6 +- src/dis7/EntityStatePdu.cpp | 18 +-- src/dis7/EntityStatePdu.h | 22 ++-- src/dis7/EntityStateUpdatePdu.cpp | 10 +- src/dis7/EntityStateUpdatePdu.h | 12 +- src/dis7/EntityType.cpp | 28 ++--- src/dis7/EntityType.h | 42 +++---- src/dis7/EntityTypeVP.cpp | 16 +-- src/dis7/EntityTypeVP.h | 24 ++-- src/dis7/Environment.cpp | 16 +-- src/dis7/Environment.h | 24 ++-- src/dis7/EnvironmentGeneral.cpp | 24 ++-- src/dis7/EnvironmentGeneral.h | 36 +++--- src/dis7/EnvironmentType.cpp | 28 ++--- src/dis7/EnvironmentType.h | 42 +++---- src/dis7/EventIdentifier.cpp | 4 +- src/dis7/EventIdentifier.h | 6 +- src/dis7/EventIdentifierLiveEntity.cpp | 12 +- src/dis7/EventIdentifierLiveEntity.h | 18 +-- src/dis7/EventReportPdu.cpp | 20 +-- src/dis7/EventReportPdu.h | 20 +-- src/dis7/EventReportReliablePdu.cpp | 20 +-- src/dis7/EventReportReliablePdu.h | 20 +-- src/dis7/Expendable.cpp | 16 +-- src/dis7/Expendable.h | 24 ++-- src/dis7/ExpendableDescriptor.cpp | 4 +- src/dis7/ExpendableDescriptor.h | 6 +- src/dis7/ExpendableReload.cpp | 20 +-- src/dis7/ExpendableReload.h | 30 ++--- src/dis7/ExplosionDescriptor.cpp | 8 +- src/dis7/ExplosionDescriptor.h | 12 +- src/dis7/FalseTargetsAttribute.cpp | 32 ++--- src/dis7/FalseTargetsAttribute.h | 48 ++++---- src/dis7/FastEntityStatePdu.cpp | 82 ++++++------- src/dis7/FastEntityStatePdu.h | 116 +++++++++--------- src/dis7/FirePdu.cpp | 4 +- src/dis7/FirePdu.h | 8 +- src/dis7/FixedDatum.cpp | 8 +- src/dis7/FixedDatum.h | 12 +- src/dis7/FourByteChunk.cpp | 2 +- src/dis7/FundamentalOperationalData.cpp | 40 +++--- src/dis7/FundamentalOperationalData.h | 60 ++++----- src/dis7/GridAxis.cpp | 20 +-- src/dis7/GridAxis.h | 30 ++--- src/dis7/GroupIdentifier.cpp | 4 +- src/dis7/GroupIdentifier.h | 6 +- src/dis7/IFFFundamentalParameterData.cpp | 16 +-- src/dis7/IFFFundamentalParameterData.h | 20 +-- src/dis7/IFFPdu.cpp | 14 +-- src/dis7/IFFPdu.h | 16 +-- src/dis7/IOCommunicationsNode.cpp | 20 +-- src/dis7/IOCommunicationsNode.h | 30 ++--- src/dis7/IOEffect.cpp | 32 ++--- src/dis7/IOEffect.h | 48 ++++---- src/dis7/IntercomCommunicationsParameters.cpp | 12 +- src/dis7/IntercomCommunicationsParameters.h | 18 +-- src/dis7/IntercomIdentifier.cpp | 16 +-- src/dis7/IntercomIdentifier.h | 24 ++-- src/dis7/IntercomSignalPdu.cpp | 24 ++-- src/dis7/IntercomSignalPdu.h | 34 ++--- src/dis7/JammingTechnique.cpp | 16 +-- src/dis7/JammingTechnique.h | 24 ++-- src/dis7/LaunchedMunitionRecord.cpp | 12 +- src/dis7/LaunchedMunitionRecord.h | 18 +-- src/dis7/LayerHeader.cpp | 12 +- src/dis7/LayerHeader.h | 18 +-- src/dis7/LinearObjectStatePdu.cpp | 14 +-- src/dis7/LinearObjectStatePdu.h | 16 +-- src/dis7/LinearSegmentParameter.cpp | 32 ++--- src/dis7/LinearSegmentParameter.h | 52 ++++---- src/dis7/LiveEntityIdentifier.cpp | 4 +- src/dis7/LiveEntityIdentifier.h | 6 +- src/dis7/LiveEntityPdu.cpp | 8 +- src/dis7/LiveEntityPdu.h | 12 +- src/dis7/LiveSimulationAddress.cpp | 8 +- src/dis7/LiveSimulationAddress.h | 12 +- src/dis7/MineEntityIdentifier.cpp | 4 +- src/dis7/MineEntityIdentifier.h | 6 +- src/dis7/MinefieldIdentifier.cpp | 4 +- src/dis7/MinefieldIdentifier.h | 6 +- src/dis7/MinefieldResponseNackPdu.cpp | 10 +- src/dis7/MinefieldResponseNackPdu.h | 10 +- src/dis7/MinefieldStatePdu.cpp | 28 ++--- src/dis7/MinefieldStatePdu.h | 32 ++--- src/dis7/ModulationType.cpp | 16 +-- src/dis7/ModulationType.h | 24 ++-- src/dis7/Munition.cpp | 16 +-- src/dis7/Munition.h | 24 ++-- src/dis7/MunitionDescriptor.cpp | 16 +-- src/dis7/MunitionDescriptor.h | 24 ++-- src/dis7/MunitionReload.cpp | 20 +-- src/dis7/MunitionReload.h | 30 ++--- src/dis7/NamedLocationIdentification.cpp | 8 +- src/dis7/NamedLocationIdentification.h | 12 +- src/dis7/ObjectIdentifier.cpp | 4 +- src/dis7/ObjectIdentifier.h | 6 +- src/dis7/ObjectType.cpp | 16 +-- src/dis7/ObjectType.h | 24 ++-- src/dis7/OwnershipStatus.cpp | 8 +- src/dis7/OwnershipStatus.h | 12 +- src/dis7/Pdu.cpp | 8 +- src/dis7/Pdu.h | 12 +- src/dis7/PduContainer.cpp | 4 +- src/dis7/PduContainer.h | 4 +- src/dis7/PduHeader.cpp | 32 ++--- src/dis7/PduHeader.h | 48 ++++---- src/dis7/PduStatus.cpp | 4 +- src/dis7/PduStatus.h | 6 +- src/dis7/PduSuperclass.cpp | 24 ++-- src/dis7/PduSuperclass.h | 36 +++--- src/dis7/PointObjectStatePdu.cpp | 16 +-- src/dis7/PointObjectStatePdu.h | 24 ++-- src/dis7/RadioCommunicationsFamilyPdu.cpp | 4 +- src/dis7/RadioCommunicationsFamilyPdu.h | 6 +- src/dis7/RadioIdentifier.cpp | 16 +-- src/dis7/RadioIdentifier.h | 24 ++-- src/dis7/RadioType.cpp | 28 ++--- src/dis7/RadioType.h | 42 +++---- src/dis7/ReceiverPdu.cpp | 12 +- src/dis7/ReceiverPdu.h | 18 +-- src/dis7/RecordQueryReliablePdu.cpp | 30 ++--- src/dis7/RecordQueryReliablePdu.h | 40 +++--- src/dis7/RecordQuerySpecification.cpp | 6 +- src/dis7/RecordQuerySpecification.h | 4 +- src/dis7/RecordSpecification.cpp | 6 +- src/dis7/RecordSpecification.h | 4 +- src/dis7/RecordSpecificationElement.cpp | 24 ++-- src/dis7/RecordSpecificationElement.h | 36 +++--- src/dis7/Relationship.cpp | 8 +- src/dis7/Relationship.h | 12 +- src/dis7/RemoveEntityPdu.cpp | 4 +- src/dis7/RemoveEntityPdu.h | 6 +- src/dis7/RemoveEntityReliablePdu.cpp | 16 +-- src/dis7/RemoveEntityReliablePdu.h | 24 ++-- src/dis7/RepairCompletePdu.cpp | 8 +- src/dis7/RepairCompletePdu.h | 12 +- src/dis7/RepairResponsePdu.cpp | 8 +- src/dis7/RepairResponsePdu.h | 12 +- src/dis7/ResupplyOfferPdu.cpp | 10 +- src/dis7/ResupplyOfferPdu.h | 10 +- src/dis7/ResupplyReceivedPdu.cpp | 10 +- src/dis7/ResupplyReceivedPdu.h | 10 +- src/dis7/SecondaryOperationalData.cpp | 12 +- src/dis7/SecondaryOperationalData.h | 18 +-- src/dis7/SeesPdu.cpp | 24 ++-- src/dis7/SeesPdu.h | 26 ++-- src/dis7/Sensor.cpp | 24 ++-- src/dis7/Sensor.h | 36 +++--- src/dis7/SeparationVP.cpp | 24 ++-- src/dis7/SeparationVP.h | 36 +++--- src/dis7/ServiceRequestPdu.cpp | 14 +-- src/dis7/ServiceRequestPdu.h | 16 +-- src/dis7/SetDataPdu.cpp | 20 +-- src/dis7/SetDataPdu.h | 20 +-- src/dis7/SetDataReliablePdu.cpp | 28 ++--- src/dis7/SetDataReliablePdu.h | 32 ++--- src/dis7/SimulationAddress.cpp | 8 +- src/dis7/SimulationAddress.h | 12 +- src/dis7/SimulationIdentifier.cpp | 4 +- src/dis7/SimulationIdentifier.h | 6 +- src/dis7/StandardVariableSpecification.cpp | 6 +- src/dis7/StandardVariableSpecification.h | 4 +- src/dis7/StartResumePdu.cpp | 4 +- src/dis7/StartResumePdu.h | 6 +- src/dis7/StartResumeReliablePdu.cpp | 16 +-- src/dis7/StartResumeReliablePdu.h | 24 ++-- src/dis7/StopFreezePdu.cpp | 16 +-- src/dis7/StopFreezePdu.h | 24 ++-- src/dis7/StopFreezeReliablePdu.cpp | 20 +-- src/dis7/StopFreezeReliablePdu.h | 30 ++--- src/dis7/StorageFuel.cpp | 20 +-- src/dis7/StorageFuel.h | 30 ++--- src/dis7/StorageFuelReload.cpp | 32 ++--- src/dis7/StorageFuelReload.h | 48 ++++---- src/dis7/SyntheticEnvironmentFamilyPdu.cpp | 5 +- src/dis7/SystemIdentifier.cpp | 16 +-- src/dis7/SystemIdentifier.h | 24 ++-- src/dis7/TotalRecordSets.cpp | 8 +- src/dis7/TotalRecordSets.h | 12 +- src/dis7/TrackJamData.cpp | 8 +- src/dis7/TrackJamData.h | 12 +- src/dis7/TwoByteChunk.cpp | 2 +- src/dis7/UAFundamentalParameter.cpp | 8 +- src/dis7/UAFundamentalParameter.h | 12 +- src/dis7/UaPdu.cpp | 26 ++-- src/dis7/UaPdu.h | 24 ++-- src/dis7/UnattachedIdentifier.cpp | 4 +- src/dis7/UnattachedIdentifier.h | 6 +- src/dis7/UnsignedDISInteger.cpp | 4 +- src/dis7/UnsignedDISInteger.h | 8 +- src/dis7/VariableDatum.cpp | 18 +-- src/dis7/VariableDatum.h | 24 ++-- src/dis7/VariableParameter.cpp | 16 +-- src/dis7/VariableParameter.h | 24 ++-- src/dis7/VariableTransmitterParameters.cpp | 8 +- src/dis7/VariableTransmitterParameters.h | 12 +- src/dis7/utils/DataStream.cpp | 32 ++--- src/dis7/utils/DataStream.h | 26 ++-- 302 files changed, 2792 insertions(+), 2793 deletions(-) diff --git a/src/dis7/AcknowledgePdu.cpp b/src/dis7/AcknowledgePdu.cpp index 0385e033..9fb63852 100644 --- a/src/dis7/AcknowledgePdu.cpp +++ b/src/dis7/AcknowledgePdu.cpp @@ -30,21 +30,21 @@ const EntityID& AcknowledgePdu::getReceivingID() const { return _receivingID; } void AcknowledgePdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned short AcknowledgePdu::getAcknowledgeFlag() const { +uint16_t AcknowledgePdu::getAcknowledgeFlag() const { return _acknowledgeFlag; } -void AcknowledgePdu::setAcknowledgeFlag(unsigned short pX) { +void AcknowledgePdu::setAcknowledgeFlag(uint16_t pX) { _acknowledgeFlag = pX; } -unsigned short AcknowledgePdu::getResponseFlag() const { return _responseFlag; } +uint16_t AcknowledgePdu::getResponseFlag() const { return _responseFlag; } -void AcknowledgePdu::setResponseFlag(unsigned short pX) { _responseFlag = pX; } +void AcknowledgePdu::setResponseFlag(uint16_t pX) { _responseFlag = pX; } -unsigned int AcknowledgePdu::getRequestID() const { return _requestID; } +uint32_t AcknowledgePdu::getRequestID() const { return _requestID; } -void AcknowledgePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void AcknowledgePdu::setRequestID(uint32_t pX) { _requestID = pX; } void AcknowledgePdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis7/AcknowledgePdu.h b/src/dis7/AcknowledgePdu.h index 11debe6d..9954c21c 100644 --- a/src/dis7/AcknowledgePdu.h +++ b/src/dis7/AcknowledgePdu.h @@ -23,13 +23,13 @@ class OPENDIS7_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { EntityID _receivingID; /** type of message being acknowledged */ - unsigned short _acknowledgeFlag; + uint16_t _acknowledgeFlag; /** Whether or not the receiving entity was able to comply with the request */ - unsigned short _responseFlag; + uint16_t _responseFlag; /** Request ID that is unique */ - unsigned int _requestID; + uint32_t _requestID; public: AcknowledgePdu(); @@ -46,14 +46,14 @@ class OPENDIS7_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { const EntityID& getReceivingID() const; void setReceivingID(const EntityID& pX); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + uint16_t getAcknowledgeFlag() const; + void setAcknowledgeFlag(uint16_t pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + uint16_t getResponseFlag() const; + void setResponseFlag(uint16_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/AcknowledgeReliablePdu.cpp b/src/dis7/AcknowledgeReliablePdu.cpp index b66e41a1..262a9fdc 100644 --- a/src/dis7/AcknowledgeReliablePdu.cpp +++ b/src/dis7/AcknowledgeReliablePdu.cpp @@ -12,25 +12,25 @@ AcknowledgeReliablePdu::AcknowledgeReliablePdu() AcknowledgeReliablePdu::~AcknowledgeReliablePdu() {} -unsigned short AcknowledgeReliablePdu::getAcknowledgeFlag() const { +uint16_t AcknowledgeReliablePdu::getAcknowledgeFlag() const { return _acknowledgeFlag; } -void AcknowledgeReliablePdu::setAcknowledgeFlag(unsigned short pX) { +void AcknowledgeReliablePdu::setAcknowledgeFlag(uint16_t pX) { _acknowledgeFlag = pX; } -unsigned short AcknowledgeReliablePdu::getResponseFlag() const { +uint16_t AcknowledgeReliablePdu::getResponseFlag() const { return _responseFlag; } -void AcknowledgeReliablePdu::setResponseFlag(unsigned short pX) { +void AcknowledgeReliablePdu::setResponseFlag(uint16_t pX) { _responseFlag = pX; } -unsigned int AcknowledgeReliablePdu::getRequestID() const { return _requestID; } +uint32_t AcknowledgeReliablePdu::getRequestID() const { return _requestID; } -void AcknowledgeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void AcknowledgeReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void AcknowledgeReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis7/AcknowledgeReliablePdu.h b/src/dis7/AcknowledgeReliablePdu.h index 53ed49ca..2051ae1a 100644 --- a/src/dis7/AcknowledgeReliablePdu.h +++ b/src/dis7/AcknowledgeReliablePdu.h @@ -17,13 +17,13 @@ class OPENDIS7_EXPORT AcknowledgeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** ack flags */ - unsigned short _acknowledgeFlag; + uint16_t _acknowledgeFlag; /** response flags */ - unsigned short _responseFlag; + uint16_t _responseFlag; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: AcknowledgeReliablePdu(); @@ -32,14 +32,14 @@ class OPENDIS7_EXPORT AcknowledgeReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getAcknowledgeFlag() const; - void setAcknowledgeFlag(unsigned short pX); + uint16_t getAcknowledgeFlag() const; + void setAcknowledgeFlag(uint16_t pX); - unsigned short getResponseFlag() const; - void setResponseFlag(unsigned short pX); + uint16_t getResponseFlag() const; + void setResponseFlag(uint16_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/AcousticEmitter.cpp b/src/dis7/AcousticEmitter.cpp index 55adb162..a7f0d2b9 100644 --- a/src/dis7/AcousticEmitter.cpp +++ b/src/dis7/AcousticEmitter.cpp @@ -7,21 +7,21 @@ AcousticEmitter::AcousticEmitter() AcousticEmitter::~AcousticEmitter() {} -unsigned short AcousticEmitter::getAcousticName() const { +uint16_t AcousticEmitter::getAcousticName() const { return _acousticName; } -void AcousticEmitter::setAcousticName(unsigned short pX) { _acousticName = pX; } +void AcousticEmitter::setAcousticName(uint16_t pX) { _acousticName = pX; } -unsigned char AcousticEmitter::getFunction() const { return _function; } +uint8_t AcousticEmitter::getFunction() const { return _function; } -void AcousticEmitter::setFunction(unsigned char pX) { _function = pX; } +void AcousticEmitter::setFunction(uint8_t pX) { _function = pX; } -unsigned char AcousticEmitter::getAcousticIdNumber() const { +uint8_t AcousticEmitter::getAcousticIdNumber() const { return _acousticIdNumber; } -void AcousticEmitter::setAcousticIdNumber(unsigned char pX) { +void AcousticEmitter::setAcousticIdNumber(uint8_t pX) { _acousticIdNumber = pX; } diff --git a/src/dis7/AcousticEmitter.h b/src/dis7/AcousticEmitter.h index a48393ad..c245667b 100644 --- a/src/dis7/AcousticEmitter.h +++ b/src/dis7/AcousticEmitter.h @@ -14,13 +14,13 @@ namespace DIS { class OPENDIS7_EXPORT AcousticEmitter { protected: /** the system for a particular UA emitter, and an enumeration */ - unsigned short _acousticName; + uint16_t _acousticName; /** The function of the acoustic system */ - unsigned char _function; + uint8_t _function; /** The UA emitter identification number relative to a specific system */ - unsigned char _acousticIdNumber; + uint8_t _acousticIdNumber; public: AcousticEmitter(); @@ -29,14 +29,14 @@ class OPENDIS7_EXPORT AcousticEmitter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getAcousticName() const; - void setAcousticName(unsigned short pX); + uint16_t getAcousticName() const; + void setAcousticName(uint16_t pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + uint8_t getFunction() const; + void setFunction(uint8_t pX); - unsigned char getAcousticIdNumber() const; - void setAcousticIdNumber(unsigned char pX); + uint8_t getAcousticIdNumber() const; + void setAcousticIdNumber(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ActionRequestPdu.cpp b/src/dis7/ActionRequestPdu.cpp index 795cea1e..112c553e 100644 --- a/src/dis7/ActionRequestPdu.cpp +++ b/src/dis7/ActionRequestPdu.cpp @@ -36,19 +36,19 @@ const EntityID& ActionRequestPdu::getReceivingID() const { void ActionRequestPdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned int ActionRequestPdu::getRequestID() const { return _requestID; } +uint32_t ActionRequestPdu::getRequestID() const { return _requestID; } -void ActionRequestPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void ActionRequestPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionRequestPdu::getActionID() const { return _actionID; } +uint32_t ActionRequestPdu::getActionID() const { return _actionID; } -void ActionRequestPdu::setActionID(unsigned int pX) { _actionID = pX; } +void ActionRequestPdu::setActionID(uint32_t pX) { _actionID = pX; } -unsigned int ActionRequestPdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionRequestPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int ActionRequestPdu::getNumberOfVariableDatumRecords() const { +uint32_t ActionRequestPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -83,8 +83,8 @@ void ActionRequestPdu::marshal(DataStream& dataStream) const { _receivingID.marshal(dataStream); dataStream << _requestID; dataStream << _actionID; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; @@ -155,12 +155,12 @@ int ActionRequestPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ActionRequestPdu.h b/src/dis7/ActionRequestPdu.h index 95bb551b..097e5134 100644 --- a/src/dis7/ActionRequestPdu.h +++ b/src/dis7/ActionRequestPdu.h @@ -27,17 +27,17 @@ class OPENDIS7_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu { EntityID _receivingID; /** identifies the request being made by the simulaton manager */ - unsigned int _requestID; + uint32_t _requestID; /** identifies the particular action being requested(see Section 7 of * SISO-REF-010). */ - unsigned int _actionID; + uint32_t _actionID; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -60,15 +60,15 @@ class OPENDIS7_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu { const EntityID& getReceivingID() const; void setReceivingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + uint32_t getActionID() const; + void setActionID(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis7/ActionRequestReliablePdu.cpp b/src/dis7/ActionRequestReliablePdu.cpp index 893caf1e..19ec2ec8 100644 --- a/src/dis7/ActionRequestReliablePdu.cpp +++ b/src/dis7/ActionRequestReliablePdu.cpp @@ -19,39 +19,39 @@ ActionRequestReliablePdu::~ActionRequestReliablePdu() { _variableDatumRecords.clear(); } -unsigned char ActionRequestReliablePdu::getRequiredReliabilityService() const { +uint8_t ActionRequestReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void ActionRequestReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void ActionRequestReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short ActionRequestReliablePdu::getPad1() const { return _pad1; } +uint16_t ActionRequestReliablePdu::getPad1() const { return _pad1; } -void ActionRequestReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void ActionRequestReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char ActionRequestReliablePdu::getPad2() const { return _pad2; } +uint8_t ActionRequestReliablePdu::getPad2() const { return _pad2; } -void ActionRequestReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void ActionRequestReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int ActionRequestReliablePdu::getRequestID() const { +uint32_t ActionRequestReliablePdu::getRequestID() const { return _requestID; } -void ActionRequestReliablePdu::setRequestID(unsigned int pX) { +void ActionRequestReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionRequestReliablePdu::getActionID() const { return _actionID; } +uint32_t ActionRequestReliablePdu::getActionID() const { return _actionID; } -void ActionRequestReliablePdu::setActionID(unsigned int pX) { _actionID = pX; } +void ActionRequestReliablePdu::setActionID(uint32_t pX) { _actionID = pX; } -unsigned int ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionRequestReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t ActionRequestReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -92,8 +92,8 @@ void ActionRequestReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad2; dataStream << _requestID; dataStream << _actionID; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; @@ -171,12 +171,12 @@ int ActionRequestReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ActionRequestReliablePdu.h b/src/dis7/ActionRequestReliablePdu.h index 9def2e4a..59ee1fcf 100644 --- a/src/dis7/ActionRequestReliablePdu.h +++ b/src/dis7/ActionRequestReliablePdu.h @@ -21,25 +21,25 @@ class OPENDIS7_EXPORT ActionRequestReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** request ID */ - unsigned int _actionID; + uint32_t _actionID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -54,24 +54,24 @@ class OPENDIS7_EXPORT ActionRequestReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getActionID() const; - void setActionID(unsigned int pX); + uint32_t getActionID() const; + void setActionID(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis7/ActionResponsePdu.cpp b/src/dis7/ActionResponsePdu.cpp index 40397041..39ea4963 100644 --- a/src/dis7/ActionResponsePdu.cpp +++ b/src/dis7/ActionResponsePdu.cpp @@ -38,23 +38,23 @@ void ActionResponsePdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned int ActionResponsePdu::getRequestID() const { return _requestID; } +uint32_t ActionResponsePdu::getRequestID() const { return _requestID; } -void ActionResponsePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void ActionResponsePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionResponsePdu::getRequestStatus() const { +uint32_t ActionResponsePdu::getRequestStatus() const { return _requestStatus; } -void ActionResponsePdu::setRequestStatus(unsigned int pX) { +void ActionResponsePdu::setRequestStatus(uint32_t pX) { _requestStatus = pX; } -unsigned int ActionResponsePdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionResponsePdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int ActionResponsePdu::getNumberOfVariableDatumRecords() const { +uint32_t ActionResponsePdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -90,8 +90,8 @@ void ActionResponsePdu::marshal(DataStream& dataStream) const { _receivingID.marshal(dataStream); dataStream << _requestID; dataStream << _requestStatus; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; @@ -162,12 +162,12 @@ int ActionResponsePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ActionResponsePdu.h b/src/dis7/ActionResponsePdu.h index 48e7e9ee..736bd21c 100644 --- a/src/dis7/ActionResponsePdu.h +++ b/src/dis7/ActionResponsePdu.h @@ -26,16 +26,16 @@ class OPENDIS7_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu { EntityID _receivingID; /** Request ID that is unique */ - unsigned int _requestID; + uint32_t _requestID; /** Status of response */ - unsigned int _requestStatus; + uint32_t _requestStatus; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -58,15 +58,15 @@ class OPENDIS7_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu { const EntityID& getReceivingID() const; void setReceivingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getRequestStatus() const; - void setRequestStatus(unsigned int pX); + uint32_t getRequestStatus() const; + void setRequestStatus(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis7/ActionResponseReliablePdu.cpp b/src/dis7/ActionResponseReliablePdu.cpp index 8bae247a..36082cac 100644 --- a/src/dis7/ActionResponseReliablePdu.cpp +++ b/src/dis7/ActionResponseReliablePdu.cpp @@ -16,27 +16,27 @@ ActionResponseReliablePdu::~ActionResponseReliablePdu() { _variableDatumRecords.clear(); } -unsigned int ActionResponseReliablePdu::getRequestID() const { +uint32_t ActionResponseReliablePdu::getRequestID() const { return _requestID; } -void ActionResponseReliablePdu::setRequestID(unsigned int pX) { +void ActionResponseReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int ActionResponseReliablePdu::getResponseStatus() const { +uint32_t ActionResponseReliablePdu::getResponseStatus() const { return _responseStatus; } -void ActionResponseReliablePdu::setResponseStatus(unsigned int pX) { +void ActionResponseReliablePdu::setResponseStatus(uint32_t pX) { _responseStatus = pX; } -unsigned int ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t ActionResponseReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int ActionResponseReliablePdu::getNumberOfVariableDatumRecords() +uint32_t ActionResponseReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -75,8 +75,8 @@ void ActionResponseReliablePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _responseStatus; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; @@ -144,12 +144,12 @@ int ActionResponseReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ActionResponseReliablePdu.h b/src/dis7/ActionResponseReliablePdu.h index 9cf9fafc..c17c2352 100644 --- a/src/dis7/ActionResponseReliablePdu.h +++ b/src/dis7/ActionResponseReliablePdu.h @@ -20,16 +20,16 @@ class OPENDIS7_EXPORT ActionResponseReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** status of response */ - unsigned int _responseStatus; + uint32_t _responseStatus; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -44,15 +44,15 @@ class OPENDIS7_EXPORT ActionResponseReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getResponseStatus() const; - void setResponseStatus(unsigned int pX); + uint32_t getResponseStatus() const; + void setResponseStatus(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis7/AggregateIdentifier.cpp b/src/dis7/AggregateIdentifier.cpp index be809189..107fa064 100644 --- a/src/dis7/AggregateIdentifier.cpp +++ b/src/dis7/AggregateIdentifier.cpp @@ -19,11 +19,11 @@ void AggregateIdentifier::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short AggregateIdentifier::getAggregateID() const { +uint16_t AggregateIdentifier::getAggregateID() const { return _aggregateID; } -void AggregateIdentifier::setAggregateID(unsigned short pX) { +void AggregateIdentifier::setAggregateID(uint16_t pX) { _aggregateID = pX; } diff --git a/src/dis7/AggregateIdentifier.h b/src/dis7/AggregateIdentifier.h index 520f34a5..c7848994 100644 --- a/src/dis7/AggregateIdentifier.h +++ b/src/dis7/AggregateIdentifier.h @@ -21,7 +21,7 @@ class OPENDIS7_EXPORT AggregateIdentifier { SimulationAddress _simulationAddress; /** the aggregate ID */ - unsigned short _aggregateID; + uint16_t _aggregateID; public: AggregateIdentifier(); @@ -34,8 +34,8 @@ class OPENDIS7_EXPORT AggregateIdentifier { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getAggregateID() const; - void setAggregateID(unsigned short pX); + uint16_t getAggregateID() const; + void setAggregateID(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/AggregateMarking.cpp b/src/dis7/AggregateMarking.cpp index 5382f416..7f599235 100644 --- a/src/dis7/AggregateMarking.cpp +++ b/src/dis7/AggregateMarking.cpp @@ -11,19 +11,19 @@ AggregateMarking::AggregateMarking() : _characterSet(0) { AggregateMarking::~AggregateMarking() {} -unsigned char AggregateMarking::getCharacterSet() const { +uint8_t AggregateMarking::getCharacterSet() const { return _characterSet; } -void AggregateMarking::setCharacterSet(unsigned char pX) { _characterSet = pX; } +void AggregateMarking::setCharacterSet(uint8_t pX) { _characterSet = pX; } -unsigned char* AggregateMarking::getCharacters() { return _characters; } +uint8_t* AggregateMarking::getCharacters() { return _characters; } -const unsigned char* AggregateMarking::getCharacters() const { +const uint8_t* AggregateMarking::getCharacters() const { return _characters; } -void AggregateMarking::setCharacters(const unsigned char* x) { +void AggregateMarking::setCharacters(const uint8_t* x) { for (int i = 0; i < 31; i++) { _characters[i] = x[i]; } @@ -50,7 +50,7 @@ bool AggregateMarking::operator==(const AggregateMarking& rhs) const { if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 31; idx++) { + for (uint8_t idx = 0; idx < 31; idx++) { if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; } diff --git a/src/dis7/AggregateMarking.h b/src/dis7/AggregateMarking.h index e41f4176..ee92b590 100644 --- a/src/dis7/AggregateMarking.h +++ b/src/dis7/AggregateMarking.h @@ -15,10 +15,10 @@ namespace DIS { class OPENDIS7_EXPORT AggregateMarking { protected: /** The character set */ - unsigned char _characterSet; + uint8_t _characterSet; /** The characters */ - unsigned char _characters[31]; + uint8_t _characters[31]; public: AggregateMarking(); @@ -27,12 +27,12 @@ class OPENDIS7_EXPORT AggregateMarking { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + uint8_t getCharacterSet() const; + void setCharacterSet(uint8_t pX); - unsigned char* getCharacters(); - const unsigned char* getCharacters() const; - void setCharacters(const unsigned char* pX); + uint8_t* getCharacters(); + const uint8_t* getCharacters() const; + void setCharacters(const uint8_t* pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/AggregateType.cpp b/src/dis7/AggregateType.cpp index afb58d92..d767e36a 100644 --- a/src/dis7/AggregateType.cpp +++ b/src/dis7/AggregateType.cpp @@ -13,33 +13,33 @@ AggregateType::AggregateType() AggregateType::~AggregateType() {} -unsigned char AggregateType::getAggregateKind() const { return _aggregateKind; } +uint8_t AggregateType::getAggregateKind() const { return _aggregateKind; } -void AggregateType::setAggregateKind(unsigned char pX) { _aggregateKind = pX; } +void AggregateType::setAggregateKind(uint8_t pX) { _aggregateKind = pX; } -unsigned char AggregateType::getDomain() const { return _domain; } +uint8_t AggregateType::getDomain() const { return _domain; } -void AggregateType::setDomain(unsigned char pX) { _domain = pX; } +void AggregateType::setDomain(uint8_t pX) { _domain = pX; } -unsigned short AggregateType::getCountry() const { return _country; } +uint16_t AggregateType::getCountry() const { return _country; } -void AggregateType::setCountry(unsigned short pX) { _country = pX; } +void AggregateType::setCountry(uint16_t pX) { _country = pX; } -unsigned char AggregateType::getCategory() const { return _category; } +uint8_t AggregateType::getCategory() const { return _category; } -void AggregateType::setCategory(unsigned char pX) { _category = pX; } +void AggregateType::setCategory(uint8_t pX) { _category = pX; } -unsigned char AggregateType::getSubcategory() const { return _subcategory; } +uint8_t AggregateType::getSubcategory() const { return _subcategory; } -void AggregateType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void AggregateType::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char AggregateType::getSpecific() const { return _specific; } +uint8_t AggregateType::getSpecific() const { return _specific; } -void AggregateType::setSpecific(unsigned char pX) { _specific = pX; } +void AggregateType::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char AggregateType::getExtra() const { return _extra; } +uint8_t AggregateType::getExtra() const { return _extra; } -void AggregateType::setExtra(unsigned char pX) { _extra = pX; } +void AggregateType::setExtra(uint8_t pX) { _extra = pX; } void AggregateType::marshal(DataStream& dataStream) const { dataStream << _aggregateKind; diff --git a/src/dis7/AggregateType.h b/src/dis7/AggregateType.h index 2d9b6ad9..8b8b4880 100644 --- a/src/dis7/AggregateType.h +++ b/src/dis7/AggregateType.h @@ -15,25 +15,25 @@ class OPENDIS7_EXPORT AggregateType { protected: /** Grouping criterion used to group the aggregate. Enumeration from EBV * document */ - unsigned char _aggregateKind; + uint8_t _aggregateKind; /** Domain of entity (air, surface, subsurface, space, etc) Zero means domain * does not apply. */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; public: AggregateType(); @@ -42,26 +42,26 @@ class OPENDIS7_EXPORT AggregateType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getAggregateKind() const; - void setAggregateKind(unsigned char pX); + uint8_t getAggregateKind() const; + void setAggregateKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/AngleDeception.cpp b/src/dis7/AngleDeception.cpp index 0e84782a..0c339d90 100644 --- a/src/dis7/AngleDeception.cpp +++ b/src/dis7/AngleDeception.cpp @@ -22,39 +22,39 @@ AngleDeception::AngleDeception() AngleDeception::~AngleDeception() {} -unsigned int AngleDeception::getRecordType() const { return _recordType; } +uint32_t AngleDeception::getRecordType() const { return _recordType; } -void AngleDeception::setRecordType(unsigned int pX) { _recordType = pX; } +void AngleDeception::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short AngleDeception::getRecordLength() const { return _recordLength; } +uint16_t AngleDeception::getRecordLength() const { return _recordLength; } -void AngleDeception::setRecordLength(unsigned short pX) { _recordLength = pX; } +void AngleDeception::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned short AngleDeception::getPadding() const { return _padding; } +uint16_t AngleDeception::getPadding() const { return _padding; } -void AngleDeception::setPadding(unsigned short pX) { _padding = pX; } +void AngleDeception::setPadding(uint16_t pX) { _padding = pX; } -unsigned char AngleDeception::getEmitterNumber() const { +uint8_t AngleDeception::getEmitterNumber() const { return _emitterNumber; } -void AngleDeception::setEmitterNumber(unsigned char pX) { _emitterNumber = pX; } +void AngleDeception::setEmitterNumber(uint8_t pX) { _emitterNumber = pX; } -unsigned char AngleDeception::getBeamNumber() const { return _beamNumber; } +uint8_t AngleDeception::getBeamNumber() const { return _beamNumber; } -void AngleDeception::setBeamNumber(unsigned char pX) { _beamNumber = pX; } +void AngleDeception::setBeamNumber(uint8_t pX) { _beamNumber = pX; } -unsigned char AngleDeception::getStateIndicator() const { +uint8_t AngleDeception::getStateIndicator() const { return _stateIndicator; } -void AngleDeception::setStateIndicator(unsigned char pX) { +void AngleDeception::setStateIndicator(uint8_t pX) { _stateIndicator = pX; } -unsigned int AngleDeception::getPadding2() const { return _padding2; } +uint32_t AngleDeception::getPadding2() const { return _padding2; } -void AngleDeception::setPadding2(unsigned int pX) { _padding2 = pX; } +void AngleDeception::setPadding2(uint32_t pX) { _padding2 = pX; } float AngleDeception::getAzimuthOffset() const { return _azimuthOffset; } @@ -98,9 +98,9 @@ void AngleDeception::setElevationPullAcceleration(float pX) { _elevationPullAcceleration = pX; } -unsigned int AngleDeception::getPadding3() const { return _padding3; } +uint32_t AngleDeception::getPadding3() const { return _padding3; } -void AngleDeception::setPadding3(unsigned int pX) { _padding3 = pX; } +void AngleDeception::setPadding3(uint32_t pX) { _padding3 = pX; } void AngleDeception::marshal(DataStream& dataStream) const { dataStream << _recordType; diff --git a/src/dis7/AngleDeception.h b/src/dis7/AngleDeception.h index 55a640fb..37a51e09 100644 --- a/src/dis7/AngleDeception.h +++ b/src/dis7/AngleDeception.h @@ -17,19 +17,19 @@ namespace DIS { class OPENDIS7_EXPORT AngleDeception { protected: - unsigned int _recordType; + uint32_t _recordType; - unsigned short _recordLength; + uint16_t _recordLength; - unsigned short _padding; + uint16_t _padding; - unsigned char _emitterNumber; + uint8_t _emitterNumber; - unsigned char _beamNumber; + uint8_t _beamNumber; - unsigned char _stateIndicator; + uint8_t _stateIndicator; - unsigned int _padding2; + uint32_t _padding2; float _azimuthOffset; @@ -47,7 +47,7 @@ class OPENDIS7_EXPORT AngleDeception { float _elevationPullAcceleration; - unsigned int _padding3; + uint32_t _padding3; public: AngleDeception(); @@ -56,26 +56,26 @@ class OPENDIS7_EXPORT AngleDeception { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + uint8_t getEmitterNumber() const; + void setEmitterNumber(uint8_t pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + uint8_t getBeamNumber() const; + void setBeamNumber(uint8_t pX); - unsigned char getStateIndicator() const; - void setStateIndicator(unsigned char pX); + uint8_t getStateIndicator() const; + void setStateIndicator(uint8_t pX); - unsigned int getPadding2() const; - void setPadding2(unsigned int pX); + uint32_t getPadding2() const; + void setPadding2(uint32_t pX); float getAzimuthOffset() const; void setAzimuthOffset(float pX); @@ -101,8 +101,8 @@ class OPENDIS7_EXPORT AngleDeception { float getElevationPullAcceleration() const; void setElevationPullAcceleration(float pX); - unsigned int getPadding3() const; - void setPadding3(unsigned int pX); + uint32_t getPadding3() const; + void setPadding3(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ArealObjectStatePdu.cpp b/src/dis7/ArealObjectStatePdu.cpp index 446d395f..6c6f4f59 100644 --- a/src/dis7/ArealObjectStatePdu.cpp +++ b/src/dis7/ArealObjectStatePdu.cpp @@ -38,23 +38,23 @@ void ArealObjectStatePdu::setReferencedObjectID(const EntityID& pX) { _referencedObjectID = pX; } -unsigned short ArealObjectStatePdu::getUpdateNumber() const { +uint16_t ArealObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void ArealObjectStatePdu::setUpdateNumber(unsigned short pX) { +void ArealObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } -unsigned char ArealObjectStatePdu::getForceID() const { return _forceID; } +uint8_t ArealObjectStatePdu::getForceID() const { return _forceID; } -void ArealObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void ArealObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char ArealObjectStatePdu::getModifications() const { +uint8_t ArealObjectStatePdu::getModifications() const { return _modifications; } -void ArealObjectStatePdu::setModifications(unsigned char pX) { +void ArealObjectStatePdu::setModifications(uint8_t pX) { _modifications = pX; } @@ -68,23 +68,23 @@ void ArealObjectStatePdu::setObjectType(const EntityType& pX) { _objectType = pX; } -unsigned int ArealObjectStatePdu::getSpecificObjectAppearance() const { +uint32_t ArealObjectStatePdu::getSpecificObjectAppearance() const { return _specificObjectAppearance; } -void ArealObjectStatePdu::setSpecificObjectAppearance(unsigned int pX) { +void ArealObjectStatePdu::setSpecificObjectAppearance(uint32_t pX) { _specificObjectAppearance = pX; } -unsigned short ArealObjectStatePdu::getGeneralObjectAppearance() const { +uint16_t ArealObjectStatePdu::getGeneralObjectAppearance() const { return _generalObjectAppearance; } -void ArealObjectStatePdu::setGeneralObjectAppearance(unsigned short pX) { +void ArealObjectStatePdu::setGeneralObjectAppearance(uint16_t pX) { _generalObjectAppearance = pX; } -unsigned short ArealObjectStatePdu::getNumberOfPoints() const { +uint16_t ArealObjectStatePdu::getNumberOfPoints() const { return _objectLocation.size(); } @@ -137,7 +137,7 @@ void ArealObjectStatePdu::marshal(DataStream& dataStream) const { _objectType.marshal(dataStream); dataStream << _specificObjectAppearance; dataStream << _generalObjectAppearance; - dataStream << (unsigned short)_objectLocation.size(); + dataStream << (uint16_t)_objectLocation.size(); _requesterID.marshal(dataStream); _receivingID.marshal(dataStream); @@ -212,7 +212,7 @@ int ArealObjectStatePdu::getMarshalledSize() const { marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - for (unsigned long long idx = 0; idx < _objectLocation.size(); idx++) { + for (uint64_t idx = 0; idx < _objectLocation.size(); idx++) { Vector3Double listElement = _objectLocation[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ArealObjectStatePdu.h b/src/dis7/ArealObjectStatePdu.h index ec7c83ad..f78d1643 100644 --- a/src/dis7/ArealObjectStatePdu.h +++ b/src/dis7/ArealObjectStatePdu.h @@ -30,25 +30,25 @@ class OPENDIS7_EXPORT ArealObjectStatePdu EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + uint16_t _updateNumber; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** modifications enumeration */ - unsigned char _modifications; + uint8_t _modifications; /** Object type */ EntityType _objectType; /** Object appearance */ - unsigned int _specificObjectAppearance; + uint32_t _specificObjectAppearance; /** Object appearance */ - unsigned short _generalObjectAppearance; + uint16_t _generalObjectAppearance; /** Number of points */ - unsigned short _numberOfPoints; + uint16_t _numberOfPoints; /** requesterID */ SimulationAddress _requesterID; @@ -74,26 +74,26 @@ class OPENDIS7_EXPORT ArealObjectStatePdu const EntityID& getReferencedObjectID() const; void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + uint16_t getUpdateNumber() const; + void setUpdateNumber(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + uint8_t getModifications() const; + void setModifications(uint8_t pX); EntityType& getObjectType(); const EntityType& getObjectType() const; void setObjectType(const EntityType& pX); - unsigned int getSpecificObjectAppearance() const; - void setSpecificObjectAppearance(unsigned int pX); + uint32_t getSpecificObjectAppearance() const; + void setSpecificObjectAppearance(uint32_t pX); - unsigned short getGeneralObjectAppearance() const; - void setGeneralObjectAppearance(unsigned short pX); + uint16_t getGeneralObjectAppearance() const; + void setGeneralObjectAppearance(uint16_t pX); - unsigned short getNumberOfPoints() const; + uint16_t getNumberOfPoints() const; SimulationAddress& getRequesterID(); const SimulationAddress& getRequesterID() const; diff --git a/src/dis7/ArticulatedParts.cpp b/src/dis7/ArticulatedParts.cpp index a255524e..fcd613a6 100644 --- a/src/dis7/ArticulatedParts.cpp +++ b/src/dis7/ArticulatedParts.cpp @@ -12,31 +12,31 @@ ArticulatedParts::ArticulatedParts() ArticulatedParts::~ArticulatedParts() {} -unsigned char ArticulatedParts::getRecordType() const { return _recordType; } +uint8_t ArticulatedParts::getRecordType() const { return _recordType; } -void ArticulatedParts::setRecordType(unsigned char pX) { _recordType = pX; } +void ArticulatedParts::setRecordType(uint8_t pX) { _recordType = pX; } -unsigned char ArticulatedParts::getChangeIndicator() const { +uint8_t ArticulatedParts::getChangeIndicator() const { return _changeIndicator; } -void ArticulatedParts::setChangeIndicator(unsigned char pX) { +void ArticulatedParts::setChangeIndicator(uint8_t pX) { _changeIndicator = pX; } -unsigned short ArticulatedParts::getPartAttachedTo() const { +uint16_t ArticulatedParts::getPartAttachedTo() const { return _partAttachedTo; } -void ArticulatedParts::setPartAttachedTo(unsigned short pX) { +void ArticulatedParts::setPartAttachedTo(uint16_t pX) { _partAttachedTo = pX; } -unsigned int ArticulatedParts::getParameterType() const { +uint32_t ArticulatedParts::getParameterType() const { return _parameterType; } -void ArticulatedParts::setParameterType(unsigned int pX) { +void ArticulatedParts::setParameterType(uint32_t pX) { _parameterType = pX; } diff --git a/src/dis7/ArticulatedParts.h b/src/dis7/ArticulatedParts.h index 6ff9abf5..b0f4b3de 100644 --- a/src/dis7/ArticulatedParts.h +++ b/src/dis7/ArticulatedParts.h @@ -16,27 +16,27 @@ class OPENDIS7_EXPORT ArticulatedParts { protected: /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; + uint8_t _recordType; /** indicate the change of any parameter for any articulated part. Starts at * zero, incremented for each change */ - unsigned char _changeIndicator; + uint8_t _changeIndicator; /** the identification of the articulated part to which this articulation * parameter is attached. This field shall be specified by a 16-bit unsigned * integer. This field shall contain the value zero if the articulated part is * attached directly to the entity. */ - unsigned short _partAttachedTo; + uint16_t _partAttachedTo; /** the type of parameter represented, 32 bit enumeration */ - unsigned int _parameterType; + uint32_t _parameterType; /** This field shall specify the parameter value and shall be specified by a 32-bit floating point number. */ float _parameterValue; /** 32 bits of unused padding */ - unsigned int _padding; + uint32_t _padding; public: ArticulatedParts(); @@ -45,17 +45,17 @@ class OPENDIS7_EXPORT ArticulatedParts { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + uint8_t getRecordType() const; + void setRecordType(uint8_t pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + uint8_t getChangeIndicator() const; + void setChangeIndicator(uint8_t pX); - unsigned short getPartAttachedTo() const; - void setPartAttachedTo(unsigned short pX); + uint16_t getPartAttachedTo() const; + void setPartAttachedTo(uint16_t pX); - unsigned int getParameterType() const; - void setParameterType(unsigned int pX); + uint32_t getParameterType() const; + void setParameterType(uint32_t pX); float getParameterValue() const; void setParameterValue(float pX); diff --git a/src/dis7/Association.cpp b/src/dis7/Association.cpp index da36a53d..3459d881 100644 --- a/src/dis7/Association.cpp +++ b/src/dis7/Association.cpp @@ -10,17 +10,17 @@ Association::Association() Association::~Association() {} -unsigned char Association::getAssociationType() const { +uint8_t Association::getAssociationType() const { return _associationType; } -void Association::setAssociationType(unsigned char pX) { +void Association::setAssociationType(uint8_t pX) { _associationType = pX; } -unsigned char Association::getPadding4() const { return _padding4; } +uint8_t Association::getPadding4() const { return _padding4; } -void Association::setPadding4(unsigned char pX) { _padding4 = pX; } +void Association::setPadding4(uint8_t pX) { _padding4 = pX; } EntityID& Association::getAssociatedEntityID() { return _associatedEntityID; } diff --git a/src/dis7/Association.h b/src/dis7/Association.h index d8b8cf5c..3f08b274 100644 --- a/src/dis7/Association.h +++ b/src/dis7/Association.h @@ -21,9 +21,9 @@ namespace DIS { class OPENDIS7_EXPORT Association { protected: - unsigned char _associationType; + uint8_t _associationType; - unsigned char _padding4; + uint8_t _padding4; /** identity of associated entity. If none, NO_SPECIFIC_ENTITY */ EntityID _associatedEntityID; @@ -38,11 +38,11 @@ class OPENDIS7_EXPORT Association { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getAssociationType() const; - void setAssociationType(unsigned char pX); + uint8_t getAssociationType() const; + void setAssociationType(uint8_t pX); - unsigned char getPadding4() const; - void setPadding4(unsigned char pX); + uint8_t getPadding4() const; + void setPadding4(uint8_t pX); EntityID& getAssociatedEntityID(); const EntityID& getAssociatedEntityID() const; diff --git a/src/dis7/AttachedParts.cpp b/src/dis7/AttachedParts.cpp index 41b0ed09..8d61df48 100644 --- a/src/dis7/AttachedParts.cpp +++ b/src/dis7/AttachedParts.cpp @@ -11,35 +11,35 @@ AttachedParts::AttachedParts() AttachedParts::~AttachedParts() {} -unsigned char AttachedParts::getRecordType() const { return _recordType; } +uint8_t AttachedParts::getRecordType() const { return _recordType; } -void AttachedParts::setRecordType(unsigned char pX) { _recordType = pX; } +void AttachedParts::setRecordType(uint8_t pX) { _recordType = pX; } -unsigned char AttachedParts::getDetachedIndicator() const { +uint8_t AttachedParts::getDetachedIndicator() const { return _detachedIndicator; } -void AttachedParts::setDetachedIndicator(unsigned char pX) { +void AttachedParts::setDetachedIndicator(uint8_t pX) { _detachedIndicator = pX; } -unsigned short AttachedParts::getPartAttachedTo() const { +uint16_t AttachedParts::getPartAttachedTo() const { return _partAttachedTo; } -void AttachedParts::setPartAttachedTo(unsigned short pX) { +void AttachedParts::setPartAttachedTo(uint16_t pX) { _partAttachedTo = pX; } -unsigned int AttachedParts::getParameterType() const { return _parameterType; } +uint32_t AttachedParts::getParameterType() const { return _parameterType; } -void AttachedParts::setParameterType(unsigned int pX) { _parameterType = pX; } +void AttachedParts::setParameterType(uint32_t pX) { _parameterType = pX; } -unsigned long long AttachedParts::getAttachedPartType() const { +uint64_t AttachedParts::getAttachedPartType() const { return _attachedPartType; } -void AttachedParts::setAttachedPartType(unsigned long long pX) { +void AttachedParts::setAttachedPartType(uint64_t pX) { _attachedPartType = pX; } diff --git a/src/dis7/AttachedParts.h b/src/dis7/AttachedParts.h index e667be95..7b3f5b55 100644 --- a/src/dis7/AttachedParts.h +++ b/src/dis7/AttachedParts.h @@ -15,23 +15,23 @@ class OPENDIS7_EXPORT AttachedParts { protected: /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; + uint8_t _recordType; /** 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram */ - unsigned char _detachedIndicator; + uint8_t _detachedIndicator; /** the identification of the articulated part to which this articulation * parameter is attached. This field shall be specified by a 16-bit unsigned * integer. This field shall contain the value zero if the articulated part is * attached directly to the entity. */ - unsigned short _partAttachedTo; + uint16_t _partAttachedTo; /** The location or station to which the part is attached */ - unsigned int _parameterType; + uint32_t _parameterType; /** The definition of the 64 bits shall be determined based on the type of * parameter specified in the Parameter Type field */ - unsigned long long _attachedPartType; + uint64_t _attachedPartType; public: AttachedParts(); @@ -40,20 +40,20 @@ class OPENDIS7_EXPORT AttachedParts { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + uint8_t getRecordType() const; + void setRecordType(uint8_t pX); - unsigned char getDetachedIndicator() const; - void setDetachedIndicator(unsigned char pX); + uint8_t getDetachedIndicator() const; + void setDetachedIndicator(uint8_t pX); - unsigned short getPartAttachedTo() const; - void setPartAttachedTo(unsigned short pX); + uint16_t getPartAttachedTo() const; + void setPartAttachedTo(uint16_t pX); - unsigned int getParameterType() const; - void setParameterType(unsigned int pX); + uint32_t getParameterType() const; + void setParameterType(uint32_t pX); - unsigned long long getAttachedPartType() const; - void setAttachedPartType(unsigned long long pX); + uint64_t getAttachedPartType() const; + void setAttachedPartType(uint64_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/Attribute.cpp b/src/dis7/Attribute.cpp index 60b2396b..20995d85 100644 --- a/src/dis7/Attribute.cpp +++ b/src/dis7/Attribute.cpp @@ -7,19 +7,19 @@ Attribute::Attribute() Attribute::~Attribute() {} -unsigned int Attribute::getRecordType() const { return _recordType; } +uint32_t Attribute::getRecordType() const { return _recordType; } -void Attribute::setRecordType(unsigned int pX) { _recordType = pX; } +void Attribute::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short Attribute::getRecordLength() const { return _recordLength; } +uint16_t Attribute::getRecordLength() const { return _recordLength; } -void Attribute::setRecordLength(unsigned short pX) { _recordLength = pX; } +void Attribute::setRecordLength(uint16_t pX) { _recordLength = pX; } -long long Attribute::getRecordSpecificFields() const { +int64_t Attribute::getRecordSpecificFields() const { return _recordSpecificFields; } -void Attribute::setRecordSpecificFields(long long pX) { +void Attribute::setRecordSpecificFields(int64_t pX) { _recordSpecificFields = pX; } diff --git a/src/dis7/Attribute.h b/src/dis7/Attribute.h index a46b1686..e14cf28b 100644 --- a/src/dis7/Attribute.h +++ b/src/dis7/Attribute.h @@ -14,11 +14,11 @@ namespace DIS { class OPENDIS7_EXPORT Attribute { protected: - unsigned int _recordType; + uint32_t _recordType; - unsigned short _recordLength; + uint16_t _recordLength; - long long _recordSpecificFields; + int64_t _recordSpecificFields; public: Attribute(); @@ -27,14 +27,14 @@ class OPENDIS7_EXPORT Attribute { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - long long getRecordSpecificFields() const; - void setRecordSpecificFields(long long pX); + int64_t getRecordSpecificFields() const; + void setRecordSpecificFields(int64_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/AttributePdu.cpp b/src/dis7/AttributePdu.cpp index 1562c3f8..d210add2 100644 --- a/src/dis7/AttributePdu.cpp +++ b/src/dis7/AttributePdu.cpp @@ -33,47 +33,47 @@ int AttributePdu::getPadding1() const { return _padding1; } void AttributePdu::setPadding1(int pX) { _padding1 = pX; } -short AttributePdu::getPadding2() const { return _padding2; } +int16_t AttributePdu::getPadding2() const { return _padding2; } -void AttributePdu::setPadding2(short pX) { _padding2 = pX; } +void AttributePdu::setPadding2(int16_t pX) { _padding2 = pX; } -unsigned char AttributePdu::getAttributeRecordPduType() const { +uint8_t AttributePdu::getAttributeRecordPduType() const { return _attributeRecordPduType; } -void AttributePdu::setAttributeRecordPduType(unsigned char pX) { +void AttributePdu::setAttributeRecordPduType(uint8_t pX) { _attributeRecordPduType = pX; } -unsigned char AttributePdu::getAttributeRecordProtocolVersion() const { +uint8_t AttributePdu::getAttributeRecordProtocolVersion() const { return _attributeRecordProtocolVersion; } -void AttributePdu::setAttributeRecordProtocolVersion(unsigned char pX) { +void AttributePdu::setAttributeRecordProtocolVersion(uint8_t pX) { _attributeRecordProtocolVersion = pX; } -unsigned int AttributePdu::getMasterAttributeRecordType() const { +uint32_t AttributePdu::getMasterAttributeRecordType() const { return _masterAttributeRecordType; } -void AttributePdu::setMasterAttributeRecordType(unsigned int pX) { +void AttributePdu::setMasterAttributeRecordType(uint32_t pX) { _masterAttributeRecordType = pX; } -unsigned char AttributePdu::getActionCode() const { return _actionCode; } +uint8_t AttributePdu::getActionCode() const { return _actionCode; } -void AttributePdu::setActionCode(unsigned char pX) { _actionCode = pX; } +void AttributePdu::setActionCode(uint8_t pX) { _actionCode = pX; } char AttributePdu::getPadding3() const { return _padding3; } void AttributePdu::setPadding3(char pX) { _padding3 = pX; } -unsigned short AttributePdu::getNumberAttributeRecordSet() const { +uint16_t AttributePdu::getNumberAttributeRecordSet() const { return _numberAttributeRecordSet; } -void AttributePdu::setNumberAttributeRecordSet(unsigned short pX) { +void AttributePdu::setNumberAttributeRecordSet(uint16_t pX) { _numberAttributeRecordSet = pX; } diff --git a/src/dis7/AttributePdu.h b/src/dis7/AttributePdu.h index 3b2af980..eb9664fa 100644 --- a/src/dis7/AttributePdu.h +++ b/src/dis7/AttributePdu.h @@ -28,26 +28,26 @@ class OPENDIS7_EXPORT AttributePdu : public EntityInformationFamilyPdu { int _padding1; /** Padding */ - short _padding2; + int16_t _padding2; /** This field shall represent the type of the PDU that is being extended or * updated, if applicable. It shall be represented by an 8-bit enumeration. */ - unsigned char _attributeRecordPduType; + uint8_t _attributeRecordPduType; /** This field shall indicate the Protocol Version associated with the * Attribute Record PDU Type. It shall be represented by an 8-bit enumeration. */ - unsigned char _attributeRecordProtocolVersion; + uint8_t _attributeRecordProtocolVersion; /** This field shall contain the Attribute record type of the Attribute * records in the PDU if they all have the same Attribute record type. It * shall be represented by a 32-bit enumeration. */ - unsigned int _masterAttributeRecordType; + uint32_t _masterAttributeRecordType; /** This field shall identify the action code applicable to this Attribute * PDU. The Action Code shall apply to all Attribute records contained in the * PDU. It shall be represented by an 8-bit enumeration. */ - unsigned char _actionCode; + uint8_t _actionCode; /** Padding */ char _padding3; @@ -55,7 +55,7 @@ class OPENDIS7_EXPORT AttributePdu : public EntityInformationFamilyPdu { /** This field shall specify the number of Attribute Record Sets that make up * the remainder of the PDU. It shall be represented by a 16-bit unsigned * integer. */ - unsigned short _numberAttributeRecordSet; + uint16_t _numberAttributeRecordSet; public: AttributePdu(); @@ -71,26 +71,26 @@ class OPENDIS7_EXPORT AttributePdu : public EntityInformationFamilyPdu { int getPadding1() const; void setPadding1(int pX); - short getPadding2() const; - void setPadding2(short pX); + int16_t getPadding2() const; + void setPadding2(int16_t pX); - unsigned char getAttributeRecordPduType() const; - void setAttributeRecordPduType(unsigned char pX); + uint8_t getAttributeRecordPduType() const; + void setAttributeRecordPduType(uint8_t pX); - unsigned char getAttributeRecordProtocolVersion() const; - void setAttributeRecordProtocolVersion(unsigned char pX); + uint8_t getAttributeRecordProtocolVersion() const; + void setAttributeRecordProtocolVersion(uint8_t pX); - unsigned int getMasterAttributeRecordType() const; - void setMasterAttributeRecordType(unsigned int pX); + uint32_t getMasterAttributeRecordType() const; + void setMasterAttributeRecordType(uint32_t pX); - unsigned char getActionCode() const; - void setActionCode(unsigned char pX); + uint8_t getActionCode() const; + void setActionCode(uint8_t pX); char getPadding3() const; void setPadding3(char pX); - unsigned short getNumberAttributeRecordSet() const; - void setNumberAttributeRecordSet(unsigned short pX); + uint16_t getNumberAttributeRecordSet() const; + void setNumberAttributeRecordSet(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/BeamAntennaPattern.cpp b/src/dis7/BeamAntennaPattern.cpp index 8507e95f..0742a33d 100644 --- a/src/dis7/BeamAntennaPattern.cpp +++ b/src/dis7/BeamAntennaPattern.cpp @@ -48,13 +48,13 @@ float BeamAntennaPattern::getReferenceSystem() const { void BeamAntennaPattern::setReferenceSystem(float pX) { _referenceSystem = pX; } -unsigned char BeamAntennaPattern::getPadding1() const { return _padding1; } +uint8_t BeamAntennaPattern::getPadding1() const { return _padding1; } -void BeamAntennaPattern::setPadding1(unsigned char pX) { _padding1 = pX; } +void BeamAntennaPattern::setPadding1(uint8_t pX) { _padding1 = pX; } -unsigned short BeamAntennaPattern::getPadding2() const { return _padding2; } +uint16_t BeamAntennaPattern::getPadding2() const { return _padding2; } -void BeamAntennaPattern::setPadding2(unsigned short pX) { _padding2 = pX; } +void BeamAntennaPattern::setPadding2(uint16_t pX) { _padding2 = pX; } float BeamAntennaPattern::getEz() const { return _ez; } @@ -68,9 +68,9 @@ float BeamAntennaPattern::getPhase() const { return _phase; } void BeamAntennaPattern::setPhase(float pX) { _phase = pX; } -unsigned int BeamAntennaPattern::getPadding3() const { return _padding3; } +uint32_t BeamAntennaPattern::getPadding3() const { return _padding3; } -void BeamAntennaPattern::setPadding3(unsigned int pX) { _padding3 = pX; } +void BeamAntennaPattern::setPadding3(uint32_t pX) { _padding3 = pX; } void BeamAntennaPattern::marshal(DataStream& dataStream) const { _beamDirection.marshal(dataStream); diff --git a/src/dis7/BeamAntennaPattern.h b/src/dis7/BeamAntennaPattern.h index d83567f8..f9bb7a2f 100644 --- a/src/dis7/BeamAntennaPattern.h +++ b/src/dis7/BeamAntennaPattern.h @@ -28,9 +28,9 @@ class OPENDIS7_EXPORT BeamAntennaPattern { float _referenceSystem; - unsigned char _padding1; + uint8_t _padding1; - unsigned short _padding2; + uint16_t _padding2; /** This field shall specify the magnitude of the Z-component (in beam * coordinates) of the Electrical field at some arbitrary single point in the @@ -50,7 +50,7 @@ class OPENDIS7_EXPORT BeamAntennaPattern { float _phase; /** padding */ - unsigned int _padding3; + uint32_t _padding3; public: BeamAntennaPattern(); @@ -72,11 +72,11 @@ class OPENDIS7_EXPORT BeamAntennaPattern { float getReferenceSystem() const; void setReferenceSystem(float pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + uint8_t getPadding1() const; + void setPadding1(uint8_t pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + uint16_t getPadding2() const; + void setPadding2(uint16_t pX); float getEz() const; void setEz(float pX); @@ -87,8 +87,8 @@ class OPENDIS7_EXPORT BeamAntennaPattern { float getPhase() const; void setPhase(float pX); - unsigned int getPadding3() const; - void setPadding3(unsigned int pX); + uint32_t getPadding3() const; + void setPadding3(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/BeamStatus.cpp b/src/dis7/BeamStatus.cpp index 59902230..2f2f1b25 100644 --- a/src/dis7/BeamStatus.cpp +++ b/src/dis7/BeamStatus.cpp @@ -6,9 +6,9 @@ BeamStatus::BeamStatus() : _beamState(0) {} BeamStatus::~BeamStatus() {} -unsigned char BeamStatus::getBeamState() const { return _beamState; } +uint8_t BeamStatus::getBeamState() const { return _beamState; } -void BeamStatus::setBeamState(unsigned char pX) { _beamState = pX; } +void BeamStatus::setBeamState(uint8_t pX) { _beamState = pX; } void BeamStatus::marshal(DataStream& dataStream) const { dataStream << _beamState; diff --git a/src/dis7/BeamStatus.h b/src/dis7/BeamStatus.h index 7e22ac46..01fb9059 100644 --- a/src/dis7/BeamStatus.h +++ b/src/dis7/BeamStatus.h @@ -17,7 +17,7 @@ class OPENDIS7_EXPORT BeamStatus { protected: /** First bit zero means beam is active, first bit = 1 means deactivated. The * rest is padding. */ - unsigned char _beamState; + uint8_t _beamState; public: BeamStatus(); @@ -26,8 +26,8 @@ class OPENDIS7_EXPORT BeamStatus { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getBeamState() const; - void setBeamState(unsigned char pX); + uint8_t getBeamState() const; + void setBeamState(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/BlankingSector.cpp b/src/dis7/BlankingSector.cpp index b37b2686..115d1497 100644 --- a/src/dis7/BlankingSector.cpp +++ b/src/dis7/BlankingSector.cpp @@ -16,29 +16,29 @@ BlankingSector::BlankingSector() BlankingSector::~BlankingSector() {} -unsigned int BlankingSector::getRecordType() const { return _recordType; } +uint32_t BlankingSector::getRecordType() const { return _recordType; } -void BlankingSector::setRecordType(unsigned int pX) { _recordType = pX; } +void BlankingSector::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short BlankingSector::getRecordLength() const { return _recordLength; } +uint16_t BlankingSector::getRecordLength() const { return _recordLength; } -void BlankingSector::setRecordLength(unsigned short pX) { _recordLength = pX; } +void BlankingSector::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned char BlankingSector::getEmitterNumber() const { +uint8_t BlankingSector::getEmitterNumber() const { return _emitterNumber; } -void BlankingSector::setEmitterNumber(unsigned char pX) { _emitterNumber = pX; } +void BlankingSector::setEmitterNumber(uint8_t pX) { _emitterNumber = pX; } -unsigned char BlankingSector::getBeamNumber() const { return _beamNumber; } +uint8_t BlankingSector::getBeamNumber() const { return _beamNumber; } -void BlankingSector::setBeamNumber(unsigned char pX) { _beamNumber = pX; } +void BlankingSector::setBeamNumber(uint8_t pX) { _beamNumber = pX; } -unsigned char BlankingSector::getStateIndicator() const { +uint8_t BlankingSector::getStateIndicator() const { return _stateIndicator; } -void BlankingSector::setStateIndicator(unsigned char pX) { +void BlankingSector::setStateIndicator(uint8_t pX) { _stateIndicator = pX; } diff --git a/src/dis7/BlankingSector.h b/src/dis7/BlankingSector.h index 8eb2984f..5c06974a 100644 --- a/src/dis7/BlankingSector.h +++ b/src/dis7/BlankingSector.h @@ -15,15 +15,15 @@ namespace DIS { class OPENDIS7_EXPORT BlankingSector { protected: - unsigned int _recordType; + uint32_t _recordType; - unsigned short _recordLength; + uint16_t _recordLength; - unsigned char _emitterNumber; + uint8_t _emitterNumber; - unsigned char _beamNumber; + uint8_t _beamNumber; - unsigned char _stateIndicator; + uint8_t _stateIndicator; float _leftAzimuth; @@ -42,20 +42,20 @@ class OPENDIS7_EXPORT BlankingSector { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + uint8_t getEmitterNumber() const; + void setEmitterNumber(uint8_t pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + uint8_t getBeamNumber() const; + void setBeamNumber(uint8_t pX); - unsigned char getStateIndicator() const; - void setStateIndicator(unsigned char pX); + uint8_t getStateIndicator() const; + void setStateIndicator(uint8_t pX); float getLeftAzimuth() const; void setLeftAzimuth(float pX); diff --git a/src/dis7/ClockTime.cpp b/src/dis7/ClockTime.cpp index f0a0a41b..bc5d2e7a 100644 --- a/src/dis7/ClockTime.cpp +++ b/src/dis7/ClockTime.cpp @@ -6,13 +6,13 @@ ClockTime::ClockTime() : _hour(0), _timePastHour(0) {} ClockTime::~ClockTime() {} -unsigned int ClockTime::getHour() const { return _hour; } +uint32_t ClockTime::getHour() const { return _hour; } -void ClockTime::setHour(unsigned int pX) { _hour = pX; } +void ClockTime::setHour(uint32_t pX) { _hour = pX; } -unsigned int ClockTime::getTimePastHour() const { return _timePastHour; } +uint32_t ClockTime::getTimePastHour() const { return _timePastHour; } -void ClockTime::setTimePastHour(unsigned int pX) { _timePastHour = pX; } +void ClockTime::setTimePastHour(uint32_t pX) { _timePastHour = pX; } void ClockTime::marshal(DataStream& dataStream) const { dataStream << _hour; diff --git a/src/dis7/ClockTime.h b/src/dis7/ClockTime.h index 60b1165b..cd3b7137 100644 --- a/src/dis7/ClockTime.h +++ b/src/dis7/ClockTime.h @@ -17,10 +17,10 @@ namespace DIS { class OPENDIS7_EXPORT ClockTime { protected: /** Hours in UTC */ - unsigned int _hour; + uint32_t _hour; /** Time past the hour */ - unsigned int _timePastHour; + uint32_t _timePastHour; public: ClockTime(); @@ -29,11 +29,11 @@ class OPENDIS7_EXPORT ClockTime { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getHour() const; - void setHour(unsigned int pX); + uint32_t getHour() const; + void setHour(uint32_t pX); - unsigned int getTimePastHour() const; - void setTimePastHour(unsigned int pX); + uint32_t getTimePastHour() const; + void setTimePastHour(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/CollisionElasticPdu.cpp b/src/dis7/CollisionElasticPdu.cpp index ccf06e44..380a3008 100644 --- a/src/dis7/CollisionElasticPdu.cpp +++ b/src/dis7/CollisionElasticPdu.cpp @@ -59,9 +59,9 @@ void CollisionElasticPdu::setCollisionEventID(const EventIdentifier& pX) { _collisionEventID = pX; } -short CollisionElasticPdu::getPad() const { return _pad; } +int16_t CollisionElasticPdu::getPad() const { return _pad; } -void CollisionElasticPdu::setPad(short pX) { _pad = pX; } +void CollisionElasticPdu::setPad(int16_t pX) { _pad = pX; } Vector3Float& CollisionElasticPdu::getContactVelocity() { return _contactVelocity; diff --git a/src/dis7/CollisionElasticPdu.h b/src/dis7/CollisionElasticPdu.h index 8b88c4ef..29323a49 100644 --- a/src/dis7/CollisionElasticPdu.h +++ b/src/dis7/CollisionElasticPdu.h @@ -34,7 +34,7 @@ class OPENDIS7_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu { EventIdentifier _collisionEventID; /** some padding */ - short _pad; + int16_t _pad; /** This field shall contain the velocity at the time the collision is * detected at the point the collision is detected. The velocity shall be @@ -104,8 +104,8 @@ class OPENDIS7_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu { const EventIdentifier& getCollisionEventID() const; void setCollisionEventID(const EventIdentifier& pX); - short getPad() const; - void setPad(short pX); + int16_t getPad() const; + void setPad(int16_t pX); Vector3Float& getContactVelocity(); const Vector3Float& getContactVelocity() const; diff --git a/src/dis7/CollisionPdu.cpp b/src/dis7/CollisionPdu.cpp index 53bef36a..ac904bb3 100644 --- a/src/dis7/CollisionPdu.cpp +++ b/src/dis7/CollisionPdu.cpp @@ -44,9 +44,9 @@ const EventIdentifier& CollisionPdu::getEventID() const { return _eventID; } void CollisionPdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -unsigned char CollisionPdu::getCollisionType() const { return _collisionType; } +uint8_t CollisionPdu::getCollisionType() const { return _collisionType; } -void CollisionPdu::setCollisionType(unsigned char pX) { _collisionType = pX; } +void CollisionPdu::setCollisionType(uint8_t pX) { _collisionType = pX; } char CollisionPdu::getPad() const { return _pad; } diff --git a/src/dis7/CollisionPdu.h b/src/dis7/CollisionPdu.h index 2fb12e1c..44e0234e 100644 --- a/src/dis7/CollisionPdu.h +++ b/src/dis7/CollisionPdu.h @@ -34,7 +34,7 @@ class OPENDIS7_EXPORT CollisionPdu : public EntityInformationFamilyPdu { /** This field shall identify the type of collision. The Collision Type field * shall be represented by an 8-bit record of enumerations */ - unsigned char _collisionType; + uint8_t _collisionType; /** some padding */ char _pad; @@ -73,8 +73,8 @@ class OPENDIS7_EXPORT CollisionPdu : public EntityInformationFamilyPdu { const EventIdentifier& getEventID() const; void setEventID(const EventIdentifier& pX); - unsigned char getCollisionType() const; - void setCollisionType(unsigned char pX); + uint8_t getCollisionType() const; + void setCollisionType(uint8_t pX); char getPad() const; void setPad(char pX); diff --git a/src/dis7/CommentPdu.cpp b/src/dis7/CommentPdu.cpp index 40e09e8a..d1e342bd 100644 --- a/src/dis7/CommentPdu.cpp +++ b/src/dis7/CommentPdu.cpp @@ -14,11 +14,11 @@ CommentPdu::~CommentPdu() { _variableDatums.clear(); } -unsigned int CommentPdu::getNumberOfFixedDatumRecords() const { +uint32_t CommentPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int CommentPdu::getNumberOfVariableDatumRecords() const { +uint32_t CommentPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -47,8 +47,8 @@ void CommentPdu::setVariableDatums(const std::vector& pX) { void CommentPdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( dataStream); // Marshal information in superclass first - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; @@ -105,12 +105,12 @@ int CommentPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/CommentPdu.h b/src/dis7/CommentPdu.h index c1085a19..33c53912 100644 --- a/src/dis7/CommentPdu.h +++ b/src/dis7/CommentPdu.h @@ -20,10 +20,10 @@ namespace DIS { class OPENDIS7_EXPORT CommentPdu : public SimulationManagementFamilyPdu { protected: /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -38,9 +38,9 @@ class OPENDIS7_EXPORT CommentPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis7/CommentReliablePdu.cpp b/src/dis7/CommentReliablePdu.cpp index b9123865..7efb119d 100644 --- a/src/dis7/CommentReliablePdu.cpp +++ b/src/dis7/CommentReliablePdu.cpp @@ -14,11 +14,11 @@ CommentReliablePdu::~CommentReliablePdu() { _variableDatumRecords.clear(); } -unsigned int CommentReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t CommentReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int CommentReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t CommentReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -53,8 +53,8 @@ void CommentReliablePdu::setVariableDatumRecords( void CommentReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( dataStream); // Marshal information in superclass first - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; @@ -114,12 +114,12 @@ int CommentReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/CommentReliablePdu.h b/src/dis7/CommentReliablePdu.h index deab8430..25ff7185 100644 --- a/src/dis7/CommentReliablePdu.h +++ b/src/dis7/CommentReliablePdu.h @@ -21,10 +21,10 @@ class OPENDIS7_EXPORT CommentReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -39,9 +39,9 @@ class OPENDIS7_EXPORT CommentReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis7/CommunicationsNodeID.cpp b/src/dis7/CommunicationsNodeID.cpp index 943425de..4e695541 100644 --- a/src/dis7/CommunicationsNodeID.cpp +++ b/src/dis7/CommunicationsNodeID.cpp @@ -12,9 +12,9 @@ const EntityID& CommunicationsNodeID::getEntityID() const { return _entityID; } void CommunicationsNodeID::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned short CommunicationsNodeID::getElementID() const { return _elementID; } +uint16_t CommunicationsNodeID::getElementID() const { return _elementID; } -void CommunicationsNodeID::setElementID(unsigned short pX) { _elementID = pX; } +void CommunicationsNodeID::setElementID(uint16_t pX) { _elementID = pX; } void CommunicationsNodeID::marshal(DataStream& dataStream) const { _entityID.marshal(dataStream); diff --git a/src/dis7/CommunicationsNodeID.h b/src/dis7/CommunicationsNodeID.h index cc197f4e..fb57b9b8 100644 --- a/src/dis7/CommunicationsNodeID.h +++ b/src/dis7/CommunicationsNodeID.h @@ -16,7 +16,7 @@ class OPENDIS7_EXPORT CommunicationsNodeID { protected: EntityID _entityID; - unsigned short _elementID; + uint16_t _elementID; public: CommunicationsNodeID(); @@ -29,8 +29,8 @@ class OPENDIS7_EXPORT CommunicationsNodeID { const EntityID& getEntityID() const; void setEntityID(const EntityID& pX); - unsigned short getElementID() const; - void setElementID(unsigned short pX); + uint16_t getElementID() const; + void setElementID(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/CreateEntityPdu.cpp b/src/dis7/CreateEntityPdu.cpp index 4dac4580..e40c01c0 100644 --- a/src/dis7/CreateEntityPdu.cpp +++ b/src/dis7/CreateEntityPdu.cpp @@ -28,9 +28,9 @@ const EntityID& CreateEntityPdu::getReceivingID() const { return _receivingID; } void CreateEntityPdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned int CreateEntityPdu::getRequestID() const { return _requestID; } +uint32_t CreateEntityPdu::getRequestID() const { return _requestID; } -void CreateEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void CreateEntityPdu::setRequestID(uint32_t pX) { _requestID = pX; } void CreateEntityPdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis7/CreateEntityPdu.h b/src/dis7/CreateEntityPdu.h index da5759e8..4bd2fcab 100644 --- a/src/dis7/CreateEntityPdu.h +++ b/src/dis7/CreateEntityPdu.h @@ -22,7 +22,7 @@ class OPENDIS7_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu { EntityID _receivingID; /** Identifier for the request. See 6.2.75 */ - unsigned int _requestID; + uint32_t _requestID; public: CreateEntityPdu(); @@ -39,8 +39,8 @@ class OPENDIS7_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu { const EntityID& getReceivingID() const; void setReceivingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/CreateEntityReliablePdu.cpp b/src/dis7/CreateEntityReliablePdu.cpp index 173053f2..348aa413 100644 --- a/src/dis7/CreateEntityReliablePdu.cpp +++ b/src/dis7/CreateEntityReliablePdu.cpp @@ -13,27 +13,27 @@ CreateEntityReliablePdu::CreateEntityReliablePdu() CreateEntityReliablePdu::~CreateEntityReliablePdu() {} -unsigned char CreateEntityReliablePdu::getRequiredReliabilityService() const { +uint8_t CreateEntityReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void CreateEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void CreateEntityReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short CreateEntityReliablePdu::getPad1() const { return _pad1; } +uint16_t CreateEntityReliablePdu::getPad1() const { return _pad1; } -void CreateEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void CreateEntityReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char CreateEntityReliablePdu::getPad2() const { return _pad2; } +uint8_t CreateEntityReliablePdu::getPad2() const { return _pad2; } -void CreateEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void CreateEntityReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int CreateEntityReliablePdu::getRequestID() const { +uint32_t CreateEntityReliablePdu::getRequestID() const { return _requestID; } -void CreateEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void CreateEntityReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void CreateEntityReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis7/CreateEntityReliablePdu.h b/src/dis7/CreateEntityReliablePdu.h index 9e8bba69..8c535e46 100644 --- a/src/dis7/CreateEntityReliablePdu.h +++ b/src/dis7/CreateEntityReliablePdu.h @@ -16,16 +16,16 @@ class OPENDIS7_EXPORT CreateEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: CreateEntityReliablePdu(); @@ -34,17 +34,17 @@ class OPENDIS7_EXPORT CreateEntityReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/DataPdu.cpp b/src/dis7/DataPdu.cpp index 5b27cdfd..fe85139a 100644 --- a/src/dis7/DataPdu.cpp +++ b/src/dis7/DataPdu.cpp @@ -16,19 +16,19 @@ DataPdu::~DataPdu() { _variableDatums.clear(); } -unsigned int DataPdu::getRequestID() const { return _requestID; } +uint32_t DataPdu::getRequestID() const { return _requestID; } -void DataPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int DataPdu::getPadding1() const { return _padding1; } +uint32_t DataPdu::getPadding1() const { return _padding1; } -void DataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } +void DataPdu::setPadding1(uint32_t pX) { _padding1 = pX; } -unsigned int DataPdu::getNumberOfFixedDatumRecords() const { +uint32_t DataPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int DataPdu::getNumberOfVariableDatumRecords() const { +uint32_t DataPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -59,8 +59,8 @@ void DataPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _padding1; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; @@ -124,12 +124,12 @@ int DataPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DataPdu.h b/src/dis7/DataPdu.h index 7ad26500..081c985b 100644 --- a/src/dis7/DataPdu.h +++ b/src/dis7/DataPdu.h @@ -20,16 +20,16 @@ namespace DIS { class OPENDIS7_EXPORT DataPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ - unsigned int _requestID; + uint32_t _requestID; /** padding */ - unsigned int _padding1; + uint32_t _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -44,15 +44,15 @@ class OPENDIS7_EXPORT DataPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + uint32_t getPadding1() const; + void setPadding1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis7/DataQueryDatumSpecification.cpp b/src/dis7/DataQueryDatumSpecification.cpp index f23bd734..7df14cf7 100644 --- a/src/dis7/DataQueryDatumSpecification.cpp +++ b/src/dis7/DataQueryDatumSpecification.cpp @@ -10,11 +10,11 @@ DataQueryDatumSpecification::~DataQueryDatumSpecification() { _variableDatumIDList.clear(); } -unsigned int DataQueryDatumSpecification::getNumberOfFixedDatums() const { +uint32_t DataQueryDatumSpecification::getNumberOfFixedDatums() const { return _fixedDatumIDList.size(); } -unsigned int DataQueryDatumSpecification::getNumberOfVariableDatums() const { +uint32_t DataQueryDatumSpecification::getNumberOfVariableDatums() const { return _variableDatumIDList.size(); } @@ -49,8 +49,8 @@ void DataQueryDatumSpecification::setVariableDatumIDList( } void DataQueryDatumSpecification::marshal(DataStream& dataStream) const { - dataStream << (unsigned int)_fixedDatumIDList.size(); - dataStream << (unsigned int)_variableDatumIDList.size(); + dataStream << (uint32_t)_fixedDatumIDList.size(); + dataStream << (uint32_t)_variableDatumIDList.size(); for (size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { UnsignedDISInteger x = _fixedDatumIDList[idx]; @@ -105,12 +105,12 @@ int DataQueryDatumSpecification::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatums marshalSize = marshalSize + 4; // _numberOfVariableDatums - for (unsigned long long idx = 0; idx < _fixedDatumIDList.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { UnsignedDISInteger listElement = _fixedDatumIDList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumIDList.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumIDList.size(); idx++) { UnsignedDISInteger listElement = _variableDatumIDList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DataQueryDatumSpecification.h b/src/dis7/DataQueryDatumSpecification.h index c6e42e2d..8bba6d63 100644 --- a/src/dis7/DataQueryDatumSpecification.h +++ b/src/dis7/DataQueryDatumSpecification.h @@ -17,10 +17,10 @@ namespace DIS { class OPENDIS7_EXPORT DataQueryDatumSpecification { protected: /** Number of fixed datums */ - unsigned int _numberOfFixedDatums; + uint32_t _numberOfFixedDatums; /** Number of variable datums */ - unsigned int _numberOfVariableDatums; + uint32_t _numberOfVariableDatums; /** variable length list fixed datum IDs */ std::vector _fixedDatumIDList; @@ -35,9 +35,9 @@ class OPENDIS7_EXPORT DataQueryDatumSpecification { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatums() const; + uint32_t getNumberOfFixedDatums() const; - unsigned int getNumberOfVariableDatums() const; + uint32_t getNumberOfVariableDatums() const; std::vector& getFixedDatumIDList(); const std::vector& getFixedDatumIDList() const; diff --git a/src/dis7/DataQueryPdu.cpp b/src/dis7/DataQueryPdu.cpp index e020b457..c8fdf34c 100644 --- a/src/dis7/DataQueryPdu.cpp +++ b/src/dis7/DataQueryPdu.cpp @@ -16,19 +16,19 @@ DataQueryPdu::~DataQueryPdu() { _variableDatums.clear(); } -unsigned int DataQueryPdu::getRequestID() const { return _requestID; } +uint32_t DataQueryPdu::getRequestID() const { return _requestID; } -void DataQueryPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataQueryPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int DataQueryPdu::getTimeInterval() const { return _timeInterval; } +uint32_t DataQueryPdu::getTimeInterval() const { return _timeInterval; } -void DataQueryPdu::setTimeInterval(unsigned int pX) { _timeInterval = pX; } +void DataQueryPdu::setTimeInterval(uint32_t pX) { _timeInterval = pX; } -unsigned int DataQueryPdu::getNumberOfFixedDatumRecords() const { +uint32_t DataQueryPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int DataQueryPdu::getNumberOfVariableDatumRecords() const { +uint32_t DataQueryPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -59,8 +59,8 @@ void DataQueryPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _timeInterval; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; @@ -124,12 +124,12 @@ int DataQueryPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DataQueryPdu.h b/src/dis7/DataQueryPdu.h index 26417f7c..7611cf11 100644 --- a/src/dis7/DataQueryPdu.h +++ b/src/dis7/DataQueryPdu.h @@ -19,16 +19,16 @@ namespace DIS { class OPENDIS7_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ - unsigned int _requestID; + uint32_t _requestID; /** time issues between issues of Data PDUs. Zero means send once only. */ - unsigned int _timeInterval; + uint32_t _timeInterval; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -43,15 +43,15 @@ class OPENDIS7_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + uint32_t getTimeInterval() const; + void setTimeInterval(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis7/DataQueryReliablePdu.cpp b/src/dis7/DataQueryReliablePdu.cpp index e0dd9505..e1f1958a 100644 --- a/src/dis7/DataQueryReliablePdu.cpp +++ b/src/dis7/DataQueryReliablePdu.cpp @@ -19,39 +19,39 @@ DataQueryReliablePdu::~DataQueryReliablePdu() { _variableDatumRecords.clear(); } -unsigned char DataQueryReliablePdu::getRequiredReliabilityService() const { +uint8_t DataQueryReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void DataQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void DataQueryReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short DataQueryReliablePdu::getPad1() const { return _pad1; } +uint16_t DataQueryReliablePdu::getPad1() const { return _pad1; } -void DataQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void DataQueryReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char DataQueryReliablePdu::getPad2() const { return _pad2; } +uint8_t DataQueryReliablePdu::getPad2() const { return _pad2; } -void DataQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void DataQueryReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int DataQueryReliablePdu::getRequestID() const { return _requestID; } +uint32_t DataQueryReliablePdu::getRequestID() const { return _requestID; } -void DataQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataQueryReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int DataQueryReliablePdu::getTimeInterval() const { +uint32_t DataQueryReliablePdu::getTimeInterval() const { return _timeInterval; } -void DataQueryReliablePdu::setTimeInterval(unsigned int pX) { +void DataQueryReliablePdu::setTimeInterval(uint32_t pX) { _timeInterval = pX; } -unsigned int DataQueryReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t DataQueryReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int DataQueryReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t DataQueryReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -91,8 +91,8 @@ void DataQueryReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad2; dataStream << _requestID; dataStream << _timeInterval; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; @@ -169,12 +169,12 @@ int DataQueryReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DataQueryReliablePdu.h b/src/dis7/DataQueryReliablePdu.h index e4500695..f0aa427c 100644 --- a/src/dis7/DataQueryReliablePdu.h +++ b/src/dis7/DataQueryReliablePdu.h @@ -20,25 +20,25 @@ class OPENDIS7_EXPORT DataQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** time interval between issuing data query PDUs */ - unsigned int _timeInterval; + uint32_t _timeInterval; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -53,24 +53,24 @@ class OPENDIS7_EXPORT DataQueryReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getTimeInterval() const; - void setTimeInterval(unsigned int pX); + uint32_t getTimeInterval() const; + void setTimeInterval(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis7/DataReliablePdu.cpp b/src/dis7/DataReliablePdu.cpp index f95d93da..e7d6e313 100644 --- a/src/dis7/DataReliablePdu.cpp +++ b/src/dis7/DataReliablePdu.cpp @@ -18,31 +18,31 @@ DataReliablePdu::~DataReliablePdu() { _variableDatumRecords.clear(); } -unsigned int DataReliablePdu::getRequestID() const { return _requestID; } +uint32_t DataReliablePdu::getRequestID() const { return _requestID; } -void DataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void DataReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned char DataReliablePdu::getRequiredReliabilityService() const { +uint8_t DataReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void DataReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void DataReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short DataReliablePdu::getPad1() const { return _pad1; } +uint16_t DataReliablePdu::getPad1() const { return _pad1; } -void DataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void DataReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char DataReliablePdu::getPad2() const { return _pad2; } +uint8_t DataReliablePdu::getPad2() const { return _pad2; } -void DataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void DataReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int DataReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t DataReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int DataReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t DataReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -79,8 +79,8 @@ void DataReliablePdu::marshal(DataStream& dataStream) const { dataStream << _requiredReliabilityService; dataStream << _pad1; dataStream << _pad2; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; @@ -154,12 +154,12 @@ int DataReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DataReliablePdu.h b/src/dis7/DataReliablePdu.h index 2635c935..506c9118 100644 --- a/src/dis7/DataReliablePdu.h +++ b/src/dis7/DataReliablePdu.h @@ -21,22 +21,22 @@ class OPENDIS7_EXPORT DataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -51,21 +51,21 @@ class OPENDIS7_EXPORT DataReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis7/DatumSpecification.cpp b/src/dis7/DatumSpecification.cpp index 03e96e93..3c0bc0e1 100644 --- a/src/dis7/DatumSpecification.cpp +++ b/src/dis7/DatumSpecification.cpp @@ -10,11 +10,11 @@ DatumSpecification::~DatumSpecification() { _variableDatumIDList.clear(); } -unsigned int DatumSpecification::getNumberOfFixedDatums() const { +uint32_t DatumSpecification::getNumberOfFixedDatums() const { return _fixedDatumIDList.size(); } -unsigned int DatumSpecification::getNumberOfVariableDatums() const { +uint32_t DatumSpecification::getNumberOfVariableDatums() const { return _variableDatumIDList.size(); } @@ -46,8 +46,8 @@ void DatumSpecification::setVariableDatumIDList( } void DatumSpecification::marshal(DataStream& dataStream) const { - dataStream << (unsigned int)_fixedDatumIDList.size(); - dataStream << (unsigned int)_variableDatumIDList.size(); + dataStream << (uint32_t)_fixedDatumIDList.size(); + dataStream << (uint32_t)_variableDatumIDList.size(); for (size_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { FixedDatum x = _fixedDatumIDList[idx]; @@ -101,12 +101,12 @@ int DatumSpecification::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatums marshalSize = marshalSize + 4; // _numberOfVariableDatums - for (unsigned long long idx = 0; idx < _fixedDatumIDList.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumIDList.size(); idx++) { FixedDatum listElement = _fixedDatumIDList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumIDList.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumIDList.size(); idx++) { VariableDatum listElement = _variableDatumIDList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DatumSpecification.h b/src/dis7/DatumSpecification.h index c388edd1..10f7a6ba 100644 --- a/src/dis7/DatumSpecification.h +++ b/src/dis7/DatumSpecification.h @@ -18,10 +18,10 @@ namespace DIS { class OPENDIS7_EXPORT DatumSpecification { protected: /** Number of fixed datums */ - unsigned int _numberOfFixedDatums; + uint32_t _numberOfFixedDatums; /** Number of variable datums */ - unsigned int _numberOfVariableDatums; + uint32_t _numberOfVariableDatums; /** variable length list fixed datums */ std::vector _fixedDatumIDList; @@ -36,9 +36,9 @@ class OPENDIS7_EXPORT DatumSpecification { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfFixedDatums() const; + uint32_t getNumberOfFixedDatums() const; - unsigned int getNumberOfVariableDatums() const; + uint32_t getNumberOfVariableDatums() const; std::vector& getFixedDatumIDList(); const std::vector& getFixedDatumIDList() const; diff --git a/src/dis7/DeadReckoningParameters.cpp b/src/dis7/DeadReckoningParameters.cpp index 858ac8f5..a774c79d 100644 --- a/src/dis7/DeadReckoningParameters.cpp +++ b/src/dis7/DeadReckoningParameters.cpp @@ -14,21 +14,21 @@ DeadReckoningParameters::DeadReckoningParameters() DeadReckoningParameters::~DeadReckoningParameters() {} -unsigned char DeadReckoningParameters::getDeadReckoningAlgorithm() const { +uint8_t DeadReckoningParameters::getDeadReckoningAlgorithm() const { return _deadReckoningAlgorithm; } -void DeadReckoningParameters::setDeadReckoningAlgorithm(unsigned char pX) { +void DeadReckoningParameters::setDeadReckoningAlgorithm(uint8_t pX) { _deadReckoningAlgorithm = pX; } -unsigned char* DeadReckoningParameters::getParameters() { return _parameters; } +uint8_t* DeadReckoningParameters::getParameters() { return _parameters; } -const unsigned char* DeadReckoningParameters::getParameters() const { +const uint8_t* DeadReckoningParameters::getParameters() const { return _parameters; } -void DeadReckoningParameters::setParameters(const unsigned char* x) { +void DeadReckoningParameters::setParameters(const uint8_t* x) { for (int i = 0; i < 15; i++) { _parameters[i] = x[i]; } @@ -89,7 +89,7 @@ bool DeadReckoningParameters::operator==( if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 15; idx++) { + for (uint8_t idx = 0; idx < 15; idx++) { if (!(_parameters[idx] == rhs._parameters[idx])) ivarsEqual = false; } diff --git a/src/dis7/DeadReckoningParameters.h b/src/dis7/DeadReckoningParameters.h index 9b60390b..bb664c9a 100644 --- a/src/dis7/DeadReckoningParameters.h +++ b/src/dis7/DeadReckoningParameters.h @@ -15,10 +15,10 @@ namespace DIS { class OPENDIS7_EXPORT DeadReckoningParameters { protected: /** Algorithm to use in computing dead reckoning. See EBV doc. */ - unsigned char _deadReckoningAlgorithm; + uint8_t _deadReckoningAlgorithm; /** Dead reckoning parameters. Contents depends on algorithm. */ - unsigned char _parameters[15]; + uint8_t _parameters[15]; /** Linear acceleration of the entity */ Vector3Float _entityLinearAcceleration; @@ -33,12 +33,12 @@ class OPENDIS7_EXPORT DeadReckoningParameters { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + uint8_t getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(uint8_t pX); - unsigned char* getParameters(); - const unsigned char* getParameters() const; - void setParameters(const unsigned char* pX); + uint8_t* getParameters(); + const uint8_t* getParameters() const; + void setParameters(const uint8_t* pX); Vector3Float& getEntityLinearAcceleration(); const Vector3Float& getEntityLinearAcceleration() const; diff --git a/src/dis7/DesignatorPdu.cpp b/src/dis7/DesignatorPdu.cpp index 0d0d1992..69130a70 100644 --- a/src/dis7/DesignatorPdu.cpp +++ b/src/dis7/DesignatorPdu.cpp @@ -33,9 +33,9 @@ void DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { _designatingEntityID = pX; } -unsigned short DesignatorPdu::getCodeName() const { return _codeName; } +uint16_t DesignatorPdu::getCodeName() const { return _codeName; } -void DesignatorPdu::setCodeName(unsigned short pX) { _codeName = pX; } +void DesignatorPdu::setCodeName(uint16_t pX) { _codeName = pX; } EntityID& DesignatorPdu::getDesignatedEntityID() { return _designatedEntityID; } @@ -47,11 +47,11 @@ void DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { _designatedEntityID = pX; } -unsigned short DesignatorPdu::getDesignatorCode() const { +uint16_t DesignatorPdu::getDesignatorCode() const { return _designatorCode; } -void DesignatorPdu::setDesignatorCode(unsigned short pX) { +void DesignatorPdu::setDesignatorCode(uint16_t pX) { _designatorCode = pX; } @@ -99,9 +99,9 @@ void DesignatorPdu::setDeadReckoningAlgorithm(char pX) { _deadReckoningAlgorithm = pX; } -unsigned short DesignatorPdu::getPadding1() const { return _padding1; } +uint16_t DesignatorPdu::getPadding1() const { return _padding1; } -void DesignatorPdu::setPadding1(unsigned short pX) { _padding1 = pX; } +void DesignatorPdu::setPadding1(uint16_t pX) { _padding1 = pX; } char DesignatorPdu::getPadding2() const { return _padding2; } diff --git a/src/dis7/DesignatorPdu.h b/src/dis7/DesignatorPdu.h index 19f56a38..5dd0aa41 100644 --- a/src/dis7/DesignatorPdu.h +++ b/src/dis7/DesignatorPdu.h @@ -23,14 +23,14 @@ class OPENDIS7_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { /** This field shall specify a unique emitter database number assigned to * differentiate between otherwise similar or identical emitter beams within * an emitter system. */ - unsigned short _codeName; + uint16_t _codeName; /** ID of the entity being designated */ EntityID _designatedEntityID; /** This field shall identify the designator code being used by the * designating entity */ - unsigned short _designatorCode; + uint16_t _designatorCode; /** This field shall identify the designator output power in watts */ float _designatorPower; @@ -48,7 +48,7 @@ class OPENDIS7_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { char _deadReckoningAlgorithm; /** padding */ - unsigned short _padding1; + uint16_t _padding1; /** padding */ char _padding2; @@ -67,15 +67,15 @@ class OPENDIS7_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { const EntityID& getDesignatingEntityID() const; void setDesignatingEntityID(const EntityID& pX); - unsigned short getCodeName() const; - void setCodeName(unsigned short pX); + uint16_t getCodeName() const; + void setCodeName(uint16_t pX); EntityID& getDesignatedEntityID(); const EntityID& getDesignatedEntityID() const; void setDesignatedEntityID(const EntityID& pX); - unsigned short getDesignatorCode() const; - void setDesignatorCode(unsigned short pX); + uint16_t getDesignatorCode() const; + void setDesignatorCode(uint16_t pX); float getDesignatorPower() const; void setDesignatorPower(float pX); @@ -94,8 +94,8 @@ class OPENDIS7_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { char getDeadReckoningAlgorithm() const; void setDeadReckoningAlgorithm(char pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + uint16_t getPadding1() const; + void setPadding1(uint16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis7/DetonationPdu.cpp b/src/dis7/DetonationPdu.cpp index 0954cc42..4be2b818 100644 --- a/src/dis7/DetonationPdu.cpp +++ b/src/dis7/DetonationPdu.cpp @@ -74,21 +74,21 @@ void DetonationPdu::setLocationOfEntityCoordinates(const Vector3Float& pX) { _locationOfEntityCoordinates = pX; } -unsigned char DetonationPdu::getDetonationResult() const { +uint8_t DetonationPdu::getDetonationResult() const { return _detonationResult; } -void DetonationPdu::setDetonationResult(unsigned char pX) { +void DetonationPdu::setDetonationResult(uint8_t pX) { _detonationResult = pX; } -unsigned char DetonationPdu::getNumberOfVariableParameters() const { +uint8_t DetonationPdu::getNumberOfVariableParameters() const { return _variableParameters.size(); } -unsigned short DetonationPdu::getPad() const { return _pad; } +uint16_t DetonationPdu::getPad() const { return _pad; } -void DetonationPdu::setPad(unsigned short pX) { _pad = pX; } +void DetonationPdu::setPad(uint16_t pX) { _pad = pX; } std::vector& DetonationPdu::getVariableParameters() { return _variableParameters; @@ -114,7 +114,7 @@ void DetonationPdu::marshal(DataStream& dataStream) const { _descriptor.marshal(dataStream); _locationOfEntityCoordinates.marshal(dataStream); dataStream << _detonationResult; - dataStream << (unsigned char)_variableParameters.size(); + dataStream << (uint8_t)_variableParameters.size(); dataStream << _pad; for (size_t idx = 0; idx < _variableParameters.size(); idx++) { @@ -187,7 +187,7 @@ int DetonationPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfVariableParameters marshalSize = marshalSize + 2; // _pad - for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + for (uint64_t idx = 0; idx < _variableParameters.size(); idx++) { VariableParameter listElement = _variableParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DetonationPdu.h b/src/dis7/DetonationPdu.h index 70b32bb2..6bda223a 100644 --- a/src/dis7/DetonationPdu.h +++ b/src/dis7/DetonationPdu.h @@ -45,13 +45,13 @@ class OPENDIS7_EXPORT DetonationPdu : public WarfareFamilyPdu { Vector3Float _locationOfEntityCoordinates; /** result of the detonation, Section 7.3.3 */ - unsigned char _detonationResult; + uint8_t _detonationResult; /** How many articulation parameters we have, Section 7.3.3 */ - unsigned char _numberOfVariableParameters; + uint8_t _numberOfVariableParameters; /** padding */ - unsigned short _pad; + uint16_t _pad; /** specify the parameter values for each Variable Parameter record, * Section 7.3.3 */ @@ -88,13 +88,13 @@ class OPENDIS7_EXPORT DetonationPdu : public WarfareFamilyPdu { const Vector3Float& getLocationOfEntityCoordinates() const; void setLocationOfEntityCoordinates(const Vector3Float& pX); - unsigned char getDetonationResult() const; - void setDetonationResult(unsigned char pX); + uint8_t getDetonationResult() const; + void setDetonationResult(uint8_t pX); - unsigned char getNumberOfVariableParameters() const; + uint8_t getNumberOfVariableParameters() const; - unsigned short getPad() const; - void setPad(unsigned short pX); + uint16_t getPad() const; + void setPad(uint16_t pX); std::vector& getVariableParameters(); const std::vector& getVariableParameters() const; diff --git a/src/dis7/DirectedEnergyAreaAimpoint.cpp b/src/dis7/DirectedEnergyAreaAimpoint.cpp index 4568fce8..c200eea0 100644 --- a/src/dis7/DirectedEnergyAreaAimpoint.cpp +++ b/src/dis7/DirectedEnergyAreaAimpoint.cpp @@ -14,36 +14,36 @@ DirectedEnergyAreaAimpoint::~DirectedEnergyAreaAimpoint() { _directedEnergyTargetEnergyDepositionRecordList.clear(); } -unsigned int DirectedEnergyAreaAimpoint::getRecordType() const { +uint32_t DirectedEnergyAreaAimpoint::getRecordType() const { return _recordType; } -void DirectedEnergyAreaAimpoint::setRecordType(unsigned int pX) { +void DirectedEnergyAreaAimpoint::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short DirectedEnergyAreaAimpoint::getRecordLength() const { +uint16_t DirectedEnergyAreaAimpoint::getRecordLength() const { return _recordLength; } -void DirectedEnergyAreaAimpoint::setRecordLength(unsigned short pX) { +void DirectedEnergyAreaAimpoint::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned short DirectedEnergyAreaAimpoint::getPadding() const { +uint16_t DirectedEnergyAreaAimpoint::getPadding() const { return _padding; } -void DirectedEnergyAreaAimpoint::setPadding(unsigned short pX) { +void DirectedEnergyAreaAimpoint::setPadding(uint16_t pX) { _padding = pX; } -unsigned short DirectedEnergyAreaAimpoint::getBeamAntennaPatternRecordCount() +uint16_t DirectedEnergyAreaAimpoint::getBeamAntennaPatternRecordCount() const { return _beamAntennaParameterList.size(); } -unsigned short +uint16_t DirectedEnergyAreaAimpoint::getDirectedEnergyTargetEnergyDepositionRecordCount() const { return _directedEnergyTargetEnergyDepositionRecordList.size(); @@ -85,8 +85,8 @@ void DirectedEnergyAreaAimpoint::marshal(DataStream& dataStream) const { dataStream << _recordType; dataStream << _recordLength; dataStream << _padding; - dataStream << (unsigned short)_beamAntennaParameterList.size(); - dataStream << (unsigned short) + dataStream << (uint16_t)_beamAntennaParameterList.size(); + dataStream << (uint16_t) _directedEnergyTargetEnergyDepositionRecordList.size(); for (size_t idx = 0; idx < _beamAntennaParameterList.size(); idx++) { @@ -158,13 +158,13 @@ int DirectedEnergyAreaAimpoint::getMarshalledSize() const { marshalSize = marshalSize + 2; // _directedEnergyTargetEnergyDepositionRecordCount - for (unsigned long long idx = 0; idx < _beamAntennaParameterList.size(); + for (uint64_t idx = 0; idx < _beamAntennaParameterList.size(); idx++) { BeamAntennaPattern listElement = _beamAntennaParameterList[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; + for (uint64_t idx = 0; idx < _directedEnergyTargetEnergyDepositionRecordList.size(); idx++) { DirectedEnergyTargetEnergyDeposition listElement = _directedEnergyTargetEnergyDepositionRecordList[idx]; diff --git a/src/dis7/DirectedEnergyAreaAimpoint.h b/src/dis7/DirectedEnergyAreaAimpoint.h index 17d0a90c..d4603d00 100644 --- a/src/dis7/DirectedEnergyAreaAimpoint.h +++ b/src/dis7/DirectedEnergyAreaAimpoint.h @@ -18,19 +18,19 @@ namespace DIS { class OPENDIS7_EXPORT DirectedEnergyAreaAimpoint { protected: /** Type of Record */ - unsigned int _recordType; + uint32_t _recordType; /** Length of Record */ - unsigned short _recordLength; + uint16_t _recordLength; /** Padding */ - unsigned short _padding; + uint16_t _padding; /** Number of beam antenna pattern records */ - unsigned short _beamAntennaPatternRecordCount; + uint16_t _beamAntennaPatternRecordCount; /** Number of DE target energy depositon records */ - unsigned short _directedEnergyTargetEnergyDepositionRecordCount; + uint16_t _directedEnergyTargetEnergyDepositionRecordCount; /** list of beam antenna records. See 6.2.9.2 */ std::vector _beamAntennaParameterList; @@ -46,18 +46,18 @@ class OPENDIS7_EXPORT DirectedEnergyAreaAimpoint { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); - unsigned short getBeamAntennaPatternRecordCount() const; + uint16_t getBeamAntennaPatternRecordCount() const; - unsigned short getDirectedEnergyTargetEnergyDepositionRecordCount() const; + uint16_t getDirectedEnergyTargetEnergyDepositionRecordCount() const; std::vector& getBeamAntennaParameterList(); const std::vector& getBeamAntennaParameterList() const; diff --git a/src/dis7/DirectedEnergyDamage.cpp b/src/dis7/DirectedEnergyDamage.cpp index 5a144735..f4e176d0 100644 --- a/src/dis7/DirectedEnergyDamage.cpp +++ b/src/dis7/DirectedEnergyDamage.cpp @@ -18,21 +18,21 @@ DirectedEnergyDamage::DirectedEnergyDamage() DirectedEnergyDamage::~DirectedEnergyDamage() {} -unsigned int DirectedEnergyDamage::getRecordType() const { return _recordType; } +uint32_t DirectedEnergyDamage::getRecordType() const { return _recordType; } -void DirectedEnergyDamage::setRecordType(unsigned int pX) { _recordType = pX; } +void DirectedEnergyDamage::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short DirectedEnergyDamage::getRecordLength() const { +uint16_t DirectedEnergyDamage::getRecordLength() const { return _recordLength; } -void DirectedEnergyDamage::setRecordLength(unsigned short pX) { +void DirectedEnergyDamage::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned short DirectedEnergyDamage::getPadding() const { return _padding; } +uint16_t DirectedEnergyDamage::getPadding() const { return _padding; } -void DirectedEnergyDamage::setPadding(unsigned short pX) { _padding = pX; } +void DirectedEnergyDamage::setPadding(uint16_t pX) { _padding = pX; } Vector3Float& DirectedEnergyDamage::getDamageLocation() { return _damageLocation; @@ -56,35 +56,35 @@ float DirectedEnergyDamage::getTemperature() const { return _temperature; } void DirectedEnergyDamage::setTemperature(float pX) { _temperature = pX; } -unsigned char DirectedEnergyDamage::getComponentIdentification() const { +uint8_t DirectedEnergyDamage::getComponentIdentification() const { return _componentIdentification; } -void DirectedEnergyDamage::setComponentIdentification(unsigned char pX) { +void DirectedEnergyDamage::setComponentIdentification(uint8_t pX) { _componentIdentification = pX; } -unsigned char DirectedEnergyDamage::getComponentDamageStatus() const { +uint8_t DirectedEnergyDamage::getComponentDamageStatus() const { return _componentDamageStatus; } -void DirectedEnergyDamage::setComponentDamageStatus(unsigned char pX) { +void DirectedEnergyDamage::setComponentDamageStatus(uint8_t pX) { _componentDamageStatus = pX; } -unsigned char DirectedEnergyDamage::getComponentVisualDamageStatus() const { +uint8_t DirectedEnergyDamage::getComponentVisualDamageStatus() const { return _componentVisualDamageStatus; } -void DirectedEnergyDamage::setComponentVisualDamageStatus(unsigned char pX) { +void DirectedEnergyDamage::setComponentVisualDamageStatus(uint8_t pX) { _componentVisualDamageStatus = pX; } -unsigned char DirectedEnergyDamage::getComponentVisualSmokeColor() const { +uint8_t DirectedEnergyDamage::getComponentVisualSmokeColor() const { return _componentVisualSmokeColor; } -void DirectedEnergyDamage::setComponentVisualSmokeColor(unsigned char pX) { +void DirectedEnergyDamage::setComponentVisualSmokeColor(uint8_t pX) { _componentVisualSmokeColor = pX; } @@ -98,9 +98,9 @@ void DirectedEnergyDamage::setFireEventID(const EventIdentifier& pX) { _fireEventID = pX; } -unsigned short DirectedEnergyDamage::getPadding2() const { return _padding2; } +uint16_t DirectedEnergyDamage::getPadding2() const { return _padding2; } -void DirectedEnergyDamage::setPadding2(unsigned short pX) { _padding2 = pX; } +void DirectedEnergyDamage::setPadding2(uint16_t pX) { _padding2 = pX; } void DirectedEnergyDamage::marshal(DataStream& dataStream) const { dataStream << _recordType; diff --git a/src/dis7/DirectedEnergyDamage.h b/src/dis7/DirectedEnergyDamage.h index c5d21dda..fe031efe 100644 --- a/src/dis7/DirectedEnergyDamage.h +++ b/src/dis7/DirectedEnergyDamage.h @@ -18,13 +18,13 @@ namespace DIS { class OPENDIS7_EXPORT DirectedEnergyDamage { protected: /** DE Record Type. */ - unsigned int _recordType; + uint32_t _recordType; /** DE Record Length (bytes). */ - unsigned short _recordLength; + uint16_t _recordLength; /** padding. */ - unsigned short _padding; + uint16_t _padding; /** location of damage, relative to center of entity */ Vector3Float _damageLocation; @@ -37,23 +37,23 @@ class OPENDIS7_EXPORT DirectedEnergyDamage { float _temperature; /** enumeration */ - unsigned char _componentIdentification; + uint8_t _componentIdentification; /** enumeration */ - unsigned char _componentDamageStatus; + uint8_t _componentDamageStatus; /** enumeration */ - unsigned char _componentVisualDamageStatus; + uint8_t _componentVisualDamageStatus; /** enumeration */ - unsigned char _componentVisualSmokeColor; + uint8_t _componentVisualSmokeColor; /** For any component damage resulting this field shall be set to the fire * event ID from that PDU. */ EventIdentifier _fireEventID; /** padding */ - unsigned short _padding2; + uint16_t _padding2; public: DirectedEnergyDamage(); @@ -62,14 +62,14 @@ class OPENDIS7_EXPORT DirectedEnergyDamage { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); Vector3Float& getDamageLocation(); const Vector3Float& getDamageLocation() const; @@ -81,24 +81,24 @@ class OPENDIS7_EXPORT DirectedEnergyDamage { float getTemperature() const; void setTemperature(float pX); - unsigned char getComponentIdentification() const; - void setComponentIdentification(unsigned char pX); + uint8_t getComponentIdentification() const; + void setComponentIdentification(uint8_t pX); - unsigned char getComponentDamageStatus() const; - void setComponentDamageStatus(unsigned char pX); + uint8_t getComponentDamageStatus() const; + void setComponentDamageStatus(uint8_t pX); - unsigned char getComponentVisualDamageStatus() const; - void setComponentVisualDamageStatus(unsigned char pX); + uint8_t getComponentVisualDamageStatus() const; + void setComponentVisualDamageStatus(uint8_t pX); - unsigned char getComponentVisualSmokeColor() const; - void setComponentVisualSmokeColor(unsigned char pX); + uint8_t getComponentVisualSmokeColor() const; + void setComponentVisualSmokeColor(uint8_t pX); EventIdentifier& getFireEventID(); const EventIdentifier& getFireEventID() const; void setFireEventID(const EventIdentifier& pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + uint16_t getPadding2() const; + void setPadding2(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/DirectedEnergyFirePdu.cpp b/src/dis7/DirectedEnergyFirePdu.cpp index d5ac9152..3fa0892a 100644 --- a/src/dis7/DirectedEnergyFirePdu.cpp +++ b/src/dis7/DirectedEnergyFirePdu.cpp @@ -104,19 +104,19 @@ char DirectedEnergyFirePdu::getPulseShape() const { return _pulseShape; } void DirectedEnergyFirePdu::setPulseShape(char pX) { _pulseShape = pX; } -unsigned char DirectedEnergyFirePdu::getPadding1() const { return _padding1; } +uint8_t DirectedEnergyFirePdu::getPadding1() const { return _padding1; } -void DirectedEnergyFirePdu::setPadding1(unsigned char pX) { _padding1 = pX; } +void DirectedEnergyFirePdu::setPadding1(uint8_t pX) { _padding1 = pX; } -unsigned int DirectedEnergyFirePdu::getPadding2() const { return _padding2; } +uint32_t DirectedEnergyFirePdu::getPadding2() const { return _padding2; } -void DirectedEnergyFirePdu::setPadding2(unsigned int pX) { _padding2 = pX; } +void DirectedEnergyFirePdu::setPadding2(uint32_t pX) { _padding2 = pX; } -unsigned short DirectedEnergyFirePdu::getPadding3() const { return _padding3; } +uint16_t DirectedEnergyFirePdu::getPadding3() const { return _padding3; } -void DirectedEnergyFirePdu::setPadding3(unsigned short pX) { _padding3 = pX; } +void DirectedEnergyFirePdu::setPadding3(uint16_t pX) { _padding3 = pX; } -unsigned short DirectedEnergyFirePdu::getNumberOfDERecords() const { +uint16_t DirectedEnergyFirePdu::getNumberOfDERecords() const { return _dERecords.size(); } @@ -152,7 +152,7 @@ void DirectedEnergyFirePdu::marshal(DataStream& dataStream) const { dataStream << _padding1; dataStream << _padding2; dataStream << _padding3; - dataStream << (unsigned short)_dERecords.size(); + dataStream << (uint16_t)_dERecords.size(); for (size_t idx = 0; idx < _dERecords.size(); idx++) { StandardVariableSpecification x = _dERecords[idx]; @@ -240,7 +240,7 @@ int DirectedEnergyFirePdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _padding3 marshalSize = marshalSize + 2; // _numberOfDERecords - for (unsigned long long idx = 0; idx < _dERecords.size(); idx++) { + for (uint64_t idx = 0; idx < _dERecords.size(); idx++) { StandardVariableSpecification listElement = _dERecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/DirectedEnergyFirePdu.h b/src/dis7/DirectedEnergyFirePdu.h index fb75bb65..95682e7a 100644 --- a/src/dis7/DirectedEnergyFirePdu.h +++ b/src/dis7/DirectedEnergyFirePdu.h @@ -66,16 +66,16 @@ class OPENDIS7_EXPORT DirectedEnergyFirePdu : public WarfareFamilyPdu { char _pulseShape; /** padding, Section 7.3.4 */ - unsigned char _padding1; + uint8_t _padding1; /** padding, Section 7.3.4 */ - unsigned int _padding2; + uint32_t _padding2; /** padding, Section 7.3.4 */ - unsigned short _padding3; + uint16_t _padding3; /** Field shall specify the number of DE records, Section 7.3.4 */ - unsigned short _numberOfDERecords; + uint16_t _numberOfDERecords; /** Fields shall contain one or more DE records, records shall conform to the * variable record format (Section6.2.82), Section 7.3.4 */ @@ -124,16 +124,16 @@ class OPENDIS7_EXPORT DirectedEnergyFirePdu : public WarfareFamilyPdu { char getPulseShape() const; void setPulseShape(char pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + uint8_t getPadding1() const; + void setPadding1(uint8_t pX); - unsigned int getPadding2() const; - void setPadding2(unsigned int pX); + uint32_t getPadding2() const; + void setPadding2(uint32_t pX); - unsigned short getPadding3() const; - void setPadding3(unsigned short pX); + uint16_t getPadding3() const; + void setPadding3(uint16_t pX); - unsigned short getNumberOfDERecords() const; + uint16_t getNumberOfDERecords() const; std::vector& getDERecords(); const std::vector& getDERecords() const; diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.cpp b/src/dis7/DirectedEnergyPrecisionAimpoint.cpp index d7ecc2a9..d2f9636c 100644 --- a/src/dis7/DirectedEnergyPrecisionAimpoint.cpp +++ b/src/dis7/DirectedEnergyPrecisionAimpoint.cpp @@ -19,27 +19,27 @@ DirectedEnergyPrecisionAimpoint::DirectedEnergyPrecisionAimpoint() DirectedEnergyPrecisionAimpoint::~DirectedEnergyPrecisionAimpoint() {} -unsigned int DirectedEnergyPrecisionAimpoint::getRecordType() const { +uint32_t DirectedEnergyPrecisionAimpoint::getRecordType() const { return _recordType; } -void DirectedEnergyPrecisionAimpoint::setRecordType(unsigned int pX) { +void DirectedEnergyPrecisionAimpoint::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short DirectedEnergyPrecisionAimpoint::getRecordLength() const { +uint16_t DirectedEnergyPrecisionAimpoint::getRecordLength() const { return _recordLength; } -void DirectedEnergyPrecisionAimpoint::setRecordLength(unsigned short pX) { +void DirectedEnergyPrecisionAimpoint::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned short DirectedEnergyPrecisionAimpoint::getPadding() const { +uint16_t DirectedEnergyPrecisionAimpoint::getPadding() const { return _padding; } -void DirectedEnergyPrecisionAimpoint::setPadding(unsigned short pX) { +void DirectedEnergyPrecisionAimpoint::setPadding(uint16_t pX) { _padding = pX; } @@ -111,19 +111,19 @@ void DirectedEnergyPrecisionAimpoint::setTargetEntityID(const EntityID& pX) { _targetEntityID = pX; } -unsigned char DirectedEnergyPrecisionAimpoint::getTargetComponentID() const { +uint8_t DirectedEnergyPrecisionAimpoint::getTargetComponentID() const { return _targetComponentID; } -void DirectedEnergyPrecisionAimpoint::setTargetComponentID(unsigned char pX) { +void DirectedEnergyPrecisionAimpoint::setTargetComponentID(uint8_t pX) { _targetComponentID = pX; } -unsigned char DirectedEnergyPrecisionAimpoint::getSpotShape() const { +uint8_t DirectedEnergyPrecisionAimpoint::getSpotShape() const { return _SpotShape; } -void DirectedEnergyPrecisionAimpoint::setSpotShape(unsigned char pX) { +void DirectedEnergyPrecisionAimpoint::setSpotShape(uint8_t pX) { _SpotShape = pX; } diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.h b/src/dis7/DirectedEnergyPrecisionAimpoint.h index 1e34f96c..e4b2105c 100644 --- a/src/dis7/DirectedEnergyPrecisionAimpoint.h +++ b/src/dis7/DirectedEnergyPrecisionAimpoint.h @@ -17,13 +17,13 @@ namespace DIS { class OPENDIS7_EXPORT DirectedEnergyPrecisionAimpoint { protected: /** Type of Record */ - unsigned int _recordType; + uint32_t _recordType; /** Length of Record */ - unsigned short _recordLength; + uint16_t _recordLength; /** Padding */ - unsigned short _padding; + uint16_t _padding; /** Position of Target Spot in World Coordinates. */ Vector3Double _targetSpotLocation; @@ -41,10 +41,10 @@ class OPENDIS7_EXPORT DirectedEnergyPrecisionAimpoint { EntityID _targetEntityID; /** Target Component ID ENUM, same as in DamageDescriptionRecord. */ - unsigned char _targetComponentID; + uint8_t _targetComponentID; /** Spot Shape ENUM. */ - unsigned char _SpotShape; + uint8_t _SpotShape; /** Beam Spot Cross Section Semi-Major Axis. */ float _BeamSpotXSecSemiMajorAxis; @@ -62,14 +62,14 @@ class OPENDIS7_EXPORT DirectedEnergyPrecisionAimpoint { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); Vector3Double& getTargetSpotLocation(); const Vector3Double& getTargetSpotLocation() const; @@ -91,11 +91,11 @@ class OPENDIS7_EXPORT DirectedEnergyPrecisionAimpoint { const EntityID& getTargetEntityID() const; void setTargetEntityID(const EntityID& pX); - unsigned char getTargetComponentID() const; - void setTargetComponentID(unsigned char pX); + uint8_t getTargetComponentID() const; + void setTargetComponentID(uint8_t pX); - unsigned char getSpotShape() const; - void setSpotShape(unsigned char pX); + uint8_t getSpotShape() const; + void setSpotShape(uint8_t pX); float getBeamSpotXSecSemiMajorAxis() const; void setBeamSpotXSecSemiMajorAxis(float pX); diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp b/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp index e525e95f..4cc6485b 100644 --- a/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp +++ b/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp @@ -21,11 +21,11 @@ void DirectedEnergyTargetEnergyDeposition::setTargetEntityID( _targetEntityID = pX; } -unsigned short DirectedEnergyTargetEnergyDeposition::getPadding() const { +uint16_t DirectedEnergyTargetEnergyDeposition::getPadding() const { return _padding; } -void DirectedEnergyTargetEnergyDeposition::setPadding(unsigned short pX) { +void DirectedEnergyTargetEnergyDeposition::setPadding(uint16_t pX) { _padding = pX; } diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.h b/src/dis7/DirectedEnergyTargetEnergyDeposition.h index 8aabbe81..7452bd78 100644 --- a/src/dis7/DirectedEnergyTargetEnergyDeposition.h +++ b/src/dis7/DirectedEnergyTargetEnergyDeposition.h @@ -18,7 +18,7 @@ class OPENDIS7_EXPORT DirectedEnergyTargetEnergyDeposition { EntityID _targetEntityID; /** padding */ - unsigned short _padding; + uint16_t _padding; /** Peak irrandiance */ float _peakIrradiance; @@ -34,8 +34,8 @@ class OPENDIS7_EXPORT DirectedEnergyTargetEnergyDeposition { const EntityID& getTargetEntityID() const; void setTargetEntityID(const EntityID& pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); float getPeakIrradiance() const; void setPeakIrradiance(float pX); diff --git a/src/dis7/EightByteChunk.cpp b/src/dis7/EightByteChunk.cpp index a0496fc5..0e5d3e23 100644 --- a/src/dis7/EightByteChunk.cpp +++ b/src/dis7/EightByteChunk.cpp @@ -39,7 +39,7 @@ void EightByteChunk::unmarshal(DataStream& dataStream) { bool EightByteChunk::operator==(const EightByteChunk& rhs) const { bool ivarsEqual = true; - for (unsigned char idx = 0; idx < 8; idx++) { + for (uint8_t idx = 0; idx < 8; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis7/ElectromagneticEmissionBeamData.cpp b/src/dis7/ElectromagneticEmissionBeamData.cpp index f3edb5ac..783e872e 100644 --- a/src/dis7/ElectromagneticEmissionBeamData.cpp +++ b/src/dis7/ElectromagneticEmissionBeamData.cpp @@ -18,27 +18,27 @@ ElectromagneticEmissionBeamData::~ElectromagneticEmissionBeamData() { _trackJamTargets.clear(); } -unsigned char ElectromagneticEmissionBeamData::getBeamDataLength() const { +uint8_t ElectromagneticEmissionBeamData::getBeamDataLength() const { return _beamDataLength; } -void ElectromagneticEmissionBeamData::setBeamDataLength(unsigned char pX) { +void ElectromagneticEmissionBeamData::setBeamDataLength(uint8_t pX) { _beamDataLength = pX; } -unsigned char ElectromagneticEmissionBeamData::getBeamIDNumber() const { +uint8_t ElectromagneticEmissionBeamData::getBeamIDNumber() const { return _beamIDNumber; } -void ElectromagneticEmissionBeamData::setBeamIDNumber(unsigned char pX) { +void ElectromagneticEmissionBeamData::setBeamIDNumber(uint8_t pX) { _beamIDNumber = pX; } -unsigned short ElectromagneticEmissionBeamData::getBeamParameterIndex() const { +uint16_t ElectromagneticEmissionBeamData::getBeamParameterIndex() const { return _beamParameterIndex; } -void ElectromagneticEmissionBeamData::setBeamParameterIndex(unsigned short pX) { +void ElectromagneticEmissionBeamData::setBeamParameterIndex(uint16_t pX) { _beamParameterIndex = pX; } @@ -69,32 +69,32 @@ void DIS::ElectromagneticEmissionBeamData::setBeamData(const BeamData& pX) { _beamData = pX; } -unsigned char ElectromagneticEmissionBeamData::getBeamFunction() const { +uint8_t ElectromagneticEmissionBeamData::getBeamFunction() const { return _beamFunction; } -void ElectromagneticEmissionBeamData::setBeamFunction(unsigned char pX) { +void ElectromagneticEmissionBeamData::setBeamFunction(uint8_t pX) { _beamFunction = pX; } -unsigned char ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() +uint8_t ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() const { return _trackJamTargets.size(); } -unsigned char ElectromagneticEmissionBeamData::getHighDensityTrackJam() const { +uint8_t ElectromagneticEmissionBeamData::getHighDensityTrackJam() const { return _highDensityTrackJam; } -void ElectromagneticEmissionBeamData::setHighDensityTrackJam(unsigned char pX) { +void ElectromagneticEmissionBeamData::setHighDensityTrackJam(uint8_t pX) { _highDensityTrackJam = pX; } -unsigned char ElectromagneticEmissionBeamData::getBeamStatus() const { +uint8_t ElectromagneticEmissionBeamData::getBeamStatus() const { return _beamStatus; } -void ElectromagneticEmissionBeamData::setBeamStatus(unsigned char pX) { +void ElectromagneticEmissionBeamData::setBeamStatus(uint8_t pX) { _beamStatus = pX; } @@ -134,7 +134,7 @@ void ElectromagneticEmissionBeamData::marshal(DataStream& dataStream) const { _fundamentalParameterData.marshal(dataStream); _beamData.marshal(dataStream); dataStream << _beamFunction; - dataStream << (unsigned char)_trackJamTargets.size(); + dataStream << (uint8_t)_trackJamTargets.size(); dataStream << _highDensityTrackJam; dataStream << _beamStatus; _jammingTechnique.marshal(dataStream); @@ -205,7 +205,7 @@ int ElectromagneticEmissionBeamData::getMarshalledSize() const { marshalSize = marshalSize + _jammingTechnique.getMarshalledSize(); // _jammingTechnique - for (unsigned long long idx = 0; idx < _trackJamTargets.size(); idx++) { + for (uint64_t idx = 0; idx < _trackJamTargets.size(); idx++) { TrackJamData listElement = _trackJamTargets[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ElectromagneticEmissionBeamData.h b/src/dis7/ElectromagneticEmissionBeamData.h index 9c95e929..eb816264 100644 --- a/src/dis7/ElectromagneticEmissionBeamData.h +++ b/src/dis7/ElectromagneticEmissionBeamData.h @@ -20,18 +20,18 @@ namespace DIS { class OPENDIS7_EXPORT ElectromagneticEmissionBeamData { protected: /** This field shall specify the length of this beams data in 32 bit words */ - unsigned char _beamDataLength; + uint8_t _beamDataLength; /** This field shall specify a unique emitter database number assigned to * differentiate between otherwise similar or identical emitter beams within * an emitter system. */ - unsigned char _beamIDNumber; + uint8_t _beamIDNumber; /** This field shall specify a Beam Parameter Index number that shall be used * by receiving entities in conjunction with the Emitter Name field to provide * a pointer to the stored database parameters required to regenerate the * beam. */ - unsigned short _beamParameterIndex; + uint16_t _beamParameterIndex; /** Fundamental parameter data such as frequency range, erp, pulse width, etc. */ @@ -41,16 +41,16 @@ class OPENDIS7_EXPORT ElectromagneticEmissionBeamData { BeamData _beamData; /** beam function of a particular beam */ - unsigned char _beamFunction; + uint8_t _beamFunction; /** Number of track/jam targets */ - unsigned char _numberOfTrackJamTargets; + uint8_t _numberOfTrackJamTargets; /** wheher or not the receiving simulation apps can assume all the targets in * the scan pattern are being tracked/jammed */ - unsigned char _highDensityTrackJam; + uint8_t _highDensityTrackJam; - unsigned char _beamStatus; + uint8_t _beamStatus; /** Contains Jamming Mode Sequence */ JammingTechnique _jammingTechnique; @@ -65,14 +65,14 @@ class OPENDIS7_EXPORT ElectromagneticEmissionBeamData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getBeamDataLength() const; - void setBeamDataLength(unsigned char pX); + uint8_t getBeamDataLength() const; + void setBeamDataLength(uint8_t pX); - unsigned char getBeamIDNumber() const; - void setBeamIDNumber(unsigned char pX); + uint8_t getBeamIDNumber() const; + void setBeamIDNumber(uint8_t pX); - unsigned short getBeamParameterIndex() const; - void setBeamParameterIndex(unsigned short pX); + uint16_t getBeamParameterIndex() const; + void setBeamParameterIndex(uint16_t pX); EEFundamentalParameterData& getFundamentalParameterData(); const EEFundamentalParameterData& getFundamentalParameterData() const; @@ -82,16 +82,16 @@ class OPENDIS7_EXPORT ElectromagneticEmissionBeamData { const BeamData& getBeamData() const; void setBeamData(const BeamData& pX); - unsigned char getBeamFunction() const; - void setBeamFunction(unsigned char pX); + uint8_t getBeamFunction() const; + void setBeamFunction(uint8_t pX); - unsigned char getNumberOfTrackJamTargets() const; + uint8_t getNumberOfTrackJamTargets() const; - unsigned char getHighDensityTrackJam() const; - void setHighDensityTrackJam(unsigned char pX); + uint8_t getHighDensityTrackJam() const; + void setHighDensityTrackJam(uint8_t pX); - unsigned char getBeamStatus() const; - void setBeamStatus(unsigned char pX); + uint8_t getBeamStatus() const; + void setBeamStatus(uint8_t pX); JammingTechnique& getJammingTechnique(); const JammingTechnique& getJammingTechnique() const; diff --git a/src/dis7/ElectromagneticEmissionSystemData.cpp b/src/dis7/ElectromagneticEmissionSystemData.cpp index 0750712c..07ad8c08 100644 --- a/src/dis7/ElectromagneticEmissionSystemData.cpp +++ b/src/dis7/ElectromagneticEmissionSystemData.cpp @@ -13,15 +13,15 @@ ElectromagneticEmissionSystemData::~ElectromagneticEmissionSystemData() { _beamDataRecords.clear(); } -unsigned char ElectromagneticEmissionSystemData::getSystemDataLength() const { +uint8_t ElectromagneticEmissionSystemData::getSystemDataLength() const { return _systemDataLength; } -void ElectromagneticEmissionSystemData::setSystemDataLength(unsigned char pX) { +void ElectromagneticEmissionSystemData::setSystemDataLength(uint8_t pX) { _systemDataLength = pX; } -unsigned char ElectromagneticEmissionSystemData::getNumberOfBeams() const { +uint8_t ElectromagneticEmissionSystemData::getNumberOfBeams() const { return _beamDataRecords.size(); } @@ -68,7 +68,7 @@ void DIS::ElectromagneticEmissionSystemData::setBeamDataRecords( void ElectromagneticEmissionSystemData::marshal(DataStream& dataStream) const { dataStream << _systemDataLength; - dataStream << (unsigned char)_beamDataRecords.size(); + dataStream << (uint8_t)_beamDataRecords.size(); dataStream << _emissionsPadding2; _emitterSystem.marshal(dataStream); _location.marshal(dataStream); @@ -120,7 +120,7 @@ int ElectromagneticEmissionSystemData::getMarshalledSize() const { marshalSize += _emitterSystem.getMarshalledSize(); //_emitterSystem marshalSize += _location.getMarshalledSize(); //_location - for (unsigned long long idx = 0; idx < _beamDataRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _beamDataRecords.size(); idx++) { ElectromagneticEmissionBeamData listElement = _beamDataRecords[idx]; marshalSize += listElement.getMarshalledSize(); } diff --git a/src/dis7/ElectromagneticEmissionSystemData.h b/src/dis7/ElectromagneticEmissionSystemData.h index c7b747dd..d8f910ff 100644 --- a/src/dis7/ElectromagneticEmissionSystemData.h +++ b/src/dis7/ElectromagneticEmissionSystemData.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "dis7/ElectromagneticEmissionBeamData.h" #include "dis7/EmitterSystem.h" #include "dis7/Vector3Float.h" @@ -22,14 +24,14 @@ class OPENDIS7_EXPORT ElectromagneticEmissionSystemData { protected: /** this field shall specify the length of this emitter system's data in * 32-bit words. */ - unsigned char _systemDataLength; + uint8_t _systemDataLength; /** the number of beams being described in the current PDU for the emitter * system being described. */ - unsigned char _numberOfBeams; + uint8_t _numberOfBeams; /* padding. */ - unsigned short _emissionsPadding2; + uint16_t _emissionsPadding2; /** information about a particular emitter system and shall be represented by * an Emitter System record (see 6.2.23). */ @@ -49,13 +51,13 @@ class OPENDIS7_EXPORT ElectromagneticEmissionSystemData { ElectromagneticEmissionSystemData(); virtual ~ElectromagneticEmissionSystemData(); - unsigned char getSystemDataLength() const; - void setSystemDataLength(unsigned char pX); + uint8_t getSystemDataLength() const; + void setSystemDataLength(uint8_t pX); - unsigned char getNumberOfBeams() const; + uint8_t getNumberOfBeams() const; - unsigned short getEmissionsPadding2() const; - void setEmissionsPadding2(unsigned short pX); + uint16_t getEmissionsPadding2() const; + void setEmissionsPadding2(uint16_t pX); EmitterSystem& getEmitterSystem(); const EmitterSystem& getEmitterSystem() const; diff --git a/src/dis7/ElectromagneticEmissionsPdu.cpp b/src/dis7/ElectromagneticEmissionsPdu.cpp index fd0bf921..5975dc0c 100644 --- a/src/dis7/ElectromagneticEmissionsPdu.cpp +++ b/src/dis7/ElectromagneticEmissionsPdu.cpp @@ -39,23 +39,23 @@ void ElectromagneticEmissionsPdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -unsigned char ElectromagneticEmissionsPdu::getStateUpdateIndicator() const { +uint8_t ElectromagneticEmissionsPdu::getStateUpdateIndicator() const { return _stateUpdateIndicator; } -void ElectromagneticEmissionsPdu::setStateUpdateIndicator(unsigned char pX) { +void ElectromagneticEmissionsPdu::setStateUpdateIndicator(uint8_t pX) { _stateUpdateIndicator = pX; } -unsigned char ElectromagneticEmissionsPdu::getNumberOfSystems() const { +uint8_t ElectromagneticEmissionsPdu::getNumberOfSystems() const { return _systems.size(); } -unsigned short ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const { +uint16_t ElectromagneticEmissionsPdu::getPaddingForEmissionsPdu() const { return _paddingForEmissionsPdu; } -void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(unsigned short pX) { +void ElectromagneticEmissionsPdu::setPaddingForEmissionsPdu(uint16_t pX) { _paddingForEmissionsPdu = pX; } @@ -80,7 +80,7 @@ void ElectromagneticEmissionsPdu::marshal(DataStream& dataStream) const { _emittingEntityID.marshal(dataStream); _eventID.marshal(dataStream); dataStream << _stateUpdateIndicator; - dataStream << (unsigned char)_systems.size(); + dataStream << (uint8_t)_systems.size(); dataStream << _paddingForEmissionsPdu; for (size_t idx = 0; idx < _systems.size(); idx++) { @@ -136,7 +136,7 @@ int ElectromagneticEmissionsPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfSystems marshalSize = marshalSize + 2; // _paddingForEmissionsPdu - for (unsigned long long idx = 0; idx < _systems.size(); idx++) { + for (uint64_t idx = 0; idx < _systems.size(); idx++) { ElectromagneticEmissionSystemData listElement = _systems[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ElectromagneticEmissionsPdu.h b/src/dis7/ElectromagneticEmissionsPdu.h index cd649dd3..93036468 100644 --- a/src/dis7/ElectromagneticEmissionsPdu.h +++ b/src/dis7/ElectromagneticEmissionsPdu.h @@ -33,14 +33,14 @@ class OPENDIS7_EXPORT ElectromagneticEmissionsPdu * state update or just data that has changed since issuance of the last * Electromagnetic Emission PDU [relative to the identified entity and * emission system(s)]. */ - unsigned char _stateUpdateIndicator; + uint8_t _stateUpdateIndicator; /** This field shall specify the number of emission systems being described in * the current PDU. */ - unsigned char _numberOfSystems; + uint8_t _numberOfSystems; /** padding */ - unsigned short _paddingForEmissionsPdu; + uint16_t _paddingForEmissionsPdu; std::vector _systems; @@ -59,13 +59,13 @@ class OPENDIS7_EXPORT ElectromagneticEmissionsPdu const EventIdentifier& getEventID() const; void setEventID(const EventIdentifier& pX); - unsigned char getStateUpdateIndicator() const; - void setStateUpdateIndicator(unsigned char pX); + uint8_t getStateUpdateIndicator() const; + void setStateUpdateIndicator(uint8_t pX); - unsigned char getNumberOfSystems() const; + uint8_t getNumberOfSystems() const; - unsigned short getPaddingForEmissionsPdu() const; - void setPaddingForEmissionsPdu(unsigned short pX); + uint16_t getPaddingForEmissionsPdu() const; + void setPaddingForEmissionsPdu(uint16_t pX); std::vector& getSystems(); const std::vector& getSystems() const; diff --git a/src/dis7/EmitterSystem.cpp b/src/dis7/EmitterSystem.cpp index f1350339..b925a65f 100644 --- a/src/dis7/EmitterSystem.cpp +++ b/src/dis7/EmitterSystem.cpp @@ -7,19 +7,19 @@ EmitterSystem::EmitterSystem() EmitterSystem::~EmitterSystem() {} -unsigned short EmitterSystem::getEmitterName() const { return _emitterName; } +uint16_t EmitterSystem::getEmitterName() const { return _emitterName; } -void EmitterSystem::setEmitterName(unsigned short pX) { _emitterName = pX; } +void EmitterSystem::setEmitterName(uint16_t pX) { _emitterName = pX; } -unsigned char EmitterSystem::getFunction() const { return _function; } +uint8_t EmitterSystem::getFunction() const { return _function; } -void EmitterSystem::setFunction(unsigned char pX) { _function = pX; } +void EmitterSystem::setFunction(uint8_t pX) { _function = pX; } -unsigned char EmitterSystem::getEmitterIdNumber() const { +uint8_t EmitterSystem::getEmitterIdNumber() const { return _emitterIdNumber; } -void EmitterSystem::setEmitterIdNumber(unsigned char pX) { +void EmitterSystem::setEmitterIdNumber(uint8_t pX) { _emitterIdNumber = pX; } diff --git a/src/dis7/EmitterSystem.h b/src/dis7/EmitterSystem.h index de49784a..d9cae536 100644 --- a/src/dis7/EmitterSystem.h +++ b/src/dis7/EmitterSystem.h @@ -15,13 +15,13 @@ namespace DIS { class OPENDIS7_EXPORT EmitterSystem { protected: /** Name of the emitter, 16 bit enumeration */ - unsigned short _emitterName; + uint16_t _emitterName; /** function of the emitter, 8 bit enumeration */ - unsigned char _function; + uint8_t _function; /** emitter ID, 8 bit enumeration */ - unsigned char _emitterIdNumber; + uint8_t _emitterIdNumber; public: EmitterSystem(); @@ -30,14 +30,14 @@ class OPENDIS7_EXPORT EmitterSystem { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getEmitterName() const; - void setEmitterName(unsigned short pX); + uint16_t getEmitterName() const; + void setEmitterName(uint16_t pX); - unsigned char getFunction() const; - void setFunction(unsigned char pX); + uint8_t getFunction() const; + void setFunction(uint8_t pX); - unsigned char getEmitterIdNumber() const; - void setEmitterIdNumber(unsigned char pX); + uint8_t getEmitterIdNumber() const; + void setEmitterIdNumber(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EngineFuel.cpp b/src/dis7/EngineFuel.cpp index 12d8bb53..b87e8407 100644 --- a/src/dis7/EngineFuel.cpp +++ b/src/dis7/EngineFuel.cpp @@ -11,29 +11,29 @@ EngineFuel::EngineFuel() EngineFuel::~EngineFuel() {} -unsigned int EngineFuel::getFuelQuantity() const { return _fuelQuantity; } +uint32_t EngineFuel::getFuelQuantity() const { return _fuelQuantity; } -void EngineFuel::setFuelQuantity(unsigned int pX) { _fuelQuantity = pX; } +void EngineFuel::setFuelQuantity(uint32_t pX) { _fuelQuantity = pX; } -unsigned char EngineFuel::getFuelMeasurementUnits() const { +uint8_t EngineFuel::getFuelMeasurementUnits() const { return _fuelMeasurementUnits; } -void EngineFuel::setFuelMeasurementUnits(unsigned char pX) { +void EngineFuel::setFuelMeasurementUnits(uint8_t pX) { _fuelMeasurementUnits = pX; } -unsigned char EngineFuel::getFuelType() const { return _fuelType; } +uint8_t EngineFuel::getFuelType() const { return _fuelType; } -void EngineFuel::setFuelType(unsigned char pX) { _fuelType = pX; } +void EngineFuel::setFuelType(uint8_t pX) { _fuelType = pX; } -unsigned char EngineFuel::getFuelLocation() const { return _fuelLocation; } +uint8_t EngineFuel::getFuelLocation() const { return _fuelLocation; } -void EngineFuel::setFuelLocation(unsigned char pX) { _fuelLocation = pX; } +void EngineFuel::setFuelLocation(uint8_t pX) { _fuelLocation = pX; } -unsigned char EngineFuel::getPadding() const { return _padding; } +uint8_t EngineFuel::getPadding() const { return _padding; } -void EngineFuel::setPadding(unsigned char pX) { _padding = pX; } +void EngineFuel::setPadding(uint8_t pX) { _padding = pX; } void EngineFuel::marshal(DataStream& dataStream) const { dataStream << _fuelQuantity; diff --git a/src/dis7/EngineFuel.h b/src/dis7/EngineFuel.h index abc0db06..11096534 100644 --- a/src/dis7/EngineFuel.h +++ b/src/dis7/EngineFuel.h @@ -14,19 +14,19 @@ namespace DIS { class OPENDIS7_EXPORT EngineFuel { protected: /** Fuel quantity, units specified by next field */ - unsigned int _fuelQuantity; + uint32_t _fuelQuantity; /** Units in which the fuel is measured */ - unsigned char _fuelMeasurementUnits; + uint8_t _fuelMeasurementUnits; /** Type of fuel */ - unsigned char _fuelType; + uint8_t _fuelType; /** Location of fuel as related to entity. See section 14 of EBV document */ - unsigned char _fuelLocation; + uint8_t _fuelLocation; /** padding */ - unsigned char _padding; + uint8_t _padding; public: EngineFuel(); @@ -35,20 +35,20 @@ class OPENDIS7_EXPORT EngineFuel { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getFuelQuantity() const; - void setFuelQuantity(unsigned int pX); + uint32_t getFuelQuantity() const; + void setFuelQuantity(uint32_t pX); - unsigned char getFuelMeasurementUnits() const; - void setFuelMeasurementUnits(unsigned char pX); + uint8_t getFuelMeasurementUnits() const; + void setFuelMeasurementUnits(uint8_t pX); - unsigned char getFuelType() const; - void setFuelType(unsigned char pX); + uint8_t getFuelType() const; + void setFuelType(uint8_t pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + uint8_t getFuelLocation() const; + void setFuelLocation(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EngineFuelReload.cpp b/src/dis7/EngineFuelReload.cpp index 8c807926..32d01f41 100644 --- a/src/dis7/EngineFuelReload.cpp +++ b/src/dis7/EngineFuelReload.cpp @@ -13,55 +13,55 @@ EngineFuelReload::EngineFuelReload() EngineFuelReload::~EngineFuelReload() {} -unsigned int EngineFuelReload::getStandardQuantity() const { +uint32_t EngineFuelReload::getStandardQuantity() const { return _standardQuantity; } -void EngineFuelReload::setStandardQuantity(unsigned int pX) { +void EngineFuelReload::setStandardQuantity(uint32_t pX) { _standardQuantity = pX; } -unsigned int EngineFuelReload::getMaximumQuantity() const { +uint32_t EngineFuelReload::getMaximumQuantity() const { return _maximumQuantity; } -void EngineFuelReload::setMaximumQuantity(unsigned int pX) { +void EngineFuelReload::setMaximumQuantity(uint32_t pX) { _maximumQuantity = pX; } -unsigned int EngineFuelReload::getStandardQuantityReloadTime() const { +uint32_t EngineFuelReload::getStandardQuantityReloadTime() const { return _standardQuantityReloadTime; } -void EngineFuelReload::setStandardQuantityReloadTime(unsigned int pX) { +void EngineFuelReload::setStandardQuantityReloadTime(uint32_t pX) { _standardQuantityReloadTime = pX; } -unsigned int EngineFuelReload::getMaximumQuantityReloadTime() const { +uint32_t EngineFuelReload::getMaximumQuantityReloadTime() const { return _maximumQuantityReloadTime; } -void EngineFuelReload::setMaximumQuantityReloadTime(unsigned int pX) { +void EngineFuelReload::setMaximumQuantityReloadTime(uint32_t pX) { _maximumQuantityReloadTime = pX; } -unsigned char EngineFuelReload::getFuelMeasurmentUnits() const { +uint8_t EngineFuelReload::getFuelMeasurmentUnits() const { return _fuelMeasurmentUnits; } -void EngineFuelReload::setFuelMeasurmentUnits(unsigned char pX) { +void EngineFuelReload::setFuelMeasurmentUnits(uint8_t pX) { _fuelMeasurmentUnits = pX; } -unsigned char EngineFuelReload::getFuelLocation() const { +uint8_t EngineFuelReload::getFuelLocation() const { return _fuelLocation; } -void EngineFuelReload::setFuelLocation(unsigned char pX) { _fuelLocation = pX; } +void EngineFuelReload::setFuelLocation(uint8_t pX) { _fuelLocation = pX; } -unsigned char EngineFuelReload::getPadding() const { return _padding; } +uint8_t EngineFuelReload::getPadding() const { return _padding; } -void EngineFuelReload::setPadding(unsigned char pX) { _padding = pX; } +void EngineFuelReload::setPadding(uint8_t pX) { _padding = pX; } void EngineFuelReload::marshal(DataStream& dataStream) const { dataStream << _standardQuantity; diff --git a/src/dis7/EngineFuelReload.h b/src/dis7/EngineFuelReload.h index 4cb24848..ddbb71c6 100644 --- a/src/dis7/EngineFuelReload.h +++ b/src/dis7/EngineFuelReload.h @@ -16,25 +16,25 @@ namespace DIS { class OPENDIS7_EXPORT EngineFuelReload { protected: /** standard quantity of fuel loaded */ - unsigned int _standardQuantity; + uint32_t _standardQuantity; /** maximum quantity of fuel loaded */ - unsigned int _maximumQuantity; + uint32_t _maximumQuantity; /** seconds normally required to to reload standard qty */ - unsigned int _standardQuantityReloadTime; + uint32_t _standardQuantityReloadTime; /** seconds normally required to to reload maximum qty */ - unsigned int _maximumQuantityReloadTime; + uint32_t _maximumQuantityReloadTime; /** Units of measure */ - unsigned char _fuelMeasurmentUnits; + uint8_t _fuelMeasurmentUnits; /** fuel location as related to the entity */ - unsigned char _fuelLocation; + uint8_t _fuelLocation; /** padding */ - unsigned char _padding; + uint8_t _padding; public: EngineFuelReload(); @@ -43,26 +43,26 @@ class OPENDIS7_EXPORT EngineFuelReload { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getStandardQuantity() const; - void setStandardQuantity(unsigned int pX); + uint32_t getStandardQuantity() const; + void setStandardQuantity(uint32_t pX); - unsigned int getMaximumQuantity() const; - void setMaximumQuantity(unsigned int pX); + uint32_t getMaximumQuantity() const; + void setMaximumQuantity(uint32_t pX); - unsigned int getStandardQuantityReloadTime() const; - void setStandardQuantityReloadTime(unsigned int pX); + uint32_t getStandardQuantityReloadTime() const; + void setStandardQuantityReloadTime(uint32_t pX); - unsigned int getMaximumQuantityReloadTime() const; - void setMaximumQuantityReloadTime(unsigned int pX); + uint32_t getMaximumQuantityReloadTime() const; + void setMaximumQuantityReloadTime(uint32_t pX); - unsigned char getFuelMeasurmentUnits() const; - void setFuelMeasurmentUnits(unsigned char pX); + uint8_t getFuelMeasurmentUnits() const; + void setFuelMeasurmentUnits(uint8_t pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + uint8_t getFuelLocation() const; + void setFuelLocation(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EntityAssociation.cpp b/src/dis7/EntityAssociation.cpp index c545e5ba..a534f5fe 100644 --- a/src/dis7/EntityAssociation.cpp +++ b/src/dis7/EntityAssociation.cpp @@ -15,31 +15,31 @@ EntityAssociation::EntityAssociation() EntityAssociation::~EntityAssociation() {} -unsigned char EntityAssociation::getRecordType() const { return _recordType; } +uint8_t EntityAssociation::getRecordType() const { return _recordType; } -void EntityAssociation::setRecordType(unsigned char pX) { _recordType = pX; } +void EntityAssociation::setRecordType(uint8_t pX) { _recordType = pX; } -unsigned char EntityAssociation::getChangeIndicator() const { +uint8_t EntityAssociation::getChangeIndicator() const { return _changeIndicator; } -void EntityAssociation::setChangeIndicator(unsigned char pX) { +void EntityAssociation::setChangeIndicator(uint8_t pX) { _changeIndicator = pX; } -unsigned char EntityAssociation::getAssociationStatus() const { +uint8_t EntityAssociation::getAssociationStatus() const { return _associationStatus; } -void EntityAssociation::setAssociationStatus(unsigned char pX) { +void EntityAssociation::setAssociationStatus(uint8_t pX) { _associationStatus = pX; } -unsigned char EntityAssociation::getAssociationType() const { +uint8_t EntityAssociation::getAssociationType() const { return _associationType; } -void EntityAssociation::setAssociationType(unsigned char pX) { +void EntityAssociation::setAssociationType(uint8_t pX) { _associationType = pX; } @@ -49,35 +49,35 @@ const EntityID& EntityAssociation::getEntityID() const { return _entityID; } void EntityAssociation::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned short EntityAssociation::getOwsSttionLocation() const { +uint16_t EntityAssociation::getOwsSttionLocation() const { return _owsSttionLocation; } -void EntityAssociation::setOwsSttionLocation(unsigned short pX) { +void EntityAssociation::setOwsSttionLocation(uint16_t pX) { _owsSttionLocation = pX; } -unsigned short EntityAssociation::getPhysicalConnectionType() const { +uint16_t EntityAssociation::getPhysicalConnectionType() const { return _physicalConnectionType; } -void EntityAssociation::setPhysicalConnectionType(unsigned short pX) { +void EntityAssociation::setPhysicalConnectionType(uint16_t pX) { _physicalConnectionType = pX; } -unsigned char EntityAssociation::getGroupMemberType() const { +uint8_t EntityAssociation::getGroupMemberType() const { return _groupMemberType; } -void EntityAssociation::setGroupMemberType(unsigned char pX) { +void EntityAssociation::setGroupMemberType(uint8_t pX) { _groupMemberType = pX; } -unsigned short EntityAssociation::getGroupNumber() const { +uint16_t EntityAssociation::getGroupNumber() const { return _groupNumber; } -void EntityAssociation::setGroupNumber(unsigned short pX) { _groupNumber = pX; } +void EntityAssociation::setGroupNumber(uint16_t pX) { _groupNumber = pX; } void EntityAssociation::marshal(DataStream& dataStream) const { dataStream << _recordType; diff --git a/src/dis7/EntityAssociation.h b/src/dis7/EntityAssociation.h index aa82f550..88d71258 100644 --- a/src/dis7/EntityAssociation.h +++ b/src/dis7/EntityAssociation.h @@ -16,31 +16,31 @@ class OPENDIS7_EXPORT EntityAssociation { protected: /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; + uint8_t _recordType; /** Indicates if this VP has changed since last issuance */ - unsigned char _changeIndicator; + uint8_t _changeIndicator; /** Indicates association status between two entities; 8 bit enum */ - unsigned char _associationStatus; + uint8_t _associationStatus; /** Type of association; 8 bit enum */ - unsigned char _associationType; + uint8_t _associationType; /** Object ID of entity associated with this entity */ EntityID _entityID; /** Station location on one's own entity. EBV doc. */ - unsigned short _owsSttionLocation; + uint16_t _owsSttionLocation; /** Type of physical connection. EBV doc */ - unsigned short _physicalConnectionType; + uint16_t _physicalConnectionType; /** Type of member the entity is within th egroup */ - unsigned char _groupMemberType; + uint8_t _groupMemberType; /** Group if any to which the entity belongs */ - unsigned short _groupNumber; + uint16_t _groupNumber; public: EntityAssociation(); @@ -49,33 +49,33 @@ class OPENDIS7_EXPORT EntityAssociation { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + uint8_t getRecordType() const; + void setRecordType(uint8_t pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + uint8_t getChangeIndicator() const; + void setChangeIndicator(uint8_t pX); - unsigned char getAssociationStatus() const; - void setAssociationStatus(unsigned char pX); + uint8_t getAssociationStatus() const; + void setAssociationStatus(uint8_t pX); - unsigned char getAssociationType() const; - void setAssociationType(unsigned char pX); + uint8_t getAssociationType() const; + void setAssociationType(uint8_t pX); EntityID& getEntityID(); const EntityID& getEntityID() const; void setEntityID(const EntityID& pX); - unsigned short getOwsSttionLocation() const; - void setOwsSttionLocation(unsigned short pX); + uint16_t getOwsSttionLocation() const; + void setOwsSttionLocation(uint16_t pX); - unsigned short getPhysicalConnectionType() const; - void setPhysicalConnectionType(unsigned short pX); + uint16_t getPhysicalConnectionType() const; + void setPhysicalConnectionType(uint16_t pX); - unsigned char getGroupMemberType() const; - void setGroupMemberType(unsigned char pX); + uint8_t getGroupMemberType() const; + void setGroupMemberType(uint8_t pX); - unsigned short getGroupNumber() const; - void setGroupNumber(unsigned short pX); + uint16_t getGroupNumber() const; + void setGroupNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EntityDamageStatusPdu.cpp b/src/dis7/EntityDamageStatusPdu.cpp index cc2cbea2..f43ea081 100644 --- a/src/dis7/EntityDamageStatusPdu.cpp +++ b/src/dis7/EntityDamageStatusPdu.cpp @@ -27,15 +27,15 @@ void EntityDamageStatusPdu::setDamagedEntityID(const EntityID& pX) { _damagedEntityID = pX; } -unsigned short EntityDamageStatusPdu::getPadding1() const { return _padding1; } +uint16_t EntityDamageStatusPdu::getPadding1() const { return _padding1; } -void EntityDamageStatusPdu::setPadding1(unsigned short pX) { _padding1 = pX; } +void EntityDamageStatusPdu::setPadding1(uint16_t pX) { _padding1 = pX; } -unsigned short EntityDamageStatusPdu::getPadding2() const { return _padding2; } +uint16_t EntityDamageStatusPdu::getPadding2() const { return _padding2; } -void EntityDamageStatusPdu::setPadding2(unsigned short pX) { _padding2 = pX; } +void EntityDamageStatusPdu::setPadding2(uint16_t pX) { _padding2 = pX; } -unsigned short EntityDamageStatusPdu::getNumberOfDamageDescription() const { +uint16_t EntityDamageStatusPdu::getNumberOfDamageDescription() const { return _damageDescriptionRecords.size(); } @@ -60,7 +60,7 @@ void EntityDamageStatusPdu::marshal(DataStream& dataStream) const { _damagedEntityID.marshal(dataStream); dataStream << _padding1; dataStream << _padding2; - dataStream << (unsigned short)_damageDescriptionRecords.size(); + dataStream << (uint16_t)_damageDescriptionRecords.size(); for (size_t idx = 0; idx < _damageDescriptionRecords.size(); idx++) { DirectedEnergyDamage x = _damageDescriptionRecords[idx]; @@ -111,7 +111,7 @@ int EntityDamageStatusPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _padding2 marshalSize = marshalSize + 2; // _numberOfDamageDescription - for (unsigned long long idx = 0; idx < _damageDescriptionRecords.size(); + for (uint64_t idx = 0; idx < _damageDescriptionRecords.size(); idx++) { DirectedEnergyDamage listElement = _damageDescriptionRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis7/EntityDamageStatusPdu.h b/src/dis7/EntityDamageStatusPdu.h index 8379bd63..97b442a3 100644 --- a/src/dis7/EntityDamageStatusPdu.h +++ b/src/dis7/EntityDamageStatusPdu.h @@ -24,14 +24,14 @@ class OPENDIS7_EXPORT EntityDamageStatusPdu : public WarfareFamilyPdu { EntityID _damagedEntityID; /** Padding. */ - unsigned short _padding1; + uint16_t _padding1; /** Padding. */ - unsigned short _padding2; + uint16_t _padding2; /** field shall specify the number of Damage Description records, * Section 7.3.5 */ - unsigned short _numberOfDamageDescription; + uint16_t _numberOfDamageDescription; /** Fields shall contain one or more Damage Description records (see 6.2.17) * and may contain other Standard Variable records, Section 7.3.5 */ @@ -48,13 +48,13 @@ class OPENDIS7_EXPORT EntityDamageStatusPdu : public WarfareFamilyPdu { const EntityID& getDamagedEntityID() const; void setDamagedEntityID(const EntityID& pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + uint16_t getPadding1() const; + void setPadding1(uint16_t pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + uint16_t getPadding2() const; + void setPadding2(uint16_t pX); - unsigned short getNumberOfDamageDescription() const; + uint16_t getNumberOfDamageDescription() const; std::vector& getDamageDescriptionRecords(); const std::vector& getDamageDescriptionRecords() const; diff --git a/src/dis7/EntityID.cpp b/src/dis7/EntityID.cpp index 6bdea8de..ce75803a 100644 --- a/src/dis7/EntityID.cpp +++ b/src/dis7/EntityID.cpp @@ -18,9 +18,9 @@ void EntityID::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short EntityID::getEntityNumber() const { return _entityNumber; } +uint16_t EntityID::getEntityNumber() const { return _entityNumber; } -void EntityID::setEntityNumber(unsigned short pX) { _entityNumber = pX; } +void EntityID::setEntityNumber(uint16_t pX) { _entityNumber = pX; } void EntityID::marshal(DataStream& dataStream) const { _simulationAddress.marshal(dataStream); diff --git a/src/dis7/EntityID.h b/src/dis7/EntityID.h index ad0509ae..04155a1d 100644 --- a/src/dis7/EntityID.h +++ b/src/dis7/EntityID.h @@ -19,7 +19,7 @@ class OPENDIS7_EXPORT EntityID { SimulationAddress _simulationAddress; /** Entity number */ - unsigned short _entityNumber; + uint16_t _entityNumber; public: EntityID(); @@ -32,8 +32,8 @@ class OPENDIS7_EXPORT EntityID { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getEntityNumber() const; - void setEntityNumber(unsigned short pX); + uint16_t getEntityNumber() const; + void setEntityNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EntityMarking.cpp b/src/dis7/EntityMarking.cpp index 4d4dddd3..6579d62d 100644 --- a/src/dis7/EntityMarking.cpp +++ b/src/dis7/EntityMarking.cpp @@ -13,9 +13,9 @@ EntityMarking::EntityMarking() : _characterSet(0) { EntityMarking::~EntityMarking() {} -unsigned char EntityMarking::getCharacterSet() const { return _characterSet; } +uint8_t EntityMarking::getCharacterSet() const { return _characterSet; } -void EntityMarking::setCharacterSet(unsigned char pX) { _characterSet = pX; } +void EntityMarking::setCharacterSet(uint8_t pX) { _characterSet = pX; } char* EntityMarking::getCharacters() { return _characters; } @@ -55,7 +55,7 @@ bool EntityMarking::operator==(const EntityMarking& rhs) const { if (!(_characterSet == rhs._characterSet)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 11; idx++) { + for (uint8_t idx = 0; idx < 11; idx++) { if (!(_characters[idx] == rhs._characters[idx])) ivarsEqual = false; } diff --git a/src/dis7/EntityMarking.h b/src/dis7/EntityMarking.h index 3374792d..50dde113 100644 --- a/src/dis7/EntityMarking.h +++ b/src/dis7/EntityMarking.h @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS7_EXPORT EntityMarking { protected: /** The character set */ - unsigned char _characterSet; + uint8_t _characterSet; /** The characters */ char _characters[11]; @@ -27,8 +27,8 @@ class OPENDIS7_EXPORT EntityMarking { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getCharacterSet() const; - void setCharacterSet(unsigned char pX); + uint8_t getCharacterSet() const; + void setCharacterSet(uint8_t pX); char* getCharacters(); const char* getCharacters() const; diff --git a/src/dis7/EntityStatePdu.cpp b/src/dis7/EntityStatePdu.cpp index 48aacb96..155c17d4 100644 --- a/src/dis7/EntityStatePdu.cpp +++ b/src/dis7/EntityStatePdu.cpp @@ -27,11 +27,11 @@ const EntityID& EntityStatePdu::getEntityID() const { return _entityID; } void EntityStatePdu::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned char EntityStatePdu::getForceId() const { return _forceId; } +uint8_t EntityStatePdu::getForceId() const { return _forceId; } -void EntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } +void EntityStatePdu::setForceId(uint8_t pX) { _forceId = pX; } -unsigned char EntityStatePdu::getNumberOfVariableParameters() const { +uint8_t EntityStatePdu::getNumberOfVariableParameters() const { return _variableParameters.size(); } @@ -87,11 +87,11 @@ void EntityStatePdu::setEntityOrientation(const EulerAngles& pX) { _entityOrientation = pX; } -unsigned int EntityStatePdu::getEntityAppearance() const { +uint32_t EntityStatePdu::getEntityAppearance() const { return _entityAppearance; } -void EntityStatePdu::setEntityAppearance(unsigned int pX) { +void EntityStatePdu::setEntityAppearance(uint32_t pX) { _entityAppearance = pX; } @@ -115,9 +115,9 @@ const EntityMarking& EntityStatePdu::getMarking() const { return _marking; } void EntityStatePdu::setMarking(const EntityMarking& pX) { _marking = pX; } -unsigned int EntityStatePdu::getCapabilities() const { return _capabilities; } +uint32_t EntityStatePdu::getCapabilities() const { return _capabilities; } -void EntityStatePdu::setCapabilities(unsigned int pX) { _capabilities = pX; } +void EntityStatePdu::setCapabilities(uint32_t pX) { _capabilities = pX; } std::vector& EntityStatePdu::getVariableParameters() { return _variableParameters; @@ -138,7 +138,7 @@ void EntityStatePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _entityID.marshal(dataStream); dataStream << _forceId; - dataStream << (unsigned char)_variableParameters.size(); + dataStream << (uint8_t)_variableParameters.size(); _entityType.marshal(dataStream); _alternativeEntityType.marshal(dataStream); _entityLinearVelocity.marshal(dataStream); @@ -231,7 +231,7 @@ int EntityStatePdu::getMarshalledSize() const { marshalSize = marshalSize + _marking.getMarshalledSize(); // _marking marshalSize = marshalSize + 4; // _capabilities - for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + for (uint64_t idx = 0; idx < _variableParameters.size(); idx++) { VariableParameter listElement = _variableParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/EntityStatePdu.h b/src/dis7/EntityStatePdu.h index ae907a82..3c76a8a4 100644 --- a/src/dis7/EntityStatePdu.h +++ b/src/dis7/EntityStatePdu.h @@ -29,11 +29,11 @@ class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { EntityID _entityID; /** What force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + uint8_t _forceId; /** How many variable parameters are in the variable length list. In earlier * versions of DIS these were known as articulation parameters */ - unsigned char _numberOfVariableParameters; + uint8_t _numberOfVariableParameters; /** Describes the type of entity in the world */ EntityType _entityType; @@ -51,7 +51,7 @@ class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { /** a series of bit flags that are used to help draw the entity, such as * smoking, on fire, etc. */ - unsigned int _entityAppearance; + uint32_t _entityAppearance; /** parameters used for dead reckoning */ DeadReckoningParameters _deadReckoningParameters; @@ -61,7 +61,7 @@ class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { EntityMarking _marking; /** a series of bit flags */ - unsigned int _capabilities; + uint32_t _capabilities; /** variable length list of variable parameters. In earlier DIS versions this * was articulation parameters. */ @@ -78,10 +78,10 @@ class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { const EntityID& getEntityID() const; void setEntityID(const EntityID& pX); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + uint8_t getForceId() const; + void setForceId(uint8_t pX); - unsigned char getNumberOfVariableParameters() const; + uint8_t getNumberOfVariableParameters() const; EntityType& getEntityType(); const EntityType& getEntityType() const; @@ -103,8 +103,8 @@ class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { const EulerAngles& getEntityOrientation() const; void setEntityOrientation(const EulerAngles& pX); - unsigned int getEntityAppearance() const; - void setEntityAppearance(unsigned int pX); + uint32_t getEntityAppearance() const; + void setEntityAppearance(uint32_t pX); DeadReckoningParameters& getDeadReckoningParameters(); const DeadReckoningParameters& getDeadReckoningParameters() const; @@ -114,8 +114,8 @@ class OPENDIS7_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { const EntityMarking& getMarking() const; void setMarking(const EntityMarking& pX); - unsigned int getCapabilities() const; - void setCapabilities(unsigned int pX); + uint32_t getCapabilities() const; + void setCapabilities(uint32_t pX); std::vector& getVariableParameters(); const std::vector& getVariableParameters() const; diff --git a/src/dis7/EntityStateUpdatePdu.cpp b/src/dis7/EntityStateUpdatePdu.cpp index 4801064e..6dfc972e 100644 --- a/src/dis7/EntityStateUpdatePdu.cpp +++ b/src/dis7/EntityStateUpdatePdu.cpp @@ -27,7 +27,7 @@ char EntityStateUpdatePdu::getPadding1() const { return _padding1; } void EntityStateUpdatePdu::setPadding1(char pX) { _padding1 = pX; } -unsigned char EntityStateUpdatePdu::getNumberOfVariableParameters() const { +uint8_t EntityStateUpdatePdu::getNumberOfVariableParameters() const { return _variableParameters.size(); } @@ -67,11 +67,11 @@ void EntityStateUpdatePdu::setEntityOrientation(const EulerAngles& pX) { _entityOrientation = pX; } -unsigned int EntityStateUpdatePdu::getEntityAppearance() const { +uint32_t EntityStateUpdatePdu::getEntityAppearance() const { return _entityAppearance; } -void EntityStateUpdatePdu::setEntityAppearance(unsigned int pX) { +void EntityStateUpdatePdu::setEntityAppearance(uint32_t pX) { _entityAppearance = pX; } @@ -94,7 +94,7 @@ void EntityStateUpdatePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _entityID.marshal(dataStream); dataStream << _padding1; - dataStream << (unsigned char)_variableParameters.size(); + dataStream << (uint8_t)_variableParameters.size(); _entityLinearVelocity.marshal(dataStream); _entityLocation.marshal(dataStream); _entityOrientation.marshal(dataStream); @@ -161,7 +161,7 @@ int EntityStateUpdatePdu::getMarshalledSize() const { _entityOrientation.getMarshalledSize(); // _entityOrientation marshalSize = marshalSize + 4; // _entityAppearance - for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + for (uint64_t idx = 0; idx < _variableParameters.size(); idx++) { VariableParameter listElement = _variableParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/EntityStateUpdatePdu.h b/src/dis7/EntityStateUpdatePdu.h index 66e383a5..ff64191e 100644 --- a/src/dis7/EntityStateUpdatePdu.h +++ b/src/dis7/EntityStateUpdatePdu.h @@ -30,8 +30,8 @@ class OPENDIS7_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { char _padding1; /** This field shall specify the number of variable parameters present. This - * field shall be represented by an 8-bit unsigned integer (see Annex I). */ - unsigned char _numberOfVariableParameters; + * field shall be represented by an 8-bit uint32_teger (see Annex I). */ + uint8_t _numberOfVariableParameters; /** This field shall specify an entity’s linear velocity. The coordinate * system for an entity’s linear velocity depends on the dead reckoning @@ -51,7 +51,7 @@ class OPENDIS7_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { /** This field shall specify the dynamic changes to the entity’s appearance * attributes. This field shall be represented by an Entity Appearance record * (see 6.2.26). */ - unsigned int _entityAppearance; + uint32_t _entityAppearance; /** This field shall specify the parameter values for each Variable Parameter * record that is included (see 6.2.93 and Annex I). */ @@ -71,7 +71,7 @@ class OPENDIS7_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { char getPadding1() const; void setPadding1(char pX); - unsigned char getNumberOfVariableParameters() const; + uint8_t getNumberOfVariableParameters() const; Vector3Float& getEntityLinearVelocity(); const Vector3Float& getEntityLinearVelocity() const; @@ -85,8 +85,8 @@ class OPENDIS7_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { const EulerAngles& getEntityOrientation() const; void setEntityOrientation(const EulerAngles& pX); - unsigned int getEntityAppearance() const; - void setEntityAppearance(unsigned int pX); + uint32_t getEntityAppearance() const; + void setEntityAppearance(uint32_t pX); std::vector& getVariableParameters(); const std::vector& getVariableParameters() const; diff --git a/src/dis7/EntityType.cpp b/src/dis7/EntityType.cpp index 47c740a8..5ed920b1 100644 --- a/src/dis7/EntityType.cpp +++ b/src/dis7/EntityType.cpp @@ -13,33 +13,33 @@ EntityType::EntityType() EntityType::~EntityType() {} -unsigned char EntityType::getEntityKind() const { return _entityKind; } +uint8_t EntityType::getEntityKind() const { return _entityKind; } -void EntityType::setEntityKind(unsigned char pX) { _entityKind = pX; } +void EntityType::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char EntityType::getDomain() const { return _domain; } +uint8_t EntityType::getDomain() const { return _domain; } -void EntityType::setDomain(unsigned char pX) { _domain = pX; } +void EntityType::setDomain(uint8_t pX) { _domain = pX; } -unsigned short EntityType::getCountry() const { return _country; } +uint16_t EntityType::getCountry() const { return _country; } -void EntityType::setCountry(unsigned short pX) { _country = pX; } +void EntityType::setCountry(uint16_t pX) { _country = pX; } -unsigned char EntityType::getCategory() const { return _category; } +uint8_t EntityType::getCategory() const { return _category; } -void EntityType::setCategory(unsigned char pX) { _category = pX; } +void EntityType::setCategory(uint8_t pX) { _category = pX; } -unsigned char EntityType::getSubcategory() const { return _subcategory; } +uint8_t EntityType::getSubcategory() const { return _subcategory; } -void EntityType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void EntityType::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char EntityType::getSpecific() const { return _specific; } +uint8_t EntityType::getSpecific() const { return _specific; } -void EntityType::setSpecific(unsigned char pX) { _specific = pX; } +void EntityType::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char EntityType::getExtra() const { return _extra; } +uint8_t EntityType::getExtra() const { return _extra; } -void EntityType::setExtra(unsigned char pX) { _extra = pX; } +void EntityType::setExtra(uint8_t pX) { _extra = pX; } void EntityType::marshal(DataStream& dataStream) const { dataStream << _entityKind; diff --git a/src/dis7/EntityType.h b/src/dis7/EntityType.h index 31ba6ce8..9b2e682a 100644 --- a/src/dis7/EntityType.h +++ b/src/dis7/EntityType.h @@ -15,25 +15,25 @@ namespace DIS { class OPENDIS7_EXPORT EntityType { protected: /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; /** specific info based on subcategory field. Renamed from specific because * that is a reserved word in SQL. */ - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; public: EntityType(); @@ -42,26 +42,26 @@ class OPENDIS7_EXPORT EntityType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EntityTypeVP.cpp b/src/dis7/EntityTypeVP.cpp index 7524c5b9..5e4d7d47 100644 --- a/src/dis7/EntityTypeVP.cpp +++ b/src/dis7/EntityTypeVP.cpp @@ -11,15 +11,15 @@ EntityTypeVP::EntityTypeVP() EntityTypeVP::~EntityTypeVP() {} -unsigned char EntityTypeVP::getRecordType() const { return _recordType; } +uint8_t EntityTypeVP::getRecordType() const { return _recordType; } -void EntityTypeVP::setRecordType(unsigned char pX) { _recordType = pX; } +void EntityTypeVP::setRecordType(uint8_t pX) { _recordType = pX; } -unsigned char EntityTypeVP::getChangeIndicator() const { +uint8_t EntityTypeVP::getChangeIndicator() const { return _changeIndicator; } -void EntityTypeVP::setChangeIndicator(unsigned char pX) { +void EntityTypeVP::setChangeIndicator(uint8_t pX) { _changeIndicator = pX; } @@ -29,13 +29,13 @@ const EntityType& EntityTypeVP::getEntityType() const { return _entityType; } void EntityTypeVP::setEntityType(const EntityType& pX) { _entityType = pX; } -unsigned short EntityTypeVP::getPadding() const { return _padding; } +uint16_t EntityTypeVP::getPadding() const { return _padding; } -void EntityTypeVP::setPadding(unsigned short pX) { _padding = pX; } +void EntityTypeVP::setPadding(uint16_t pX) { _padding = pX; } -unsigned int EntityTypeVP::getPadding1() const { return _padding1; } +uint32_t EntityTypeVP::getPadding1() const { return _padding1; } -void EntityTypeVP::setPadding1(unsigned int pX) { _padding1 = pX; } +void EntityTypeVP::setPadding1(uint32_t pX) { _padding1 = pX; } void EntityTypeVP::marshal(DataStream& dataStream) const { dataStream << _recordType; diff --git a/src/dis7/EntityTypeVP.h b/src/dis7/EntityTypeVP.h index d229b639..8413d8e3 100644 --- a/src/dis7/EntityTypeVP.h +++ b/src/dis7/EntityTypeVP.h @@ -16,19 +16,19 @@ class OPENDIS7_EXPORT EntityTypeVP { protected: /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; + uint8_t _recordType; /** Indicates if this VP has changed since last issuance */ - unsigned char _changeIndicator; + uint8_t _changeIndicator; /** */ EntityType _entityType; /** padding */ - unsigned short _padding; + uint16_t _padding; /** padding */ - unsigned int _padding1; + uint32_t _padding1; public: EntityTypeVP(); @@ -37,21 +37,21 @@ class OPENDIS7_EXPORT EntityTypeVP { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + uint8_t getRecordType() const; + void setRecordType(uint8_t pX); - unsigned char getChangeIndicator() const; - void setChangeIndicator(unsigned char pX); + uint8_t getChangeIndicator() const; + void setChangeIndicator(uint8_t pX); EntityType& getEntityType(); const EntityType& getEntityType() const; void setEntityType(const EntityType& pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + uint32_t getPadding1() const; + void setPadding1(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/Environment.cpp b/src/dis7/Environment.cpp index dec1f7ff..45b80381 100644 --- a/src/dis7/Environment.cpp +++ b/src/dis7/Environment.cpp @@ -7,23 +7,23 @@ Environment::Environment() Environment::~Environment() {} -unsigned int Environment::getEnvironmentType() const { +uint32_t Environment::getEnvironmentType() const { return _environmentType; } -void Environment::setEnvironmentType(unsigned int pX) { _environmentType = pX; } +void Environment::setEnvironmentType(uint32_t pX) { _environmentType = pX; } -unsigned short Environment::getLength() const { return _length; } +uint16_t Environment::getLength() const { return _length; } -void Environment::setLength(unsigned short pX) { _length = pX; } +void Environment::setLength(uint16_t pX) { _length = pX; } -unsigned char Environment::getIndex() const { return _index; } +uint8_t Environment::getIndex() const { return _index; } -void Environment::setIndex(unsigned char pX) { _index = pX; } +void Environment::setIndex(uint8_t pX) { _index = pX; } -unsigned char Environment::getPadding() const { return _padding; } +uint8_t Environment::getPadding() const { return _padding; } -void Environment::setPadding(unsigned char pX) { _padding = pX; } +void Environment::setPadding(uint8_t pX) { _padding = pX; } void Environment::marshal(DataStream& dataStream) const { dataStream << _environmentType; diff --git a/src/dis7/Environment.h b/src/dis7/Environment.h index 43dd568a..5913f693 100644 --- a/src/dis7/Environment.h +++ b/src/dis7/Environment.h @@ -14,16 +14,16 @@ namespace DIS { class OPENDIS7_EXPORT Environment { protected: /** type */ - unsigned int _environmentType; + uint32_t _environmentType; /** length, in bits, of the record */ - unsigned short _length; + uint16_t _length; /** identifies the sequntially numbered record index */ - unsigned char _index; + uint8_t _index; /** padding */ - unsigned char _padding; + uint8_t _padding; public: Environment(); @@ -32,17 +32,17 @@ class OPENDIS7_EXPORT Environment { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getEnvironmentType() const; - void setEnvironmentType(unsigned int pX); + uint32_t getEnvironmentType() const; + void setEnvironmentType(uint32_t pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + uint16_t getLength() const; + void setLength(uint16_t pX); - unsigned char getIndex() const; - void setIndex(unsigned char pX); + uint8_t getIndex() const; + void setIndex(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EnvironmentGeneral.cpp b/src/dis7/EnvironmentGeneral.cpp index 514bfb10..9f5e051f 100644 --- a/src/dis7/EnvironmentGeneral.cpp +++ b/src/dis7/EnvironmentGeneral.cpp @@ -12,33 +12,33 @@ EnvironmentGeneral::EnvironmentGeneral() EnvironmentGeneral::~EnvironmentGeneral() {} -unsigned int EnvironmentGeneral::getEnvironmentType() const { +uint32_t EnvironmentGeneral::getEnvironmentType() const { return _environmentType; } -void EnvironmentGeneral::setEnvironmentType(unsigned int pX) { +void EnvironmentGeneral::setEnvironmentType(uint32_t pX) { _environmentType = pX; } -unsigned char EnvironmentGeneral::getLength() const { return _length; } +uint8_t EnvironmentGeneral::getLength() const { return _length; } -void EnvironmentGeneral::setLength(unsigned char pX) { _length = pX; } +void EnvironmentGeneral::setLength(uint8_t pX) { _length = pX; } -unsigned char EnvironmentGeneral::getIndex() const { return _index; } +uint8_t EnvironmentGeneral::getIndex() const { return _index; } -void EnvironmentGeneral::setIndex(unsigned char pX) { _index = pX; } +void EnvironmentGeneral::setIndex(uint8_t pX) { _index = pX; } -unsigned char EnvironmentGeneral::getPadding1() const { return _padding1; } +uint8_t EnvironmentGeneral::getPadding1() const { return _padding1; } -void EnvironmentGeneral::setPadding1(unsigned char pX) { _padding1 = pX; } +void EnvironmentGeneral::setPadding1(uint8_t pX) { _padding1 = pX; } -unsigned char EnvironmentGeneral::getGeometry() const { return _geometry; } +uint8_t EnvironmentGeneral::getGeometry() const { return _geometry; } -void EnvironmentGeneral::setGeometry(unsigned char pX) { _geometry = pX; } +void EnvironmentGeneral::setGeometry(uint8_t pX) { _geometry = pX; } -unsigned char EnvironmentGeneral::getPadding2() const { return _padding2; } +uint8_t EnvironmentGeneral::getPadding2() const { return _padding2; } -void EnvironmentGeneral::setPadding2(unsigned char pX) { _padding2 = pX; } +void EnvironmentGeneral::setPadding2(uint8_t pX) { _padding2 = pX; } void EnvironmentGeneral::marshal(DataStream& dataStream) const { dataStream << _environmentType; diff --git a/src/dis7/EnvironmentGeneral.h b/src/dis7/EnvironmentGeneral.h index 3fd8c32b..3aba289b 100644 --- a/src/dis7/EnvironmentGeneral.h +++ b/src/dis7/EnvironmentGeneral.h @@ -16,22 +16,22 @@ namespace DIS { class OPENDIS7_EXPORT EnvironmentGeneral { protected: /** Record type */ - unsigned int _environmentType; + uint32_t _environmentType; /** length, in bits */ - unsigned char _length; + uint8_t _length; /** Identify the sequentially numbered record index */ - unsigned char _index; + uint8_t _index; /** padding */ - unsigned char _padding1; + uint8_t _padding1; /** Geometry or state record */ - unsigned char _geometry; + uint8_t _geometry; /** padding to bring the total size up to a 64 bit boundry */ - unsigned char _padding2; + uint8_t _padding2; public: EnvironmentGeneral(); @@ -40,23 +40,23 @@ class OPENDIS7_EXPORT EnvironmentGeneral { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getEnvironmentType() const; - void setEnvironmentType(unsigned int pX); + uint32_t getEnvironmentType() const; + void setEnvironmentType(uint32_t pX); - unsigned char getLength() const; - void setLength(unsigned char pX); + uint8_t getLength() const; + void setLength(uint8_t pX); - unsigned char getIndex() const; - void setIndex(unsigned char pX); + uint8_t getIndex() const; + void setIndex(uint8_t pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + uint8_t getPadding1() const; + void setPadding1(uint8_t pX); - unsigned char getGeometry() const; - void setGeometry(unsigned char pX); + uint8_t getGeometry() const; + void setGeometry(uint8_t pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + uint8_t getPadding2() const; + void setPadding2(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EnvironmentType.cpp b/src/dis7/EnvironmentType.cpp index 7682d471..b8f1a02b 100644 --- a/src/dis7/EnvironmentType.cpp +++ b/src/dis7/EnvironmentType.cpp @@ -13,33 +13,33 @@ EnvironmentType::EnvironmentType() EnvironmentType::~EnvironmentType() {} -unsigned char EnvironmentType::getEntityKind() const { return _entityKind; } +uint8_t EnvironmentType::getEntityKind() const { return _entityKind; } -void EnvironmentType::setEntityKind(unsigned char pX) { _entityKind = pX; } +void EnvironmentType::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char EnvironmentType::getDomain() const { return _domain; } +uint8_t EnvironmentType::getDomain() const { return _domain; } -void EnvironmentType::setDomain(unsigned char pX) { _domain = pX; } +void EnvironmentType::setDomain(uint8_t pX) { _domain = pX; } -unsigned short EnvironmentType::getEntityClass() const { return _entityClass; } +uint16_t EnvironmentType::getEntityClass() const { return _entityClass; } -void EnvironmentType::setEntityClass(unsigned short pX) { _entityClass = pX; } +void EnvironmentType::setEntityClass(uint16_t pX) { _entityClass = pX; } -unsigned char EnvironmentType::getCategory() const { return _category; } +uint8_t EnvironmentType::getCategory() const { return _category; } -void EnvironmentType::setCategory(unsigned char pX) { _category = pX; } +void EnvironmentType::setCategory(uint8_t pX) { _category = pX; } -unsigned char EnvironmentType::getSubcategory() const { return _subcategory; } +uint8_t EnvironmentType::getSubcategory() const { return _subcategory; } -void EnvironmentType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void EnvironmentType::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char EnvironmentType::getSpecific() const { return _specific; } +uint8_t EnvironmentType::getSpecific() const { return _specific; } -void EnvironmentType::setSpecific(unsigned char pX) { _specific = pX; } +void EnvironmentType::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char EnvironmentType::getExtra() const { return _extra; } +uint8_t EnvironmentType::getExtra() const { return _extra; } -void EnvironmentType::setExtra(unsigned char pX) { _extra = pX; } +void EnvironmentType::setExtra(uint8_t pX) { _extra = pX; } void EnvironmentType::marshal(DataStream& dataStream) const { dataStream << _entityKind; diff --git a/src/dis7/EnvironmentType.h b/src/dis7/EnvironmentType.h index 269f70ab..6318a636 100644 --- a/src/dis7/EnvironmentType.h +++ b/src/dis7/EnvironmentType.h @@ -15,24 +15,24 @@ namespace DIS { class OPENDIS7_EXPORT EnvironmentType { protected: /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** class of environmental entity */ - unsigned short _entityClass; + uint16_t _entityClass; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; public: EnvironmentType(); @@ -41,26 +41,26 @@ class OPENDIS7_EXPORT EnvironmentType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); - unsigned short getEntityClass() const; - void setEntityClass(unsigned short pX); + uint16_t getEntityClass() const; + void setEntityClass(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EventIdentifier.cpp b/src/dis7/EventIdentifier.cpp index d081f08f..f1c00bd1 100644 --- a/src/dis7/EventIdentifier.cpp +++ b/src/dis7/EventIdentifier.cpp @@ -18,9 +18,9 @@ void EventIdentifier::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short EventIdentifier::getEventNumber() const { return _eventNumber; } +uint16_t EventIdentifier::getEventNumber() const { return _eventNumber; } -void EventIdentifier::setEventNumber(unsigned short pX) { _eventNumber = pX; } +void EventIdentifier::setEventNumber(uint16_t pX) { _eventNumber = pX; } void EventIdentifier::marshal(DataStream& dataStream) const { _simulationAddress.marshal(dataStream); diff --git a/src/dis7/EventIdentifier.h b/src/dis7/EventIdentifier.h index 1467d001..e5e9ecb8 100644 --- a/src/dis7/EventIdentifier.h +++ b/src/dis7/EventIdentifier.h @@ -18,7 +18,7 @@ class OPENDIS7_EXPORT EventIdentifier { /** Site and application IDs */ SimulationAddress _simulationAddress; - unsigned short _eventNumber; + uint16_t _eventNumber; public: EventIdentifier(); @@ -31,8 +31,8 @@ class OPENDIS7_EXPORT EventIdentifier { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getEventNumber() const; - void setEventNumber(unsigned short pX); + uint16_t getEventNumber() const; + void setEventNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EventIdentifierLiveEntity.cpp b/src/dis7/EventIdentifierLiveEntity.cpp index 409bec5b..4cb18e09 100644 --- a/src/dis7/EventIdentifierLiveEntity.cpp +++ b/src/dis7/EventIdentifierLiveEntity.cpp @@ -7,27 +7,27 @@ EventIdentifierLiveEntity::EventIdentifierLiveEntity() EventIdentifierLiveEntity::~EventIdentifierLiveEntity() {} -unsigned char EventIdentifierLiveEntity::getSiteNumber() const { +uint8_t EventIdentifierLiveEntity::getSiteNumber() const { return _siteNumber; } -void EventIdentifierLiveEntity::setSiteNumber(unsigned char pX) { +void EventIdentifierLiveEntity::setSiteNumber(uint8_t pX) { _siteNumber = pX; } -unsigned char EventIdentifierLiveEntity::getApplicationNumber() const { +uint8_t EventIdentifierLiveEntity::getApplicationNumber() const { return _applicationNumber; } -void EventIdentifierLiveEntity::setApplicationNumber(unsigned char pX) { +void EventIdentifierLiveEntity::setApplicationNumber(uint8_t pX) { _applicationNumber = pX; } -unsigned short EventIdentifierLiveEntity::getEventNumber() const { +uint16_t EventIdentifierLiveEntity::getEventNumber() const { return _eventNumber; } -void EventIdentifierLiveEntity::setEventNumber(unsigned short pX) { +void EventIdentifierLiveEntity::setEventNumber(uint16_t pX) { _eventNumber = pX; } diff --git a/src/dis7/EventIdentifierLiveEntity.h b/src/dis7/EventIdentifierLiveEntity.h index cd37c9a4..d7288ad5 100644 --- a/src/dis7/EventIdentifierLiveEntity.h +++ b/src/dis7/EventIdentifierLiveEntity.h @@ -14,11 +14,11 @@ namespace DIS { class OPENDIS7_EXPORT EventIdentifierLiveEntity { protected: - unsigned char _siteNumber; + uint8_t _siteNumber; - unsigned char _applicationNumber; + uint8_t _applicationNumber; - unsigned short _eventNumber; + uint16_t _eventNumber; public: EventIdentifierLiveEntity(); @@ -27,14 +27,14 @@ class OPENDIS7_EXPORT EventIdentifierLiveEntity { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getSiteNumber() const; - void setSiteNumber(unsigned char pX); + uint8_t getSiteNumber() const; + void setSiteNumber(uint8_t pX); - unsigned char getApplicationNumber() const; - void setApplicationNumber(unsigned char pX); + uint8_t getApplicationNumber() const; + void setApplicationNumber(uint8_t pX); - unsigned short getEventNumber() const; - void setEventNumber(unsigned short pX); + uint16_t getEventNumber() const; + void setEventNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/EventReportPdu.cpp b/src/dis7/EventReportPdu.cpp index f7526d8e..8b4f573e 100644 --- a/src/dis7/EventReportPdu.cpp +++ b/src/dis7/EventReportPdu.cpp @@ -16,19 +16,19 @@ EventReportPdu::~EventReportPdu() { _variableDatums.clear(); } -unsigned int EventReportPdu::getEventType() const { return _eventType; } +uint32_t EventReportPdu::getEventType() const { return _eventType; } -void EventReportPdu::setEventType(unsigned int pX) { _eventType = pX; } +void EventReportPdu::setEventType(uint32_t pX) { _eventType = pX; } -unsigned int EventReportPdu::getPadding1() const { return _padding1; } +uint32_t EventReportPdu::getPadding1() const { return _padding1; } -void EventReportPdu::setPadding1(unsigned int pX) { _padding1 = pX; } +void EventReportPdu::setPadding1(uint32_t pX) { _padding1 = pX; } -unsigned int EventReportPdu::getNumberOfFixedDatumRecords() const { +uint32_t EventReportPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int EventReportPdu::getNumberOfVariableDatumRecords() const { +uint32_t EventReportPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -61,8 +61,8 @@ void EventReportPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _eventType; dataStream << _padding1; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; @@ -126,12 +126,12 @@ int EventReportPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/EventReportPdu.h b/src/dis7/EventReportPdu.h index 94d83232..85e6b21b 100644 --- a/src/dis7/EventReportPdu.h +++ b/src/dis7/EventReportPdu.h @@ -20,16 +20,16 @@ namespace DIS { class OPENDIS7_EXPORT EventReportPdu : public SimulationManagementFamilyPdu { protected: /** Type of event */ - unsigned int _eventType; + uint32_t _eventType; /** padding */ - unsigned int _padding1; + uint32_t _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -44,15 +44,15 @@ class OPENDIS7_EXPORT EventReportPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getEventType() const; - void setEventType(unsigned int pX); + uint32_t getEventType() const; + void setEventType(uint32_t pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + uint32_t getPadding1() const; + void setPadding1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis7/EventReportReliablePdu.cpp b/src/dis7/EventReportReliablePdu.cpp index 499dd205..fd90b889 100644 --- a/src/dis7/EventReportReliablePdu.cpp +++ b/src/dis7/EventReportReliablePdu.cpp @@ -16,23 +16,23 @@ EventReportReliablePdu::~EventReportReliablePdu() { _variableDatumRecords.clear(); } -unsigned short EventReportReliablePdu::getEventType() const { +uint16_t EventReportReliablePdu::getEventType() const { return _eventType; } -void EventReportReliablePdu::setEventType(unsigned short pX) { +void EventReportReliablePdu::setEventType(uint16_t pX) { _eventType = pX; } -unsigned int EventReportReliablePdu::getPad1() const { return _pad1; } +uint32_t EventReportReliablePdu::getPad1() const { return _pad1; } -void EventReportReliablePdu::setPad1(unsigned int pX) { _pad1 = pX; } +void EventReportReliablePdu::setPad1(uint32_t pX) { _pad1 = pX; } -unsigned int EventReportReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t EventReportReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int EventReportReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t EventReportReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -69,8 +69,8 @@ void EventReportReliablePdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _eventType; dataStream << _pad1; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; @@ -138,12 +138,12 @@ int EventReportReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/EventReportReliablePdu.h b/src/dis7/EventReportReliablePdu.h index 0604f764..ed0a2d3d 100644 --- a/src/dis7/EventReportReliablePdu.h +++ b/src/dis7/EventReportReliablePdu.h @@ -22,16 +22,16 @@ class OPENDIS7_EXPORT EventReportReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Event type */ - unsigned short _eventType; + uint16_t _eventType; /** padding */ - unsigned int _pad1; + uint32_t _pad1; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -46,15 +46,15 @@ class OPENDIS7_EXPORT EventReportReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + uint16_t getEventType() const; + void setEventType(uint16_t pX); - unsigned int getPad1() const; - void setPad1(unsigned int pX); + uint32_t getPad1() const; + void setPad1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis7/Expendable.cpp b/src/dis7/Expendable.cpp index 73556925..6d56858f 100644 --- a/src/dis7/Expendable.cpp +++ b/src/dis7/Expendable.cpp @@ -17,25 +17,25 @@ const EntityType& Expendable::getExpendable() const { return _expendable; } void Expendable::setExpendable(const EntityType& pX) { _expendable = pX; } -unsigned int Expendable::getStation() const { return _station; } +uint32_t Expendable::getStation() const { return _station; } -void Expendable::setStation(unsigned int pX) { _station = pX; } +void Expendable::setStation(uint32_t pX) { _station = pX; } -unsigned short Expendable::getQuantity() const { return _quantity; } +uint16_t Expendable::getQuantity() const { return _quantity; } -void Expendable::setQuantity(unsigned short pX) { _quantity = pX; } +void Expendable::setQuantity(uint16_t pX) { _quantity = pX; } -unsigned char Expendable::getExpendableStatus() const { +uint8_t Expendable::getExpendableStatus() const { return _expendableStatus; } -void Expendable::setExpendableStatus(unsigned char pX) { +void Expendable::setExpendableStatus(uint8_t pX) { _expendableStatus = pX; } -unsigned char Expendable::getPadding() const { return _padding; } +uint8_t Expendable::getPadding() const { return _padding; } -void Expendable::setPadding(unsigned char pX) { _padding = pX; } +void Expendable::setPadding(uint8_t pX) { _padding = pX; } void Expendable::marshal(DataStream& dataStream) const { _expendable.marshal(dataStream); diff --git a/src/dis7/Expendable.h b/src/dis7/Expendable.h index 70d928c5..30899a14 100644 --- a/src/dis7/Expendable.h +++ b/src/dis7/Expendable.h @@ -17,13 +17,13 @@ class OPENDIS7_EXPORT Expendable { /** Type of expendable */ EntityType _expendable; - unsigned int _station; + uint32_t _station; - unsigned short _quantity; + uint16_t _quantity; - unsigned char _expendableStatus; + uint8_t _expendableStatus; - unsigned char _padding; + uint8_t _padding; public: Expendable(); @@ -36,17 +36,17 @@ class OPENDIS7_EXPORT Expendable { const EntityType& getExpendable() const; void setExpendable(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + uint32_t getStation() const; + void setStation(uint32_t pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + uint16_t getQuantity() const; + void setQuantity(uint16_t pX); - unsigned char getExpendableStatus() const; - void setExpendableStatus(unsigned char pX); + uint8_t getExpendableStatus() const; + void setExpendableStatus(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ExpendableDescriptor.cpp b/src/dis7/ExpendableDescriptor.cpp index 2bb1e931..9ba74064 100644 --- a/src/dis7/ExpendableDescriptor.cpp +++ b/src/dis7/ExpendableDescriptor.cpp @@ -18,9 +18,9 @@ void ExpendableDescriptor::setExpendableType(const EntityType& pX) { _expendableType = pX; } -long long ExpendableDescriptor::getPadding() const { return _padding; } +int64_t ExpendableDescriptor::getPadding() const { return _padding; } -void ExpendableDescriptor::setPadding(long long pX) { _padding = pX; } +void ExpendableDescriptor::setPadding(int64_t pX) { _padding = pX; } void ExpendableDescriptor::marshal(DataStream& dataStream) const { _expendableType.marshal(dataStream); diff --git a/src/dis7/ExpendableDescriptor.h b/src/dis7/ExpendableDescriptor.h index 1c8e9f6d..df5ce11b 100644 --- a/src/dis7/ExpendableDescriptor.h +++ b/src/dis7/ExpendableDescriptor.h @@ -18,7 +18,7 @@ class OPENDIS7_EXPORT ExpendableDescriptor { EntityType _expendableType; /** Padding */ - long long _padding; + int64_t _padding; public: ExpendableDescriptor(); @@ -31,8 +31,8 @@ class OPENDIS7_EXPORT ExpendableDescriptor { const EntityType& getExpendableType() const; void setExpendableType(const EntityType& pX); - long long getPadding() const; - void setPadding(long long pX); + int64_t getPadding() const; + void setPadding(int64_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ExpendableReload.cpp b/src/dis7/ExpendableReload.cpp index e1174b88..da030c61 100644 --- a/src/dis7/ExpendableReload.cpp +++ b/src/dis7/ExpendableReload.cpp @@ -20,39 +20,39 @@ const EntityType& ExpendableReload::getExpendable() const { void ExpendableReload::setExpendable(const EntityType& pX) { _expendable = pX; } -unsigned int ExpendableReload::getStation() const { return _station; } +uint32_t ExpendableReload::getStation() const { return _station; } -void ExpendableReload::setStation(unsigned int pX) { _station = pX; } +void ExpendableReload::setStation(uint32_t pX) { _station = pX; } -unsigned short ExpendableReload::getStandardQuantity() const { +uint16_t ExpendableReload::getStandardQuantity() const { return _standardQuantity; } -void ExpendableReload::setStandardQuantity(unsigned short pX) { +void ExpendableReload::setStandardQuantity(uint16_t pX) { _standardQuantity = pX; } -unsigned short ExpendableReload::getMaximumQuantity() const { +uint16_t ExpendableReload::getMaximumQuantity() const { return _maximumQuantity; } -void ExpendableReload::setMaximumQuantity(unsigned short pX) { +void ExpendableReload::setMaximumQuantity(uint16_t pX) { _maximumQuantity = pX; } -unsigned int ExpendableReload::getStandardQuantityReloadTime() const { +uint32_t ExpendableReload::getStandardQuantityReloadTime() const { return _standardQuantityReloadTime; } -void ExpendableReload::setStandardQuantityReloadTime(unsigned int pX) { +void ExpendableReload::setStandardQuantityReloadTime(uint32_t pX) { _standardQuantityReloadTime = pX; } -unsigned int ExpendableReload::getMaximumQuantityReloadTime() const { +uint32_t ExpendableReload::getMaximumQuantityReloadTime() const { return _maximumQuantityReloadTime; } -void ExpendableReload::setMaximumQuantityReloadTime(unsigned int pX) { +void ExpendableReload::setMaximumQuantityReloadTime(uint32_t pX) { _maximumQuantityReloadTime = pX; } diff --git a/src/dis7/ExpendableReload.h b/src/dis7/ExpendableReload.h index fcfa77e1..8bb79b5b 100644 --- a/src/dis7/ExpendableReload.h +++ b/src/dis7/ExpendableReload.h @@ -17,15 +17,15 @@ class OPENDIS7_EXPORT ExpendableReload { /** Type of expendable */ EntityType _expendable; - unsigned int _station; + uint32_t _station; - unsigned short _standardQuantity; + uint16_t _standardQuantity; - unsigned short _maximumQuantity; + uint16_t _maximumQuantity; - unsigned int _standardQuantityReloadTime; + uint32_t _standardQuantityReloadTime; - unsigned int _maximumQuantityReloadTime; + uint32_t _maximumQuantityReloadTime; public: ExpendableReload(); @@ -38,20 +38,20 @@ class OPENDIS7_EXPORT ExpendableReload { const EntityType& getExpendable() const; void setExpendable(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + uint32_t getStation() const; + void setStation(uint32_t pX); - unsigned short getStandardQuantity() const; - void setStandardQuantity(unsigned short pX); + uint16_t getStandardQuantity() const; + void setStandardQuantity(uint16_t pX); - unsigned short getMaximumQuantity() const; - void setMaximumQuantity(unsigned short pX); + uint16_t getMaximumQuantity() const; + void setMaximumQuantity(uint16_t pX); - unsigned int getStandardQuantityReloadTime() const; - void setStandardQuantityReloadTime(unsigned int pX); + uint32_t getStandardQuantityReloadTime() const; + void setStandardQuantityReloadTime(uint32_t pX); - unsigned int getMaximumQuantityReloadTime() const; - void setMaximumQuantityReloadTime(unsigned int pX); + uint32_t getMaximumQuantityReloadTime() const; + void setMaximumQuantityReloadTime(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ExplosionDescriptor.cpp b/src/dis7/ExplosionDescriptor.cpp index 5fa67989..497e45e0 100644 --- a/src/dis7/ExplosionDescriptor.cpp +++ b/src/dis7/ExplosionDescriptor.cpp @@ -22,17 +22,17 @@ void ExplosionDescriptor::setExplodingObject(const EntityType& pX) { _explodingObject = pX; } -unsigned short ExplosionDescriptor::getExplosiveMaterial() const { +uint16_t ExplosionDescriptor::getExplosiveMaterial() const { return _explosiveMaterial; } -void ExplosionDescriptor::setExplosiveMaterial(unsigned short pX) { +void ExplosionDescriptor::setExplosiveMaterial(uint16_t pX) { _explosiveMaterial = pX; } -unsigned short ExplosionDescriptor::getPadding() const { return _padding; } +uint16_t ExplosionDescriptor::getPadding() const { return _padding; } -void ExplosionDescriptor::setPadding(unsigned short pX) { _padding = pX; } +void ExplosionDescriptor::setPadding(uint16_t pX) { _padding = pX; } float ExplosionDescriptor::getExplosiveForce() const { return _explosiveForce; } diff --git a/src/dis7/ExplosionDescriptor.h b/src/dis7/ExplosionDescriptor.h index 3b0db7bd..6b634824 100644 --- a/src/dis7/ExplosionDescriptor.h +++ b/src/dis7/ExplosionDescriptor.h @@ -18,10 +18,10 @@ class OPENDIS7_EXPORT ExplosionDescriptor { EntityType _explodingObject; /** Material that exploded. Can be grain dust, tnt, gasoline, etc. */ - unsigned short _explosiveMaterial; + uint16_t _explosiveMaterial; /** padding */ - unsigned short _padding; + uint16_t _padding; /** Force of explosion, in equivalent KG of TNT */ float _explosiveForce; @@ -37,11 +37,11 @@ class OPENDIS7_EXPORT ExplosionDescriptor { const EntityType& getExplodingObject() const; void setExplodingObject(const EntityType& pX); - unsigned short getExplosiveMaterial() const; - void setExplosiveMaterial(unsigned short pX); + uint16_t getExplosiveMaterial() const; + void setExplosiveMaterial(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); float getExplosiveForce() const; void setExplosiveForce(float pX); diff --git a/src/dis7/FalseTargetsAttribute.cpp b/src/dis7/FalseTargetsAttribute.cpp index 2ca561bb..52a8f8dc 100644 --- a/src/dis7/FalseTargetsAttribute.cpp +++ b/src/dis7/FalseTargetsAttribute.cpp @@ -20,51 +20,51 @@ FalseTargetsAttribute::FalseTargetsAttribute() FalseTargetsAttribute::~FalseTargetsAttribute() {} -unsigned int FalseTargetsAttribute::getRecordType() const { +uint32_t FalseTargetsAttribute::getRecordType() const { return _recordType; } -void FalseTargetsAttribute::setRecordType(unsigned int pX) { _recordType = pX; } +void FalseTargetsAttribute::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short FalseTargetsAttribute::getRecordLength() const { +uint16_t FalseTargetsAttribute::getRecordLength() const { return _recordLength; } -void FalseTargetsAttribute::setRecordLength(unsigned short pX) { +void FalseTargetsAttribute::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned short FalseTargetsAttribute::getPadding() const { return _padding; } +uint16_t FalseTargetsAttribute::getPadding() const { return _padding; } -void FalseTargetsAttribute::setPadding(unsigned short pX) { _padding = pX; } +void FalseTargetsAttribute::setPadding(uint16_t pX) { _padding = pX; } -unsigned char FalseTargetsAttribute::getEmitterNumber() const { +uint8_t FalseTargetsAttribute::getEmitterNumber() const { return _emitterNumber; } -void FalseTargetsAttribute::setEmitterNumber(unsigned char pX) { +void FalseTargetsAttribute::setEmitterNumber(uint8_t pX) { _emitterNumber = pX; } -unsigned char FalseTargetsAttribute::getBeamNumber() const { +uint8_t FalseTargetsAttribute::getBeamNumber() const { return _beamNumber; } -void FalseTargetsAttribute::setBeamNumber(unsigned char pX) { +void FalseTargetsAttribute::setBeamNumber(uint8_t pX) { _beamNumber = pX; } -unsigned char FalseTargetsAttribute::getStateIndicator() const { +uint8_t FalseTargetsAttribute::getStateIndicator() const { return _stateIndicator; } -void FalseTargetsAttribute::setStateIndicator(unsigned char pX) { +void FalseTargetsAttribute::setStateIndicator(uint8_t pX) { _stateIndicator = pX; } -unsigned char FalseTargetsAttribute::getPadding2() const { return _padding2; } +uint8_t FalseTargetsAttribute::getPadding2() const { return _padding2; } -void FalseTargetsAttribute::setPadding2(unsigned char pX) { _padding2 = pX; } +void FalseTargetsAttribute::setPadding2(uint8_t pX) { _padding2 = pX; } float FalseTargetsAttribute::getFalseTargetCount() const { return _falseTargetCount; @@ -102,9 +102,9 @@ float FalseTargetsAttribute::getEchoSpacing() const { return _echoSpacing; } void FalseTargetsAttribute::setEchoSpacing(float pX) { _echoSpacing = pX; } -unsigned int FalseTargetsAttribute::getPadding3() const { return _padding3; } +uint32_t FalseTargetsAttribute::getPadding3() const { return _padding3; } -void FalseTargetsAttribute::setPadding3(unsigned int pX) { _padding3 = pX; } +void FalseTargetsAttribute::setPadding3(uint32_t pX) { _padding3 = pX; } void FalseTargetsAttribute::marshal(DataStream& dataStream) const { dataStream << _recordType; diff --git a/src/dis7/FalseTargetsAttribute.h b/src/dis7/FalseTargetsAttribute.h index c5c65293..e77e9a03 100644 --- a/src/dis7/FalseTargetsAttribute.h +++ b/src/dis7/FalseTargetsAttribute.h @@ -18,19 +18,19 @@ namespace DIS { class OPENDIS7_EXPORT FalseTargetsAttribute { protected: - unsigned int _recordType; + uint32_t _recordType; - unsigned short _recordLength; + uint16_t _recordLength; - unsigned short _padding; + uint16_t _padding; - unsigned char _emitterNumber; + uint8_t _emitterNumber; - unsigned char _beamNumber; + uint8_t _beamNumber; - unsigned char _stateIndicator; + uint8_t _stateIndicator; - unsigned char _padding2; + uint8_t _padding2; float _falseTargetCount; @@ -44,7 +44,7 @@ class OPENDIS7_EXPORT FalseTargetsAttribute { float _echoSpacing; - unsigned int _padding3; + uint32_t _padding3; public: FalseTargetsAttribute(); @@ -53,26 +53,26 @@ class OPENDIS7_EXPORT FalseTargetsAttribute { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + uint8_t getEmitterNumber() const; + void setEmitterNumber(uint8_t pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + uint8_t getBeamNumber() const; + void setBeamNumber(uint8_t pX); - unsigned char getStateIndicator() const; - void setStateIndicator(unsigned char pX); + uint8_t getStateIndicator() const; + void setStateIndicator(uint8_t pX); - unsigned char getPadding2() const; - void setPadding2(unsigned char pX); + uint8_t getPadding2() const; + void setPadding2(uint8_t pX); float getFalseTargetCount() const; void setFalseTargetCount(float pX); @@ -92,8 +92,8 @@ class OPENDIS7_EXPORT FalseTargetsAttribute { float getEchoSpacing() const; void setEchoSpacing(float pX); - unsigned int getPadding3() const; - void setPadding3(unsigned int pX); + uint32_t getPadding3() const; + void setPadding3(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/FastEntityStatePdu.cpp b/src/dis7/FastEntityStatePdu.cpp index 37e42dbe..f829db7b 100644 --- a/src/dis7/FastEntityStatePdu.cpp +++ b/src/dis7/FastEntityStatePdu.cpp @@ -58,99 +58,99 @@ FastEntityStatePdu::FastEntityStatePdu() FastEntityStatePdu::~FastEntityStatePdu() { _variableParameters.clear(); } -unsigned short FastEntityStatePdu::getSite() const { return _site; } +uint16_t FastEntityStatePdu::getSite() const { return _site; } -void FastEntityStatePdu::setSite(unsigned short pX) { _site = pX; } +void FastEntityStatePdu::setSite(uint16_t pX) { _site = pX; } -unsigned short FastEntityStatePdu::getApplication() const { +uint16_t FastEntityStatePdu::getApplication() const { return _application; } -void FastEntityStatePdu::setApplication(unsigned short pX) { +void FastEntityStatePdu::setApplication(uint16_t pX) { _application = pX; } -unsigned short FastEntityStatePdu::getEntity() const { return _entity; } +uint16_t FastEntityStatePdu::getEntity() const { return _entity; } -void FastEntityStatePdu::setEntity(unsigned short pX) { _entity = pX; } +void FastEntityStatePdu::setEntity(uint16_t pX) { _entity = pX; } -unsigned char FastEntityStatePdu::getForceId() const { return _forceId; } +uint8_t FastEntityStatePdu::getForceId() const { return _forceId; } -void FastEntityStatePdu::setForceId(unsigned char pX) { _forceId = pX; } +void FastEntityStatePdu::setForceId(uint8_t pX) { _forceId = pX; } char FastEntityStatePdu::getNumberOfVariableParameters() const { return _variableParameters.size(); } -unsigned char FastEntityStatePdu::getEntityKind() const { return _entityKind; } +uint8_t FastEntityStatePdu::getEntityKind() const { return _entityKind; } -void FastEntityStatePdu::setEntityKind(unsigned char pX) { _entityKind = pX; } +void FastEntityStatePdu::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char FastEntityStatePdu::getDomain() const { return _domain; } +uint8_t FastEntityStatePdu::getDomain() const { return _domain; } -void FastEntityStatePdu::setDomain(unsigned char pX) { _domain = pX; } +void FastEntityStatePdu::setDomain(uint8_t pX) { _domain = pX; } -unsigned short FastEntityStatePdu::getCountry() const { return _country; } +uint16_t FastEntityStatePdu::getCountry() const { return _country; } -void FastEntityStatePdu::setCountry(unsigned short pX) { _country = pX; } +void FastEntityStatePdu::setCountry(uint16_t pX) { _country = pX; } -unsigned char FastEntityStatePdu::getCategory() const { return _category; } +uint8_t FastEntityStatePdu::getCategory() const { return _category; } -void FastEntityStatePdu::setCategory(unsigned char pX) { _category = pX; } +void FastEntityStatePdu::setCategory(uint8_t pX) { _category = pX; } -unsigned char FastEntityStatePdu::getSubcategory() const { +uint8_t FastEntityStatePdu::getSubcategory() const { return _subcategory; } -void FastEntityStatePdu::setSubcategory(unsigned char pX) { _subcategory = pX; } +void FastEntityStatePdu::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char FastEntityStatePdu::getSpecific() const { return _specific; } +uint8_t FastEntityStatePdu::getSpecific() const { return _specific; } -void FastEntityStatePdu::setSpecific(unsigned char pX) { _specific = pX; } +void FastEntityStatePdu::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char FastEntityStatePdu::getExtra() const { return _extra; } +uint8_t FastEntityStatePdu::getExtra() const { return _extra; } -void FastEntityStatePdu::setExtra(unsigned char pX) { _extra = pX; } +void FastEntityStatePdu::setExtra(uint8_t pX) { _extra = pX; } -unsigned char FastEntityStatePdu::getAltEntityKind() const { +uint8_t FastEntityStatePdu::getAltEntityKind() const { return _altEntityKind; } -void FastEntityStatePdu::setAltEntityKind(unsigned char pX) { +void FastEntityStatePdu::setAltEntityKind(uint8_t pX) { _altEntityKind = pX; } -unsigned char FastEntityStatePdu::getAltDomain() const { return _altDomain; } +uint8_t FastEntityStatePdu::getAltDomain() const { return _altDomain; } -void FastEntityStatePdu::setAltDomain(unsigned char pX) { _altDomain = pX; } +void FastEntityStatePdu::setAltDomain(uint8_t pX) { _altDomain = pX; } -unsigned short FastEntityStatePdu::getAltCountry() const { return _altCountry; } +uint16_t FastEntityStatePdu::getAltCountry() const { return _altCountry; } -void FastEntityStatePdu::setAltCountry(unsigned short pX) { _altCountry = pX; } +void FastEntityStatePdu::setAltCountry(uint16_t pX) { _altCountry = pX; } -unsigned char FastEntityStatePdu::getAltCategory() const { +uint8_t FastEntityStatePdu::getAltCategory() const { return _altCategory; } -void FastEntityStatePdu::setAltCategory(unsigned char pX) { _altCategory = pX; } +void FastEntityStatePdu::setAltCategory(uint8_t pX) { _altCategory = pX; } -unsigned char FastEntityStatePdu::getAltSubcategory() const { +uint8_t FastEntityStatePdu::getAltSubcategory() const { return _altSubcategory; } -void FastEntityStatePdu::setAltSubcategory(unsigned char pX) { +void FastEntityStatePdu::setAltSubcategory(uint8_t pX) { _altSubcategory = pX; } -unsigned char FastEntityStatePdu::getAltSpecific() const { +uint8_t FastEntityStatePdu::getAltSpecific() const { return _altSpecific; } -void FastEntityStatePdu::setAltSpecific(unsigned char pX) { _altSpecific = pX; } +void FastEntityStatePdu::setAltSpecific(uint8_t pX) { _altSpecific = pX; } -unsigned char FastEntityStatePdu::getAltExtra() const { return _altExtra; } +uint8_t FastEntityStatePdu::getAltExtra() const { return _altExtra; } -void FastEntityStatePdu::setAltExtra(unsigned char pX) { _altExtra = pX; } +void FastEntityStatePdu::setAltExtra(uint8_t pX) { _altExtra = pX; } float FastEntityStatePdu::getXVelocity() const { return _xVelocity; } @@ -194,11 +194,11 @@ int FastEntityStatePdu::getEntityAppearance() const { void FastEntityStatePdu::setEntityAppearance(int pX) { _entityAppearance = pX; } -unsigned char FastEntityStatePdu::getDeadReckoningAlgorithm() const { +uint8_t FastEntityStatePdu::getDeadReckoningAlgorithm() const { return _deadReckoningAlgorithm; } -void FastEntityStatePdu::setDeadReckoningAlgorithm(unsigned char pX) { +void FastEntityStatePdu::setDeadReckoningAlgorithm(uint8_t pX) { _deadReckoningAlgorithm = pX; } @@ -437,7 +437,7 @@ bool FastEntityStatePdu::operator==(const FastEntityStatePdu& rhs) const { if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 15; idx++) { + for (uint8_t idx = 0; idx < 15; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } @@ -449,7 +449,7 @@ bool FastEntityStatePdu::operator==(const FastEntityStatePdu& rhs) const { if (!(_yAngularVelocity == rhs._yAngularVelocity)) ivarsEqual = false; if (!(_zAngularVelocity == rhs._zAngularVelocity)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 12; idx++) { + for (uint8_t idx = 0; idx < 12; idx++) { if (!(_marking[idx] == rhs._marking[idx])) ivarsEqual = false; } @@ -507,7 +507,7 @@ int FastEntityStatePdu::getMarshalledSize() const { marshalSize = marshalSize + 12 * 1; // _marking marshalSize = marshalSize + 4; // _capabilities - for (unsigned long long idx = 0; idx < _variableParameters.size(); idx++) { + for (uint64_t idx = 0; idx < _variableParameters.size(); idx++) { VariableParameter listElement = _variableParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/FastEntityStatePdu.h b/src/dis7/FastEntityStatePdu.h index 2c858228..3ac2e507 100644 --- a/src/dis7/FastEntityStatePdu.h +++ b/src/dis7/FastEntityStatePdu.h @@ -20,60 +20,60 @@ namespace DIS { class OPENDIS7_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { protected: /** The site ID */ - unsigned short _site; + uint16_t _site; /** The application ID */ - unsigned short _application; + uint16_t _application; /** the entity ID */ - unsigned short _entity; + uint16_t _entity; /** what force this entity is affiliated with, eg red, blue, neutral, etc */ - unsigned char _forceId; + uint8_t _forceId; /** How many variable (nee articulation) parameters are in the variable length * list */ - unsigned char _numberOfVariableParameters; + uint8_t _numberOfVariableParameters; /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; /** specific info based on subcategory field */ - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; /** Kind of entity */ - unsigned char _altEntityKind; + uint8_t _altEntityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _altDomain; + uint8_t _altDomain; /** country to which the design of the entity is attributed */ - unsigned short _altCountry; + uint16_t _altCountry; /** category of entity */ - unsigned char _altCategory; + uint8_t _altCategory; /** subcategory of entity */ - unsigned char _altSubcategory; + uint8_t _altSubcategory; /** specific info based on subcategory field */ - unsigned char _altSpecific; + uint8_t _altSpecific; - unsigned char _altExtra; + uint8_t _altExtra; /** X velo */ float _xVelocity; @@ -104,7 +104,7 @@ class OPENDIS7_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { int _entityAppearance; /** enumeration of what dead reckoning algorighm to use */ - unsigned char _deadReckoningAlgorithm; + uint8_t _deadReckoningAlgorithm; /** other parameters to use in the dead reckoning algorithm */ char _otherParameters[15]; @@ -145,61 +145,61 @@ class OPENDIS7_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + uint16_t getSite() const; + void setSite(uint16_t pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + uint16_t getApplication() const; + void setApplication(uint16_t pX); - unsigned short getEntity() const; - void setEntity(unsigned short pX); + uint16_t getEntity() const; + void setEntity(uint16_t pX); - unsigned char getForceId() const; - void setForceId(unsigned char pX); + uint8_t getForceId() const; + void setForceId(uint8_t pX); char getNumberOfVariableParameters() const; - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); - unsigned char getAltEntityKind() const; - void setAltEntityKind(unsigned char pX); + uint8_t getAltEntityKind() const; + void setAltEntityKind(uint8_t pX); - unsigned char getAltDomain() const; - void setAltDomain(unsigned char pX); + uint8_t getAltDomain() const; + void setAltDomain(uint8_t pX); - unsigned short getAltCountry() const; - void setAltCountry(unsigned short pX); + uint16_t getAltCountry() const; + void setAltCountry(uint16_t pX); - unsigned char getAltCategory() const; - void setAltCategory(unsigned char pX); + uint8_t getAltCategory() const; + void setAltCategory(uint8_t pX); - unsigned char getAltSubcategory() const; - void setAltSubcategory(unsigned char pX); + uint8_t getAltSubcategory() const; + void setAltSubcategory(uint8_t pX); - unsigned char getAltSpecific() const; - void setAltSpecific(unsigned char pX); + uint8_t getAltSpecific() const; + void setAltSpecific(uint8_t pX); - unsigned char getAltExtra() const; - void setAltExtra(unsigned char pX); + uint8_t getAltExtra() const; + void setAltExtra(uint8_t pX); float getXVelocity() const; void setXVelocity(float pX); @@ -231,8 +231,8 @@ class OPENDIS7_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { int getEntityAppearance() const; void setEntityAppearance(int pX); - unsigned char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(unsigned char pX); + uint8_t getDeadReckoningAlgorithm() const; + void setDeadReckoningAlgorithm(uint8_t pX); char* getOtherParameters(); const char* getOtherParameters() const; diff --git a/src/dis7/FirePdu.cpp b/src/dis7/FirePdu.cpp index 9458ee4c..abfbe736 100644 --- a/src/dis7/FirePdu.cpp +++ b/src/dis7/FirePdu.cpp @@ -32,9 +32,9 @@ const EventIdentifier& FirePdu::getEventID() const { return _eventID; } void FirePdu::setEventID(const EventIdentifier& pX) { _eventID = pX; } -unsigned int FirePdu::getFireMissionIndex() const { return _fireMissionIndex; } +uint32_t FirePdu::getFireMissionIndex() const { return _fireMissionIndex; } -void FirePdu::setFireMissionIndex(unsigned int pX) { _fireMissionIndex = pX; } +void FirePdu::setFireMissionIndex(uint32_t pX) { _fireMissionIndex = pX; } Vector3Double& FirePdu::getLocationInWorldCoordinates() { return _locationInWorldCoordinates; diff --git a/src/dis7/FirePdu.h b/src/dis7/FirePdu.h index 9a3dcb90..055de7c4 100644 --- a/src/dis7/FirePdu.h +++ b/src/dis7/FirePdu.h @@ -31,8 +31,8 @@ class OPENDIS7_EXPORT FirePdu : public WarfareFamilyPdu { EventIdentifier _eventID; /** This field shall identify the fire mission (see 5.4.3.3). This field shall - * be representedby a 32-bit unsigned integer. */ - unsigned int _fireMissionIndex; + * be representedby a 32-bit uint32_teger. */ + uint32_t _fireMissionIndex; /** This field shall specify the location, in world coordinates, from which * the munition was launched, and shall be represented by a World Coordinates @@ -74,8 +74,8 @@ class OPENDIS7_EXPORT FirePdu : public WarfareFamilyPdu { const EventIdentifier& getEventID() const; void setEventID(const EventIdentifier& pX); - unsigned int getFireMissionIndex() const; - void setFireMissionIndex(unsigned int pX); + uint32_t getFireMissionIndex() const; + void setFireMissionIndex(uint32_t pX); Vector3Double& getLocationInWorldCoordinates(); const Vector3Double& getLocationInWorldCoordinates() const; diff --git a/src/dis7/FixedDatum.cpp b/src/dis7/FixedDatum.cpp index fa772df8..c3637f06 100644 --- a/src/dis7/FixedDatum.cpp +++ b/src/dis7/FixedDatum.cpp @@ -6,13 +6,13 @@ FixedDatum::FixedDatum() : _fixedDatumID(0), _fixedDatumValue(0) {} FixedDatum::~FixedDatum() {} -unsigned int FixedDatum::getFixedDatumID() const { return _fixedDatumID; } +uint32_t FixedDatum::getFixedDatumID() const { return _fixedDatumID; } -void FixedDatum::setFixedDatumID(unsigned int pX) { _fixedDatumID = pX; } +void FixedDatum::setFixedDatumID(uint32_t pX) { _fixedDatumID = pX; } -unsigned int FixedDatum::getFixedDatumValue() const { return _fixedDatumValue; } +uint32_t FixedDatum::getFixedDatumValue() const { return _fixedDatumValue; } -void FixedDatum::setFixedDatumValue(unsigned int pX) { _fixedDatumValue = pX; } +void FixedDatum::setFixedDatumValue(uint32_t pX) { _fixedDatumValue = pX; } void FixedDatum::marshal(DataStream& dataStream) const { dataStream << _fixedDatumID; diff --git a/src/dis7/FixedDatum.h b/src/dis7/FixedDatum.h index 9cb1ae72..d9b23b07 100644 --- a/src/dis7/FixedDatum.h +++ b/src/dis7/FixedDatum.h @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS7_EXPORT FixedDatum { protected: /** ID of the fixed datum, an enumeration */ - unsigned int _fixedDatumID; + uint32_t _fixedDatumID; /** Value for the fixed datum */ - unsigned int _fixedDatumValue; + uint32_t _fixedDatumValue; public: FixedDatum(); @@ -26,11 +26,11 @@ class OPENDIS7_EXPORT FixedDatum { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getFixedDatumID() const; - void setFixedDatumID(unsigned int pX); + uint32_t getFixedDatumID() const; + void setFixedDatumID(uint32_t pX); - unsigned int getFixedDatumValue() const; - void setFixedDatumValue(unsigned int pX); + uint32_t getFixedDatumValue() const; + void setFixedDatumValue(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/FourByteChunk.cpp b/src/dis7/FourByteChunk.cpp index eb075e12..9562524d 100644 --- a/src/dis7/FourByteChunk.cpp +++ b/src/dis7/FourByteChunk.cpp @@ -39,7 +39,7 @@ void FourByteChunk::unmarshal(DataStream& dataStream) { bool FourByteChunk::operator==(const FourByteChunk& rhs) const { bool ivarsEqual = true; - for (unsigned char idx = 0; idx < 4; idx++) { + for (uint8_t idx = 0; idx < 4; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis7/FundamentalOperationalData.cpp b/src/dis7/FundamentalOperationalData.cpp index 75c7b5b2..266f0e62 100644 --- a/src/dis7/FundamentalOperationalData.cpp +++ b/src/dis7/FundamentalOperationalData.cpp @@ -16,83 +16,83 @@ FundamentalOperationalData::FundamentalOperationalData() FundamentalOperationalData::~FundamentalOperationalData() {} -unsigned char FundamentalOperationalData::getSystemStatus() const { +uint8_t FundamentalOperationalData::getSystemStatus() const { return _systemStatus; } -void FundamentalOperationalData::setSystemStatus(unsigned char pX) { +void FundamentalOperationalData::setSystemStatus(uint8_t pX) { _systemStatus = pX; } -unsigned char FundamentalOperationalData::getDataField1() const { +uint8_t FundamentalOperationalData::getDataField1() const { return _dataField1; } -void FundamentalOperationalData::setDataField1(unsigned char pX) { +void FundamentalOperationalData::setDataField1(uint8_t pX) { _dataField1 = pX; } -unsigned char FundamentalOperationalData::getInformationLayers() const { +uint8_t FundamentalOperationalData::getInformationLayers() const { return _informationLayers; } -void FundamentalOperationalData::setInformationLayers(unsigned char pX) { +void FundamentalOperationalData::setInformationLayers(uint8_t pX) { _informationLayers = pX; } -unsigned char FundamentalOperationalData::getDataField2() const { +uint8_t FundamentalOperationalData::getDataField2() const { return _dataField2; } -void FundamentalOperationalData::setDataField2(unsigned char pX) { +void FundamentalOperationalData::setDataField2(uint8_t pX) { _dataField2 = pX; } -unsigned short FundamentalOperationalData::getParameter1() const { +uint16_t FundamentalOperationalData::getParameter1() const { return _parameter1; } -void FundamentalOperationalData::setParameter1(unsigned short pX) { +void FundamentalOperationalData::setParameter1(uint16_t pX) { _parameter1 = pX; } -unsigned short FundamentalOperationalData::getParameter2() const { +uint16_t FundamentalOperationalData::getParameter2() const { return _parameter2; } -void FundamentalOperationalData::setParameter2(unsigned short pX) { +void FundamentalOperationalData::setParameter2(uint16_t pX) { _parameter2 = pX; } -unsigned short FundamentalOperationalData::getParameter3() const { +uint16_t FundamentalOperationalData::getParameter3() const { return _parameter3; } -void FundamentalOperationalData::setParameter3(unsigned short pX) { +void FundamentalOperationalData::setParameter3(uint16_t pX) { _parameter3 = pX; } -unsigned short FundamentalOperationalData::getParameter4() const { +uint16_t FundamentalOperationalData::getParameter4() const { return _parameter4; } -void FundamentalOperationalData::setParameter4(unsigned short pX) { +void FundamentalOperationalData::setParameter4(uint16_t pX) { _parameter4 = pX; } -unsigned short FundamentalOperationalData::getParameter5() const { +uint16_t FundamentalOperationalData::getParameter5() const { return _parameter5; } -void FundamentalOperationalData::setParameter5(unsigned short pX) { +void FundamentalOperationalData::setParameter5(uint16_t pX) { _parameter5 = pX; } -unsigned short FundamentalOperationalData::getParameter6() const { +uint16_t FundamentalOperationalData::getParameter6() const { return _parameter6; } -void FundamentalOperationalData::setParameter6(unsigned short pX) { +void FundamentalOperationalData::setParameter6(uint16_t pX) { _parameter6 = pX; } diff --git a/src/dis7/FundamentalOperationalData.h b/src/dis7/FundamentalOperationalData.h index e68e531a..55433daa 100644 --- a/src/dis7/FundamentalOperationalData.h +++ b/src/dis7/FundamentalOperationalData.h @@ -14,34 +14,34 @@ namespace DIS { class OPENDIS7_EXPORT FundamentalOperationalData { protected: /** system status */ - unsigned char _systemStatus; + uint8_t _systemStatus; /** data field 1 */ - unsigned char _dataField1; + uint8_t _dataField1; /** eight boolean fields */ - unsigned char _informationLayers; + uint8_t _informationLayers; /** enumeration */ - unsigned char _dataField2; + uint8_t _dataField2; /** parameter, enumeration */ - unsigned short _parameter1; + uint16_t _parameter1; /** parameter, enumeration */ - unsigned short _parameter2; + uint16_t _parameter2; /** parameter, enumeration */ - unsigned short _parameter3; + uint16_t _parameter3; /** parameter, enumeration */ - unsigned short _parameter4; + uint16_t _parameter4; /** parameter, enumeration */ - unsigned short _parameter5; + uint16_t _parameter5; /** parameter, enumeration */ - unsigned short _parameter6; + uint16_t _parameter6; public: FundamentalOperationalData(); @@ -50,35 +50,35 @@ class OPENDIS7_EXPORT FundamentalOperationalData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getSystemStatus() const; - void setSystemStatus(unsigned char pX); + uint8_t getSystemStatus() const; + void setSystemStatus(uint8_t pX); - unsigned char getDataField1() const; - void setDataField1(unsigned char pX); + uint8_t getDataField1() const; + void setDataField1(uint8_t pX); - unsigned char getInformationLayers() const; - void setInformationLayers(unsigned char pX); + uint8_t getInformationLayers() const; + void setInformationLayers(uint8_t pX); - unsigned char getDataField2() const; - void setDataField2(unsigned char pX); + uint8_t getDataField2() const; + void setDataField2(uint8_t pX); - unsigned short getParameter1() const; - void setParameter1(unsigned short pX); + uint16_t getParameter1() const; + void setParameter1(uint16_t pX); - unsigned short getParameter2() const; - void setParameter2(unsigned short pX); + uint16_t getParameter2() const; + void setParameter2(uint16_t pX); - unsigned short getParameter3() const; - void setParameter3(unsigned short pX); + uint16_t getParameter3() const; + void setParameter3(uint16_t pX); - unsigned short getParameter4() const; - void setParameter4(unsigned short pX); + uint16_t getParameter4() const; + void setParameter4(uint16_t pX); - unsigned short getParameter5() const; - void setParameter5(unsigned short pX); + uint16_t getParameter5() const; + void setParameter5(uint16_t pX); - unsigned short getParameter6() const; - void setParameter6(unsigned short pX); + uint16_t getParameter6() const; + void setParameter6(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/GridAxis.cpp b/src/dis7/GridAxis.cpp index d475be02..f9dc8fe8 100644 --- a/src/dis7/GridAxis.cpp +++ b/src/dis7/GridAxis.cpp @@ -21,29 +21,29 @@ double GridAxis::getDomainFinalXi() const { return _domainFinalXi; } void GridAxis::setDomainFinalXi(double pX) { _domainFinalXi = pX; } -unsigned short GridAxis::getDomainPointsXi() const { return _domainPointsXi; } +uint16_t GridAxis::getDomainPointsXi() const { return _domainPointsXi; } -void GridAxis::setDomainPointsXi(unsigned short pX) { _domainPointsXi = pX; } +void GridAxis::setDomainPointsXi(uint16_t pX) { _domainPointsXi = pX; } -unsigned char GridAxis::getInterleafFactor() const { return _interleafFactor; } +uint8_t GridAxis::getInterleafFactor() const { return _interleafFactor; } -void GridAxis::setInterleafFactor(unsigned char pX) { _interleafFactor = pX; } +void GridAxis::setInterleafFactor(uint8_t pX) { _interleafFactor = pX; } -unsigned char GridAxis::getAxisType() const { return _axisType; } +uint8_t GridAxis::getAxisType() const { return _axisType; } -void GridAxis::setAxisType(unsigned char pX) { _axisType = pX; } +void GridAxis::setAxisType(uint8_t pX) { _axisType = pX; } -unsigned short GridAxis::getNumberOfPointsOnXiAxis() const { +uint16_t GridAxis::getNumberOfPointsOnXiAxis() const { return _numberOfPointsOnXiAxis; } -void GridAxis::setNumberOfPointsOnXiAxis(unsigned short pX) { +void GridAxis::setNumberOfPointsOnXiAxis(uint16_t pX) { _numberOfPointsOnXiAxis = pX; } -unsigned short GridAxis::getInitialIndex() const { return _initialIndex; } +uint16_t GridAxis::getInitialIndex() const { return _initialIndex; } -void GridAxis::setInitialIndex(unsigned short pX) { _initialIndex = pX; } +void GridAxis::setInitialIndex(uint16_t pX) { _initialIndex = pX; } void GridAxis::marshal(DataStream& dataStream) const { dataStream << _domainInitialXi; diff --git a/src/dis7/GridAxis.h b/src/dis7/GridAxis.h index d82384bc..cbbf9838 100644 --- a/src/dis7/GridAxis.h +++ b/src/dis7/GridAxis.h @@ -21,19 +21,19 @@ class OPENDIS7_EXPORT GridAxis { /** The number of grid points along the Xi domain axis for the enviornmental * state data */ - unsigned short _domainPointsXi; + uint16_t _domainPointsXi; /** interleaf factor along the domain axis. */ - unsigned char _interleafFactor; + uint8_t _interleafFactor; /** type of grid axis */ - unsigned char _axisType; + uint8_t _axisType; /** Number of grid locations along Xi axis */ - unsigned short _numberOfPointsOnXiAxis; + uint16_t _numberOfPointsOnXiAxis; /** initial grid point for the current pdu */ - unsigned short _initialIndex; + uint16_t _initialIndex; public: GridAxis(); @@ -48,20 +48,20 @@ class OPENDIS7_EXPORT GridAxis { double getDomainFinalXi() const; void setDomainFinalXi(double pX); - unsigned short getDomainPointsXi() const; - void setDomainPointsXi(unsigned short pX); + uint16_t getDomainPointsXi() const; + void setDomainPointsXi(uint16_t pX); - unsigned char getInterleafFactor() const; - void setInterleafFactor(unsigned char pX); + uint8_t getInterleafFactor() const; + void setInterleafFactor(uint8_t pX); - unsigned char getAxisType() const; - void setAxisType(unsigned char pX); + uint8_t getAxisType() const; + void setAxisType(uint8_t pX); - unsigned short getNumberOfPointsOnXiAxis() const; - void setNumberOfPointsOnXiAxis(unsigned short pX); + uint16_t getNumberOfPointsOnXiAxis() const; + void setNumberOfPointsOnXiAxis(uint16_t pX); - unsigned short getInitialIndex() const; - void setInitialIndex(unsigned short pX); + uint16_t getInitialIndex() const; + void setInitialIndex(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/GroupIdentifier.cpp b/src/dis7/GroupIdentifier.cpp index 3d20d1c4..405aa7e9 100644 --- a/src/dis7/GroupIdentifier.cpp +++ b/src/dis7/GroupIdentifier.cpp @@ -18,9 +18,9 @@ void GroupIdentifier::setSimulationAddress(const EntityType& pX) { _simulationAddress = pX; } -unsigned short GroupIdentifier::getGroupNumber() const { return _groupNumber; } +uint16_t GroupIdentifier::getGroupNumber() const { return _groupNumber; } -void GroupIdentifier::setGroupNumber(unsigned short pX) { _groupNumber = pX; } +void GroupIdentifier::setGroupNumber(uint16_t pX) { _groupNumber = pX; } void GroupIdentifier::marshal(DataStream& dataStream) const { _simulationAddress.marshal(dataStream); diff --git a/src/dis7/GroupIdentifier.h b/src/dis7/GroupIdentifier.h index e630c1fd..c25689dc 100644 --- a/src/dis7/GroupIdentifier.h +++ b/src/dis7/GroupIdentifier.h @@ -19,7 +19,7 @@ class OPENDIS7_EXPORT GroupIdentifier { EntityType _simulationAddress; /** group number */ - unsigned short _groupNumber; + uint16_t _groupNumber; public: GroupIdentifier(); @@ -32,8 +32,8 @@ class OPENDIS7_EXPORT GroupIdentifier { const EntityType& getSimulationAddress() const; void setSimulationAddress(const EntityType& pX); - unsigned short getGroupNumber() const; - void setGroupNumber(unsigned short pX); + uint16_t getGroupNumber() const; + void setGroupNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/IFFFundamentalParameterData.cpp b/src/dis7/IFFFundamentalParameterData.cpp index 4e5ad489..6ca95378 100644 --- a/src/dis7/IFFFundamentalParameterData.cpp +++ b/src/dis7/IFFFundamentalParameterData.cpp @@ -34,33 +34,33 @@ float IFFFundamentalParameterData::getPulseWidth() const { return _pulseWidth; } void IFFFundamentalParameterData::setPulseWidth(float pX) { _pulseWidth = pX; } -unsigned int IFFFundamentalParameterData::getBurstLength() const { +uint32_t IFFFundamentalParameterData::getBurstLength() const { return _burstLength; } -void IFFFundamentalParameterData::setBurstLength(unsigned int pX) { +void IFFFundamentalParameterData::setBurstLength(uint32_t pX) { _burstLength = pX; } -unsigned char IFFFundamentalParameterData::getApplicableModes() const { +uint8_t IFFFundamentalParameterData::getApplicableModes() const { return _applicableModes; } -void IFFFundamentalParameterData::setApplicableModes(unsigned char pX) { +void IFFFundamentalParameterData::setApplicableModes(uint8_t pX) { _applicableModes = pX; } -unsigned char* IFFFundamentalParameterData::getSystemSpecificData() { +uint8_t* IFFFundamentalParameterData::getSystemSpecificData() { return _systemSpecificData; } -const unsigned char* IFFFundamentalParameterData::getSystemSpecificData() +const uint8_t* IFFFundamentalParameterData::getSystemSpecificData() const { return _systemSpecificData; } void IFFFundamentalParameterData::setSystemSpecificData( - const unsigned char* x) { + const uint8_t* x) { for (int i = 0; i < 3; i++) { _systemSpecificData[i] = x[i]; } @@ -103,7 +103,7 @@ bool IFFFundamentalParameterData::operator==( if (!(_burstLength == rhs._burstLength)) ivarsEqual = false; if (!(_applicableModes == rhs._applicableModes)) ivarsEqual = false; - for (unsigned char idx = 0; idx < 3; idx++) { + for (uint8_t idx = 0; idx < 3; idx++) { if (!(_systemSpecificData[idx] == rhs._systemSpecificData[idx])) ivarsEqual = false; } diff --git a/src/dis7/IFFFundamentalParameterData.h b/src/dis7/IFFFundamentalParameterData.h index a1d1aa15..64033e44 100644 --- a/src/dis7/IFFFundamentalParameterData.h +++ b/src/dis7/IFFFundamentalParameterData.h @@ -26,13 +26,13 @@ class OPENDIS7_EXPORT IFFFundamentalParameterData { float _pulseWidth; /** Burst length */ - unsigned int _burstLength; + uint32_t _burstLength; /** Applicable modes enumeration */ - unsigned char _applicableModes; + uint8_t _applicableModes; /** System-specific data */ - unsigned char _systemSpecificData[3]; + uint8_t _systemSpecificData[3]; public: IFFFundamentalParameterData(); @@ -53,15 +53,15 @@ class OPENDIS7_EXPORT IFFFundamentalParameterData { float getPulseWidth() const; void setPulseWidth(float pX); - unsigned int getBurstLength() const; - void setBurstLength(unsigned int pX); + uint32_t getBurstLength() const; + void setBurstLength(uint32_t pX); - unsigned char getApplicableModes() const; - void setApplicableModes(unsigned char pX); + uint8_t getApplicableModes() const; + void setApplicableModes(uint8_t pX); - unsigned char* getSystemSpecificData(); - const unsigned char* getSystemSpecificData() const; - void setSystemSpecificData(const unsigned char* pX); + uint8_t* getSystemSpecificData(); + const uint8_t* getSystemSpecificData() const; + void setSystemSpecificData(const uint8_t* pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/IFFPdu.cpp b/src/dis7/IFFPdu.cpp index c5174678..2c281d52 100644 --- a/src/dis7/IFFPdu.cpp +++ b/src/dis7/IFFPdu.cpp @@ -46,7 +46,7 @@ void IFFPdu::setRelativeAntennaLocation(const Vector3Float& pX) { _relativeAntennaLocation = pX; } -unsigned int IFFPdu::getNumberOfIFFParameters() const { +uint32_t IFFPdu::getNumberOfIFFParameters() const { return _numberOfIFFParameters; } @@ -56,15 +56,15 @@ const SystemIdentifier& IFFPdu::getSystemID() const { return _systemID; } void IFFPdu::setSystemID(const SystemIdentifier& pX) { _systemID = pX; } -unsigned char IFFPdu::getSystemDesignator() const { return _systemDesignator; } +uint8_t IFFPdu::getSystemDesignator() const { return _systemDesignator; } -void IFFPdu::setSystemDesignator(unsigned char pX) { _systemDesignator = pX; } +void IFFPdu::setSystemDesignator(uint8_t pX) { _systemDesignator = pX; } -unsigned char IFFPdu::getSystemSpecificData() const { +uint8_t IFFPdu::getSystemSpecificData() const { return _systemSpecificData; } -void IFFPdu::setSystemSpecificData(unsigned char pX) { +void IFFPdu::setSystemSpecificData(uint8_t pX) { _systemSpecificData = pX; } @@ -133,7 +133,7 @@ void IFFPdu::marshal(DataStream& dataStream) const { _layerHeader.marshal(dataStream); _beamData.marshal(dataStream); _secondaryOperationalData.marshal(dataStream); - dataStream << (unsigned char)_iffParameters.size(); + dataStream << (uint8_t)_iffParameters.size(); for (size_t idx = 0; idx < _iffParameters.size(); idx++) { IFFFundamentalParameterData x = _iffParameters[idx]; x.marshal(dataStream); @@ -212,7 +212,7 @@ int IFFPdu::getMarshalledSize() const { marshalSize + _secondaryOperationalData .getMarshalledSize(); // _secondaryOperationalData - for (unsigned long long idx = 0; idx < _iffParameters.size(); idx++) { + for (uint64_t idx = 0; idx < _iffParameters.size(); idx++) { IFFFundamentalParameterData listElement = _iffParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/IFFPdu.h b/src/dis7/IFFPdu.h index 2be64f5e..3e25ac90 100644 --- a/src/dis7/IFFPdu.h +++ b/src/dis7/IFFPdu.h @@ -34,13 +34,13 @@ class OPENDIS7_EXPORT IFFPdu : public DistributedEmissionsFamilyPdu { Vector3Float _relativeAntennaLocation; /** How many iff parameters are in the variable length list */ - unsigned int _numberOfIFFParameters; + uint32_t _numberOfIFFParameters; SystemIdentifier _systemID; - unsigned char _systemDesignator; + uint8_t _systemDesignator; - unsigned char _systemSpecificData; + uint8_t _systemSpecificData; FundamentalOperationalData _fundamentalOperationalData; @@ -71,17 +71,17 @@ class OPENDIS7_EXPORT IFFPdu : public DistributedEmissionsFamilyPdu { const Vector3Float& getRelativeAntennaLocation() const; void setRelativeAntennaLocation(const Vector3Float& pX); - unsigned int getNumberOfIFFParameters() const; + uint32_t getNumberOfIFFParameters() const; SystemIdentifier& getSystemID(); const SystemIdentifier& getSystemID() const; void setSystemID(const SystemIdentifier& pX); - unsigned char getSystemDesignator() const; - void setSystemDesignator(unsigned char pX); + uint8_t getSystemDesignator() const; + void setSystemDesignator(uint8_t pX); - unsigned char getSystemSpecificData() const; - void setSystemSpecificData(unsigned char pX); + uint8_t getSystemSpecificData() const; + void setSystemSpecificData(uint8_t pX); FundamentalOperationalData& getFundamentalOperationalData(); const FundamentalOperationalData& getFundamentalOperationalData() const; diff --git a/src/dis7/IOCommunicationsNode.cpp b/src/dis7/IOCommunicationsNode.cpp index 7c02612d..bbe1892f 100644 --- a/src/dis7/IOCommunicationsNode.cpp +++ b/src/dis7/IOCommunicationsNode.cpp @@ -12,29 +12,29 @@ IOCommunicationsNode::IOCommunicationsNode() IOCommunicationsNode::~IOCommunicationsNode() {} -unsigned int IOCommunicationsNode::getRecordType() const { return _recordType; } +uint32_t IOCommunicationsNode::getRecordType() const { return _recordType; } -void IOCommunicationsNode::setRecordType(unsigned int pX) { _recordType = pX; } +void IOCommunicationsNode::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short IOCommunicationsNode::getRecordLength() const { +uint16_t IOCommunicationsNode::getRecordLength() const { return _recordLength; } -void IOCommunicationsNode::setRecordLength(unsigned short pX) { +void IOCommunicationsNode::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned char IOCommunicationsNode::getCommuncationsNodeType() const { +uint8_t IOCommunicationsNode::getCommuncationsNodeType() const { return _communcationsNodeType; } -void IOCommunicationsNode::setCommuncationsNodeType(unsigned char pX) { +void IOCommunicationsNode::setCommuncationsNodeType(uint8_t pX) { _communcationsNodeType = pX; } -unsigned char IOCommunicationsNode::getPadding() const { return _padding; } +uint8_t IOCommunicationsNode::getPadding() const { return _padding; } -void IOCommunicationsNode::setPadding(unsigned char pX) { _padding = pX; } +void IOCommunicationsNode::setPadding(uint8_t pX) { _padding = pX; } EntityID& IOCommunicationsNode::getCommunicationsNode() { return _communicationsNode; @@ -48,9 +48,9 @@ void IOCommunicationsNode::setCommunicationsNode(const EntityID& pX) { _communicationsNode = pX; } -unsigned short IOCommunicationsNode::getElementID() const { return _elementID; } +uint16_t IOCommunicationsNode::getElementID() const { return _elementID; } -void IOCommunicationsNode::setElementID(unsigned short pX) { _elementID = pX; } +void IOCommunicationsNode::setElementID(uint16_t pX) { _elementID = pX; } void IOCommunicationsNode::marshal(DataStream& dataStream) const { dataStream << _recordType; diff --git a/src/dis7/IOCommunicationsNode.h b/src/dis7/IOCommunicationsNode.h index 8847d939..cc115f0e 100644 --- a/src/dis7/IOCommunicationsNode.h +++ b/src/dis7/IOCommunicationsNode.h @@ -15,17 +15,17 @@ namespace DIS { class OPENDIS7_EXPORT IOCommunicationsNode { protected: - unsigned int _recordType; + uint32_t _recordType; - unsigned short _recordLength; + uint16_t _recordLength; - unsigned char _communcationsNodeType; + uint8_t _communcationsNodeType; - unsigned char _padding; + uint8_t _padding; EntityID _communicationsNode; - unsigned short _elementID; + uint16_t _elementID; public: IOCommunicationsNode(); @@ -34,24 +34,24 @@ class OPENDIS7_EXPORT IOCommunicationsNode { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned char getCommuncationsNodeType() const; - void setCommuncationsNodeType(unsigned char pX); + uint8_t getCommuncationsNodeType() const; + void setCommuncationsNodeType(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); EntityID& getCommunicationsNode(); const EntityID& getCommunicationsNode() const; void setCommunicationsNode(const EntityID& pX); - unsigned short getElementID() const; - void setElementID(unsigned short pX); + uint16_t getElementID() const; + void setElementID(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/IOEffect.cpp b/src/dis7/IOEffect.cpp index 8a610b07..4f6c2340 100644 --- a/src/dis7/IOEffect.cpp +++ b/src/dis7/IOEffect.cpp @@ -15,21 +15,21 @@ IOEffect::IOEffect() IOEffect::~IOEffect() {} -unsigned int IOEffect::getRecordType() const { return _recordType; } +uint32_t IOEffect::getRecordType() const { return _recordType; } -void IOEffect::setRecordType(unsigned int pX) { _recordType = pX; } +void IOEffect::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned short IOEffect::getRecordLength() const { return _recordLength; } +uint16_t IOEffect::getRecordLength() const { return _recordLength; } -void IOEffect::setRecordLength(unsigned short pX) { _recordLength = pX; } +void IOEffect::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned char IOEffect::getIoStatus() const { return _ioStatus; } +uint8_t IOEffect::getIoStatus() const { return _ioStatus; } -void IOEffect::setIoStatus(unsigned char pX) { _ioStatus = pX; } +void IOEffect::setIoStatus(uint8_t pX) { _ioStatus = pX; } -unsigned char IOEffect::getIoLinkType() const { return _ioLinkType; } +uint8_t IOEffect::getIoLinkType() const { return _ioLinkType; } -void IOEffect::setIoLinkType(unsigned char pX) { _ioLinkType = pX; } +void IOEffect::setIoLinkType(uint8_t pX) { _ioLinkType = pX; } EntityID& IOEffect::getIoEffect() { return _ioEffect; } @@ -37,29 +37,29 @@ const EntityID& IOEffect::getIoEffect() const { return _ioEffect; } void IOEffect::setIoEffect(const EntityID& pX) { _ioEffect = pX; } -unsigned char IOEffect::getIoEffectDutyCycle() const { +uint8_t IOEffect::getIoEffectDutyCycle() const { return _ioEffectDutyCycle; } -void IOEffect::setIoEffectDutyCycle(unsigned char pX) { +void IOEffect::setIoEffectDutyCycle(uint8_t pX) { _ioEffectDutyCycle = pX; } -unsigned short IOEffect::getIoEffectDuration() const { +uint16_t IOEffect::getIoEffectDuration() const { return _ioEffectDuration; } -void IOEffect::setIoEffectDuration(unsigned short pX) { +void IOEffect::setIoEffectDuration(uint16_t pX) { _ioEffectDuration = pX; } -unsigned short IOEffect::getIoProcess() const { return _ioProcess; } +uint16_t IOEffect::getIoProcess() const { return _ioProcess; } -void IOEffect::setIoProcess(unsigned short pX) { _ioProcess = pX; } +void IOEffect::setIoProcess(uint16_t pX) { _ioProcess = pX; } -unsigned short IOEffect::getPadding() const { return _padding; } +uint16_t IOEffect::getPadding() const { return _padding; } -void IOEffect::setPadding(unsigned short pX) { _padding = pX; } +void IOEffect::setPadding(uint16_t pX) { _padding = pX; } void IOEffect::marshal(DataStream& dataStream) const { dataStream << _recordType; diff --git a/src/dis7/IOEffect.h b/src/dis7/IOEffect.h index 4c5a58e3..e0992904 100644 --- a/src/dis7/IOEffect.h +++ b/src/dis7/IOEffect.h @@ -14,23 +14,23 @@ namespace DIS { class OPENDIS7_EXPORT IOEffect { protected: - unsigned int _recordType; + uint32_t _recordType; - unsigned short _recordLength; + uint16_t _recordLength; - unsigned char _ioStatus; + uint8_t _ioStatus; - unsigned char _ioLinkType; + uint8_t _ioLinkType; EntityID _ioEffect; - unsigned char _ioEffectDutyCycle; + uint8_t _ioEffectDutyCycle; - unsigned short _ioEffectDuration; + uint16_t _ioEffectDuration; - unsigned short _ioProcess; + uint16_t _ioProcess; - unsigned short _padding; + uint16_t _padding; public: IOEffect(); @@ -39,33 +39,33 @@ class OPENDIS7_EXPORT IOEffect { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned char getIoStatus() const; - void setIoStatus(unsigned char pX); + uint8_t getIoStatus() const; + void setIoStatus(uint8_t pX); - unsigned char getIoLinkType() const; - void setIoLinkType(unsigned char pX); + uint8_t getIoLinkType() const; + void setIoLinkType(uint8_t pX); EntityID& getIoEffect(); const EntityID& getIoEffect() const; void setIoEffect(const EntityID& pX); - unsigned char getIoEffectDutyCycle() const; - void setIoEffectDutyCycle(unsigned char pX); + uint8_t getIoEffectDutyCycle() const; + void setIoEffectDutyCycle(uint8_t pX); - unsigned short getIoEffectDuration() const; - void setIoEffectDuration(unsigned short pX); + uint16_t getIoEffectDuration() const; + void setIoEffectDuration(uint16_t pX); - unsigned short getIoProcess() const; - void setIoProcess(unsigned short pX); + uint16_t getIoProcess() const; + void setIoProcess(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/IntercomCommunicationsParameters.cpp b/src/dis7/IntercomCommunicationsParameters.cpp index a34d7ce1..4f64868e 100644 --- a/src/dis7/IntercomCommunicationsParameters.cpp +++ b/src/dis7/IntercomCommunicationsParameters.cpp @@ -7,27 +7,27 @@ IntercomCommunicationsParameters::IntercomCommunicationsParameters() IntercomCommunicationsParameters::~IntercomCommunicationsParameters() {} -unsigned short IntercomCommunicationsParameters::getRecordType() const { +uint16_t IntercomCommunicationsParameters::getRecordType() const { return _recordType; } -void IntercomCommunicationsParameters::setRecordType(unsigned short pX) { +void IntercomCommunicationsParameters::setRecordType(uint16_t pX) { _recordType = pX; } -unsigned short IntercomCommunicationsParameters::getRecordLength() const { +uint16_t IntercomCommunicationsParameters::getRecordLength() const { return _recordLength; } -void IntercomCommunicationsParameters::setRecordLength(unsigned short pX) { +void IntercomCommunicationsParameters::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned int IntercomCommunicationsParameters::getRecordSpecificField() const { +uint32_t IntercomCommunicationsParameters::getRecordSpecificField() const { return _recordSpecificField; } -void IntercomCommunicationsParameters::setRecordSpecificField(unsigned int pX) { +void IntercomCommunicationsParameters::setRecordSpecificField(uint32_t pX) { _recordSpecificField = pX; } diff --git a/src/dis7/IntercomCommunicationsParameters.h b/src/dis7/IntercomCommunicationsParameters.h index 3b4d2b43..fb7eea52 100644 --- a/src/dis7/IntercomCommunicationsParameters.h +++ b/src/dis7/IntercomCommunicationsParameters.h @@ -14,13 +14,13 @@ namespace DIS { class OPENDIS7_EXPORT IntercomCommunicationsParameters { protected: /** Type of intercom parameters record */ - unsigned short _recordType; + uint16_t _recordType; /** length of record */ - unsigned short _recordLength; + uint16_t _recordLength; /** This is a placeholder. */ - unsigned int _recordSpecificField; + uint32_t _recordSpecificField; public: IntercomCommunicationsParameters(); @@ -29,14 +29,14 @@ class OPENDIS7_EXPORT IntercomCommunicationsParameters { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getRecordType() const; - void setRecordType(unsigned short pX); + uint16_t getRecordType() const; + void setRecordType(uint16_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned int getRecordSpecificField() const; - void setRecordSpecificField(unsigned int pX); + uint32_t getRecordSpecificField() const; + void setRecordSpecificField(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/IntercomIdentifier.cpp b/src/dis7/IntercomIdentifier.cpp index 5014038b..d3c5537f 100644 --- a/src/dis7/IntercomIdentifier.cpp +++ b/src/dis7/IntercomIdentifier.cpp @@ -10,31 +10,31 @@ IntercomIdentifier::IntercomIdentifier() IntercomIdentifier::~IntercomIdentifier() {} -unsigned short IntercomIdentifier::getSiteNumber() const { return _siteNumber; } +uint16_t IntercomIdentifier::getSiteNumber() const { return _siteNumber; } -void IntercomIdentifier::setSiteNumber(unsigned short pX) { _siteNumber = pX; } +void IntercomIdentifier::setSiteNumber(uint16_t pX) { _siteNumber = pX; } -unsigned short IntercomIdentifier::getApplicationNumber() const { +uint16_t IntercomIdentifier::getApplicationNumber() const { return _applicationNumber; } -void IntercomIdentifier::setApplicationNumber(unsigned short pX) { +void IntercomIdentifier::setApplicationNumber(uint16_t pX) { _applicationNumber = pX; } -unsigned short IntercomIdentifier::getReferenceNumber() const { +uint16_t IntercomIdentifier::getReferenceNumber() const { return _referenceNumber; } -void IntercomIdentifier::setReferenceNumber(unsigned short pX) { +void IntercomIdentifier::setReferenceNumber(uint16_t pX) { _referenceNumber = pX; } -unsigned short IntercomIdentifier::getIntercomNumber() const { +uint16_t IntercomIdentifier::getIntercomNumber() const { return _intercomNumber; } -void IntercomIdentifier::setIntercomNumber(unsigned short pX) { +void IntercomIdentifier::setIntercomNumber(uint16_t pX) { _intercomNumber = pX; } diff --git a/src/dis7/IntercomIdentifier.h b/src/dis7/IntercomIdentifier.h index d614eeb8..60718d30 100644 --- a/src/dis7/IntercomIdentifier.h +++ b/src/dis7/IntercomIdentifier.h @@ -14,13 +14,13 @@ namespace DIS { class OPENDIS7_EXPORT IntercomIdentifier { protected: - unsigned short _siteNumber; + uint16_t _siteNumber; - unsigned short _applicationNumber; + uint16_t _applicationNumber; - unsigned short _referenceNumber; + uint16_t _referenceNumber; - unsigned short _intercomNumber; + uint16_t _intercomNumber; public: IntercomIdentifier(); @@ -29,17 +29,17 @@ class OPENDIS7_EXPORT IntercomIdentifier { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSiteNumber() const; - void setSiteNumber(unsigned short pX); + uint16_t getSiteNumber() const; + void setSiteNumber(uint16_t pX); - unsigned short getApplicationNumber() const; - void setApplicationNumber(unsigned short pX); + uint16_t getApplicationNumber() const; + void setApplicationNumber(uint16_t pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + uint16_t getReferenceNumber() const; + void setReferenceNumber(uint16_t pX); - unsigned short getIntercomNumber() const; - void setIntercomNumber(unsigned short pX); + uint16_t getIntercomNumber() const; + void setIntercomNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/IntercomSignalPdu.cpp b/src/dis7/IntercomSignalPdu.cpp index c3ad997f..d38e3b73 100644 --- a/src/dis7/IntercomSignalPdu.cpp +++ b/src/dis7/IntercomSignalPdu.cpp @@ -22,35 +22,35 @@ const EntityID& IntercomSignalPdu::getEntityID() const { return _entityID; } void IntercomSignalPdu::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned short IntercomSignalPdu::getCommunicationsDeviceID() const { +uint16_t IntercomSignalPdu::getCommunicationsDeviceID() const { return _communicationsDeviceID; } -void IntercomSignalPdu::setCommunicationsDeviceID(unsigned short pX) { +void IntercomSignalPdu::setCommunicationsDeviceID(uint16_t pX) { _communicationsDeviceID = pX; } -unsigned short IntercomSignalPdu::getEncodingScheme() const { +uint16_t IntercomSignalPdu::getEncodingScheme() const { return _encodingScheme; } -void IntercomSignalPdu::setEncodingScheme(unsigned short pX) { +void IntercomSignalPdu::setEncodingScheme(uint16_t pX) { _encodingScheme = pX; } -unsigned short IntercomSignalPdu::getTdlType() const { return _tdlType; } +uint16_t IntercomSignalPdu::getTdlType() const { return _tdlType; } -void IntercomSignalPdu::setTdlType(unsigned short pX) { _tdlType = pX; } +void IntercomSignalPdu::setTdlType(uint16_t pX) { _tdlType = pX; } -unsigned int IntercomSignalPdu::getSampleRate() const { return _sampleRate; } +uint32_t IntercomSignalPdu::getSampleRate() const { return _sampleRate; } -void IntercomSignalPdu::setSampleRate(unsigned int pX) { _sampleRate = pX; } +void IntercomSignalPdu::setSampleRate(uint32_t pX) { _sampleRate = pX; } -unsigned short IntercomSignalPdu::getDataLength() const { return _data.size(); } +uint16_t IntercomSignalPdu::getDataLength() const { return _data.size(); } -unsigned short IntercomSignalPdu::getSamples() const { return _samples; } +uint16_t IntercomSignalPdu::getSamples() const { return _samples; } -void IntercomSignalPdu::setSamples(unsigned short pX) { _samples = pX; } +void IntercomSignalPdu::setSamples(uint16_t pX) { _samples = pX; } std::vector& IntercomSignalPdu::getData() { return _data; } @@ -66,7 +66,7 @@ void IntercomSignalPdu::marshal(DataStream& dataStream) const { dataStream << _encodingScheme; dataStream << _tdlType; dataStream << _sampleRate; - dataStream << (unsigned short)_data.size(); + dataStream << (uint16_t)_data.size(); dataStream << _samples; for (auto& byte : _data) { diff --git a/src/dis7/IntercomSignalPdu.h b/src/dis7/IntercomSignalPdu.h index 63f5b27b..815a5822 100644 --- a/src/dis7/IntercomSignalPdu.h +++ b/src/dis7/IntercomSignalPdu.h @@ -21,22 +21,22 @@ class OPENDIS7_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { EntityID _entityID; /** ID of communications device */ - unsigned short _communicationsDeviceID; + uint16_t _communicationsDeviceID; /** encoding scheme */ - unsigned short _encodingScheme; + uint16_t _encodingScheme; /** tactical data link type */ - unsigned short _tdlType; + uint16_t _tdlType; /** sample rate */ - unsigned int _sampleRate; + uint32_t _sampleRate; /** data length */ - unsigned short _dataLength; + uint16_t _dataLength; /** samples */ - unsigned short _samples; + uint16_t _samples; /** data bytes */ std::vector _data; @@ -52,22 +52,22 @@ class OPENDIS7_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { const EntityID& getEntityID() const; void setEntityID(const EntityID& pX); - unsigned short getCommunicationsDeviceID() const; - void setCommunicationsDeviceID(unsigned short pX); + uint16_t getCommunicationsDeviceID() const; + void setCommunicationsDeviceID(uint16_t pX); - unsigned short getEncodingScheme() const; - void setEncodingScheme(unsigned short pX); + uint16_t getEncodingScheme() const; + void setEncodingScheme(uint16_t pX); - unsigned short getTdlType() const; - void setTdlType(unsigned short pX); + uint16_t getTdlType() const; + void setTdlType(uint16_t pX); - unsigned int getSampleRate() const; - void setSampleRate(unsigned int pX); + uint32_t getSampleRate() const; + void setSampleRate(uint32_t pX); - unsigned short getDataLength() const; + uint16_t getDataLength() const; - unsigned short getSamples() const; - void setSamples(unsigned short pX); + uint16_t getSamples() const; + void setSamples(uint16_t pX); std::vector& getData(); const std::vector& getData() const; diff --git a/src/dis7/JammingTechnique.cpp b/src/dis7/JammingTechnique.cpp index 7e5304f2..115ae27b 100644 --- a/src/dis7/JammingTechnique.cpp +++ b/src/dis7/JammingTechnique.cpp @@ -7,21 +7,21 @@ JammingTechnique::JammingTechnique() JammingTechnique::~JammingTechnique() {} -unsigned char JammingTechnique::getKind() const { return _kind; } +uint8_t JammingTechnique::getKind() const { return _kind; } -void JammingTechnique::setKind(unsigned char pX) { _kind = pX; } +void JammingTechnique::setKind(uint8_t pX) { _kind = pX; } -unsigned char JammingTechnique::getCategory() const { return _category; } +uint8_t JammingTechnique::getCategory() const { return _category; } -void JammingTechnique::setCategory(unsigned char pX) { _category = pX; } +void JammingTechnique::setCategory(uint8_t pX) { _category = pX; } -unsigned char JammingTechnique::getSubcategory() const { return _subcategory; } +uint8_t JammingTechnique::getSubcategory() const { return _subcategory; } -void JammingTechnique::setSubcategory(unsigned char pX) { _subcategory = pX; } +void JammingTechnique::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char JammingTechnique::getSpecific() const { return _specific; } +uint8_t JammingTechnique::getSpecific() const { return _specific; } -void JammingTechnique::setSpecific(unsigned char pX) { _specific = pX; } +void JammingTechnique::setSpecific(uint8_t pX) { _specific = pX; } void JammingTechnique::marshal(DataStream& dataStream) const { dataStream << _kind; diff --git a/src/dis7/JammingTechnique.h b/src/dis7/JammingTechnique.h index 5700bb7d..d8fa5be7 100644 --- a/src/dis7/JammingTechnique.h +++ b/src/dis7/JammingTechnique.h @@ -13,13 +13,13 @@ namespace DIS { class OPENDIS7_EXPORT JammingTechnique { protected: - unsigned char _kind; + uint8_t _kind; - unsigned char _category; + uint8_t _category; - unsigned char _subcategory; + uint8_t _subcategory; - unsigned char _specific; + uint8_t _specific; public: JammingTechnique(); @@ -28,17 +28,17 @@ class OPENDIS7_EXPORT JammingTechnique { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getKind() const; - void setKind(unsigned char pX); + uint8_t getKind() const; + void setKind(uint8_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/LaunchedMunitionRecord.cpp b/src/dis7/LaunchedMunitionRecord.cpp index cb7d8508..4c225f1d 100644 --- a/src/dis7/LaunchedMunitionRecord.cpp +++ b/src/dis7/LaunchedMunitionRecord.cpp @@ -25,9 +25,9 @@ void LaunchedMunitionRecord::setFireEventID(const EventIdentifier& pX) { _fireEventID = pX; } -unsigned short LaunchedMunitionRecord::getPadding() const { return _padding; } +uint16_t LaunchedMunitionRecord::getPadding() const { return _padding; } -void LaunchedMunitionRecord::setPadding(unsigned short pX) { _padding = pX; } +void LaunchedMunitionRecord::setPadding(uint16_t pX) { _padding = pX; } EventIdentifier& LaunchedMunitionRecord::getFiringEntityID() { return _firingEntityID; @@ -41,9 +41,9 @@ void LaunchedMunitionRecord::setFiringEntityID(const EventIdentifier& pX) { _firingEntityID = pX; } -unsigned short LaunchedMunitionRecord::getPadding2() const { return _padding2; } +uint16_t LaunchedMunitionRecord::getPadding2() const { return _padding2; } -void LaunchedMunitionRecord::setPadding2(unsigned short pX) { _padding2 = pX; } +void LaunchedMunitionRecord::setPadding2(uint16_t pX) { _padding2 = pX; } EventIdentifier& LaunchedMunitionRecord::getTargetEntityID() { return _targetEntityID; @@ -57,9 +57,9 @@ void LaunchedMunitionRecord::setTargetEntityID(const EventIdentifier& pX) { _targetEntityID = pX; } -unsigned short LaunchedMunitionRecord::getPadding3() const { return _padding3; } +uint16_t LaunchedMunitionRecord::getPadding3() const { return _padding3; } -void LaunchedMunitionRecord::setPadding3(unsigned short pX) { _padding3 = pX; } +void LaunchedMunitionRecord::setPadding3(uint16_t pX) { _padding3 = pX; } Vector3Double& LaunchedMunitionRecord::getTargetLocation() { return _targetLocation; diff --git a/src/dis7/LaunchedMunitionRecord.h b/src/dis7/LaunchedMunitionRecord.h index 85481693..d7c96b53 100644 --- a/src/dis7/LaunchedMunitionRecord.h +++ b/src/dis7/LaunchedMunitionRecord.h @@ -17,15 +17,15 @@ class OPENDIS7_EXPORT LaunchedMunitionRecord { protected: EventIdentifier _fireEventID; - unsigned short _padding; + uint16_t _padding; EventIdentifier _firingEntityID; - unsigned short _padding2; + uint16_t _padding2; EventIdentifier _targetEntityID; - unsigned short _padding3; + uint16_t _padding3; Vector3Double _targetLocation; @@ -40,22 +40,22 @@ class OPENDIS7_EXPORT LaunchedMunitionRecord { const EventIdentifier& getFireEventID() const; void setFireEventID(const EventIdentifier& pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); EventIdentifier& getFiringEntityID(); const EventIdentifier& getFiringEntityID() const; void setFiringEntityID(const EventIdentifier& pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + uint16_t getPadding2() const; + void setPadding2(uint16_t pX); EventIdentifier& getTargetEntityID(); const EventIdentifier& getTargetEntityID() const; void setTargetEntityID(const EventIdentifier& pX); - unsigned short getPadding3() const; - void setPadding3(unsigned short pX); + uint16_t getPadding3() const; + void setPadding3(uint16_t pX); Vector3Double& getTargetLocation(); const Vector3Double& getTargetLocation() const; diff --git a/src/dis7/LayerHeader.cpp b/src/dis7/LayerHeader.cpp index cef00e38..bfca331a 100644 --- a/src/dis7/LayerHeader.cpp +++ b/src/dis7/LayerHeader.cpp @@ -7,21 +7,21 @@ LayerHeader::LayerHeader() LayerHeader::~LayerHeader() {} -unsigned char LayerHeader::getLayerNumber() const { return _layerNumber; } +uint8_t LayerHeader::getLayerNumber() const { return _layerNumber; } -void LayerHeader::setLayerNumber(unsigned char pX) { _layerNumber = pX; } +void LayerHeader::setLayerNumber(uint8_t pX) { _layerNumber = pX; } -unsigned char LayerHeader::getLayerSpecificInformation() const { +uint8_t LayerHeader::getLayerSpecificInformation() const { return _layerSpecificInformation; } -void LayerHeader::setLayerSpecificInformation(unsigned char pX) { +void LayerHeader::setLayerSpecificInformation(uint8_t pX) { _layerSpecificInformation = pX; } -unsigned short LayerHeader::getLength() const { return _length; } +uint16_t LayerHeader::getLength() const { return _length; } -void LayerHeader::setLength(unsigned short pX) { _length = pX; } +void LayerHeader::setLength(uint16_t pX) { _length = pX; } void LayerHeader::marshal(DataStream& dataStream) const { dataStream << _layerNumber; diff --git a/src/dis7/LayerHeader.h b/src/dis7/LayerHeader.h index 8f761341..1766d8f6 100644 --- a/src/dis7/LayerHeader.h +++ b/src/dis7/LayerHeader.h @@ -14,15 +14,15 @@ namespace DIS { class OPENDIS7_EXPORT LayerHeader { protected: - unsigned char _layerNumber; + uint8_t _layerNumber; /** field shall specify layer-specific information that varies by System Type * (see 6.2.86) and Layer Number. */ - unsigned char _layerSpecificInformation; + uint8_t _layerSpecificInformation; /** This field shall specify the length in octets of the layer, including the * Layer Header record */ - unsigned short _length; + uint16_t _length; public: LayerHeader(); @@ -31,14 +31,14 @@ class OPENDIS7_EXPORT LayerHeader { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getLayerNumber() const; - void setLayerNumber(unsigned char pX); + uint8_t getLayerNumber() const; + void setLayerNumber(uint8_t pX); - unsigned char getLayerSpecificInformation() const; - void setLayerSpecificInformation(unsigned char pX); + uint8_t getLayerSpecificInformation() const; + void setLayerSpecificInformation(uint8_t pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + uint16_t getLength() const; + void setLength(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/LinearObjectStatePdu.cpp b/src/dis7/LinearObjectStatePdu.cpp index ceedf689..869d7582 100644 --- a/src/dis7/LinearObjectStatePdu.cpp +++ b/src/dis7/LinearObjectStatePdu.cpp @@ -37,19 +37,19 @@ void LinearObjectStatePdu::setReferencedObjectID(const EntityID& pX) { _referencedObjectID = pX; } -unsigned short LinearObjectStatePdu::getUpdateNumber() const { +uint16_t LinearObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void LinearObjectStatePdu::setUpdateNumber(unsigned short pX) { +void LinearObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } -unsigned char LinearObjectStatePdu::getForceID() const { return _forceID; } +uint8_t LinearObjectStatePdu::getForceID() const { return _forceID; } -void LinearObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void LinearObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char LinearObjectStatePdu::getNumberOfSegments() const { +uint8_t LinearObjectStatePdu::getNumberOfSegments() const { return _linearSegmentParameters.size(); } @@ -109,7 +109,7 @@ void LinearObjectStatePdu::marshal(DataStream& dataStream) const { _referencedObjectID.marshal(dataStream); dataStream << _updateNumber; dataStream << _forceID; - dataStream << (unsigned char)_linearSegmentParameters.size(); + dataStream << (uint8_t)_linearSegmentParameters.size(); _requesterID.marshal(dataStream); _receivingID.marshal(dataStream); _objectType.marshal(dataStream); @@ -175,7 +175,7 @@ int LinearObjectStatePdu::getMarshalledSize() const { marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - for (unsigned long long idx = 0; idx < _linearSegmentParameters.size(); + for (uint64_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { LinearSegmentParameter listElement = _linearSegmentParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis7/LinearObjectStatePdu.h b/src/dis7/LinearObjectStatePdu.h index 0732792a..66939c4b 100644 --- a/src/dis7/LinearObjectStatePdu.h +++ b/src/dis7/LinearObjectStatePdu.h @@ -30,13 +30,13 @@ class OPENDIS7_EXPORT LinearObjectStatePdu EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + uint16_t _updateNumber; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** number of linear segment parameters */ - unsigned char _numberOfSegments; + uint8_t _numberOfSegments; /** requesterID */ SimulationAddress _requesterID; @@ -65,13 +65,13 @@ class OPENDIS7_EXPORT LinearObjectStatePdu const EntityID& getReferencedObjectID() const; void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + uint16_t getUpdateNumber() const; + void setUpdateNumber(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getNumberOfSegments() const; + uint8_t getNumberOfSegments() const; SimulationAddress& getRequesterID(); const SimulationAddress& getRequesterID() const; diff --git a/src/dis7/LinearSegmentParameter.cpp b/src/dis7/LinearSegmentParameter.cpp index 97358427..b2277735 100644 --- a/src/dis7/LinearSegmentParameter.cpp +++ b/src/dis7/LinearSegmentParameter.cpp @@ -16,35 +16,35 @@ LinearSegmentParameter::LinearSegmentParameter() LinearSegmentParameter::~LinearSegmentParameter() {} -unsigned char LinearSegmentParameter::getSegmentNumber() const { +uint8_t LinearSegmentParameter::getSegmentNumber() const { return _segmentNumber; } -void LinearSegmentParameter::setSegmentNumber(unsigned char pX) { +void LinearSegmentParameter::setSegmentNumber(uint8_t pX) { _segmentNumber = pX; } -unsigned char LinearSegmentParameter::getSegmentModification() const { +uint8_t LinearSegmentParameter::getSegmentModification() const { return _segmentModification; } -void LinearSegmentParameter::setSegmentModification(unsigned char pX) { +void LinearSegmentParameter::setSegmentModification(uint8_t pX) { _segmentModification = pX; } -unsigned short LinearSegmentParameter::getGeneralSegmentAppearance() const { +uint16_t LinearSegmentParameter::getGeneralSegmentAppearance() const { return _generalSegmentAppearance; } -void LinearSegmentParameter::setGeneralSegmentAppearance(unsigned short pX) { +void LinearSegmentParameter::setGeneralSegmentAppearance(uint16_t pX) { _generalSegmentAppearance = pX; } -unsigned short LinearSegmentParameter::getSpecificSegmentAppearance() const { +uint16_t LinearSegmentParameter::getSpecificSegmentAppearance() const { return _specificSegmentAppearance; } -void LinearSegmentParameter::setSpecificSegmentAppearance(unsigned short pX) { +void LinearSegmentParameter::setSpecificSegmentAppearance(uint16_t pX) { _specificSegmentAppearance = pX; } @@ -72,35 +72,35 @@ void LinearSegmentParameter::setSegmentOrientation(const EulerAngles& pX) { _segmentOrientation = pX; } -unsigned short LinearSegmentParameter::getSegmentLength() const { +uint16_t LinearSegmentParameter::getSegmentLength() const { return _segmentLength; } -void LinearSegmentParameter::setSegmentLength(unsigned short pX) { +void LinearSegmentParameter::setSegmentLength(uint16_t pX) { _segmentLength = pX; } -unsigned short LinearSegmentParameter::getSegmentWidth() const { +uint16_t LinearSegmentParameter::getSegmentWidth() const { return _segmentWidth; } -void LinearSegmentParameter::setSegmentWidth(unsigned short pX) { +void LinearSegmentParameter::setSegmentWidth(uint16_t pX) { _segmentWidth = pX; } -unsigned short LinearSegmentParameter::getSegmentHeight() const { +uint16_t LinearSegmentParameter::getSegmentHeight() const { return _segmentHeight; } -void LinearSegmentParameter::setSegmentHeight(unsigned short pX) { +void LinearSegmentParameter::setSegmentHeight(uint16_t pX) { _segmentHeight = pX; } -unsigned short LinearSegmentParameter::getSegmentDepth() const { +uint16_t LinearSegmentParameter::getSegmentDepth() const { return _segmentDepth; } -void LinearSegmentParameter::setSegmentDepth(unsigned short pX) { +void LinearSegmentParameter::setSegmentDepth(uint16_t pX) { _segmentDepth = pX; } diff --git a/src/dis7/LinearSegmentParameter.h b/src/dis7/LinearSegmentParameter.h index 4dc73ac1..ce12e48a 100644 --- a/src/dis7/LinearSegmentParameter.h +++ b/src/dis7/LinearSegmentParameter.h @@ -17,21 +17,21 @@ namespace DIS { class OPENDIS7_EXPORT LinearSegmentParameter { protected: /** the individual segment of the linear segment */ - unsigned char _segmentNumber; + uint8_t _segmentNumber; /** whether a modification has been made to the point object’s location or * orientation */ - unsigned char _segmentModification; + uint8_t _segmentModification; /** general dynamic appearance attributes of the segment. This record shall be * defined as a 16-bit record of enumerations. The values defined for this * record are included in Section 12 of SISO-REF-010. */ - unsigned short _generalSegmentAppearance; + uint16_t _generalSegmentAppearance; /** This field shall specify specific dynamic appearance attributes of the * segment. This record shall be defined as a 32-bit record of enumerations. */ - unsigned short _specificSegmentAppearance; + uint16_t _specificSegmentAppearance; /** This field shall specify the location of the linear segment in the * simulated world and shall be represented by a World Coordinates record */ @@ -43,20 +43,20 @@ class OPENDIS7_EXPORT LinearSegmentParameter { /** length of the linear segment, in meters, extending in the positive X * direction */ - unsigned short _segmentLength; + uint16_t _segmentLength; /** The total width of the linear segment, in meters, shall be specified by a - * 16-bit unsigned integer. One-half of the width shall extend in the positive + * 16-bit uint32_teger. One-half of the width shall extend in the positive * Y direction, and one-half of the width shall extend in the negative Y * direction. */ - unsigned short _segmentWidth; + uint16_t _segmentWidth; /** The height of the linear segment, in meters, above ground shall be - * specified by a 16-bit unsigned integer. */ - unsigned short _segmentHeight; + * specified by a 16-bit uint32_teger. */ + uint16_t _segmentHeight; /** The depth of the linear segment, in meters, below ground level */ - unsigned short _segmentDepth; + uint16_t _segmentDepth; public: LinearSegmentParameter(); @@ -65,17 +65,17 @@ class OPENDIS7_EXPORT LinearSegmentParameter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getSegmentNumber() const; - void setSegmentNumber(unsigned char pX); + uint8_t getSegmentNumber() const; + void setSegmentNumber(uint8_t pX); - unsigned char getSegmentModification() const; - void setSegmentModification(unsigned char pX); + uint8_t getSegmentModification() const; + void setSegmentModification(uint8_t pX); - unsigned short getGeneralSegmentAppearance() const; - void setGeneralSegmentAppearance(unsigned short pX); + uint16_t getGeneralSegmentAppearance() const; + void setGeneralSegmentAppearance(uint16_t pX); - unsigned short getSpecificSegmentAppearance() const; - void setSpecificSegmentAppearance(unsigned short pX); + uint16_t getSpecificSegmentAppearance() const; + void setSpecificSegmentAppearance(uint16_t pX); Vector3Double& getSegmentLocation(); const Vector3Double& getSegmentLocation() const; @@ -85,17 +85,17 @@ class OPENDIS7_EXPORT LinearSegmentParameter { const EulerAngles& getSegmentOrientation() const; void setSegmentOrientation(const EulerAngles& pX); - unsigned short getSegmentLength() const; - void setSegmentLength(unsigned short pX); + uint16_t getSegmentLength() const; + void setSegmentLength(uint16_t pX); - unsigned short getSegmentWidth() const; - void setSegmentWidth(unsigned short pX); + uint16_t getSegmentWidth() const; + void setSegmentWidth(uint16_t pX); - unsigned short getSegmentHeight() const; - void setSegmentHeight(unsigned short pX); + uint16_t getSegmentHeight() const; + void setSegmentHeight(uint16_t pX); - unsigned short getSegmentDepth() const; - void setSegmentDepth(unsigned short pX); + uint16_t getSegmentDepth() const; + void setSegmentDepth(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/LiveEntityIdentifier.cpp b/src/dis7/LiveEntityIdentifier.cpp index 79292270..9197bc64 100644 --- a/src/dis7/LiveEntityIdentifier.cpp +++ b/src/dis7/LiveEntityIdentifier.cpp @@ -21,11 +21,11 @@ void LiveEntityIdentifier::setLiveSimulationAddress( _liveSimulationAddress = pX; } -unsigned short LiveEntityIdentifier::getEntityNumber() const { +uint16_t LiveEntityIdentifier::getEntityNumber() const { return _entityNumber; } -void LiveEntityIdentifier::setEntityNumber(unsigned short pX) { +void LiveEntityIdentifier::setEntityNumber(uint16_t pX) { _entityNumber = pX; } diff --git a/src/dis7/LiveEntityIdentifier.h b/src/dis7/LiveEntityIdentifier.h index 4976c007..dbd7cbb5 100644 --- a/src/dis7/LiveEntityIdentifier.h +++ b/src/dis7/LiveEntityIdentifier.h @@ -19,7 +19,7 @@ class OPENDIS7_EXPORT LiveEntityIdentifier { LiveSimulationAddress _liveSimulationAddress; /** Live entity number */ - unsigned short _entityNumber; + uint16_t _entityNumber; public: LiveEntityIdentifier(); @@ -32,8 +32,8 @@ class OPENDIS7_EXPORT LiveEntityIdentifier { const LiveSimulationAddress& getLiveSimulationAddress() const; void setLiveSimulationAddress(const LiveSimulationAddress& pX); - unsigned short getEntityNumber() const; - void setEntityNumber(unsigned short pX); + uint16_t getEntityNumber() const; + void setEntityNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/LiveEntityPdu.cpp b/src/dis7/LiveEntityPdu.cpp index 08ea2268..56be7710 100644 --- a/src/dis7/LiveEntityPdu.cpp +++ b/src/dis7/LiveEntityPdu.cpp @@ -7,17 +7,17 @@ LiveEntityPdu::LiveEntityPdu() LiveEntityPdu::~LiveEntityPdu() {} -unsigned short LiveEntityPdu::getSubprotocolNumber() const { +uint16_t LiveEntityPdu::getSubprotocolNumber() const { return _subprotocolNumber; } -void LiveEntityPdu::setSubprotocolNumber(unsigned short pX) { +void LiveEntityPdu::setSubprotocolNumber(uint16_t pX) { _subprotocolNumber = pX; } -unsigned char LiveEntityPdu::getPadding() const { return _padding; } +uint8_t LiveEntityPdu::getPadding() const { return _padding; } -void LiveEntityPdu::setPadding(unsigned char pX) { _padding = pX; } +void LiveEntityPdu::setPadding(uint8_t pX) { _padding = pX; } void LiveEntityPdu::marshal(DataStream& dataStream) const { PduSuperclass::marshal( diff --git a/src/dis7/LiveEntityPdu.h b/src/dis7/LiveEntityPdu.h index a960faa1..103d7674 100644 --- a/src/dis7/LiveEntityPdu.h +++ b/src/dis7/LiveEntityPdu.h @@ -16,10 +16,10 @@ namespace DIS { class OPENDIS7_EXPORT LiveEntityPdu : public PduSuperclass { protected: /** Subprotocol used to decode the PDU. Section 13 of EBV. */ - unsigned short _subprotocolNumber; + uint16_t _subprotocolNumber; /** zero-filled array of padding */ - unsigned char _padding; + uint8_t _padding; public: LiveEntityPdu(); @@ -28,11 +28,11 @@ class OPENDIS7_EXPORT LiveEntityPdu : public PduSuperclass { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSubprotocolNumber() const; - void setSubprotocolNumber(unsigned short pX); + uint16_t getSubprotocolNumber() const; + void setSubprotocolNumber(uint16_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/LiveSimulationAddress.cpp b/src/dis7/LiveSimulationAddress.cpp index e4162f38..74eaa255 100644 --- a/src/dis7/LiveSimulationAddress.cpp +++ b/src/dis7/LiveSimulationAddress.cpp @@ -7,19 +7,19 @@ LiveSimulationAddress::LiveSimulationAddress() LiveSimulationAddress::~LiveSimulationAddress() {} -unsigned char LiveSimulationAddress::getLiveSiteNumber() const { +uint8_t LiveSimulationAddress::getLiveSiteNumber() const { return _liveSiteNumber; } -void LiveSimulationAddress::setLiveSiteNumber(unsigned char pX) { +void LiveSimulationAddress::setLiveSiteNumber(uint8_t pX) { _liveSiteNumber = pX; } -unsigned short LiveSimulationAddress::getLiveApplicationNumber() const { +uint16_t LiveSimulationAddress::getLiveApplicationNumber() const { return _liveApplicationNumber; } -void LiveSimulationAddress::setLiveApplicationNumber(unsigned short pX) { +void LiveSimulationAddress::setLiveApplicationNumber(uint16_t pX) { _liveApplicationNumber = pX; } diff --git a/src/dis7/LiveSimulationAddress.h b/src/dis7/LiveSimulationAddress.h index a23f0691..4c9b270e 100644 --- a/src/dis7/LiveSimulationAddress.h +++ b/src/dis7/LiveSimulationAddress.h @@ -18,11 +18,11 @@ class OPENDIS7_EXPORT LiveSimulationAddress { * have multiple sites associated with it. The Site Number is the first * component of the Live Simulation Address, which defines a live simulation. */ - unsigned char _liveSiteNumber; + uint8_t _liveSiteNumber; /** An application associated with a live site is termed a live application. * Each live application participating in an event */ - unsigned short _liveApplicationNumber; + uint16_t _liveApplicationNumber; public: LiveSimulationAddress(); @@ -31,11 +31,11 @@ class OPENDIS7_EXPORT LiveSimulationAddress { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getLiveSiteNumber() const; - void setLiveSiteNumber(unsigned char pX); + uint8_t getLiveSiteNumber() const; + void setLiveSiteNumber(uint8_t pX); - unsigned short getLiveApplicationNumber() const; - void setLiveApplicationNumber(unsigned short pX); + uint16_t getLiveApplicationNumber() const; + void setLiveApplicationNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/MineEntityIdentifier.cpp b/src/dis7/MineEntityIdentifier.cpp index f540b891..bbb1a053 100644 --- a/src/dis7/MineEntityIdentifier.cpp +++ b/src/dis7/MineEntityIdentifier.cpp @@ -19,11 +19,11 @@ void MineEntityIdentifier::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short MineEntityIdentifier::getMineEntityNumber() const { +uint16_t MineEntityIdentifier::getMineEntityNumber() const { return _mineEntityNumber; } -void MineEntityIdentifier::setMineEntityNumber(unsigned short pX) { +void MineEntityIdentifier::setMineEntityNumber(uint16_t pX) { _mineEntityNumber = pX; } diff --git a/src/dis7/MineEntityIdentifier.h b/src/dis7/MineEntityIdentifier.h index b509e706..2d3bb65e 100644 --- a/src/dis7/MineEntityIdentifier.h +++ b/src/dis7/MineEntityIdentifier.h @@ -19,7 +19,7 @@ class OPENDIS7_EXPORT MineEntityIdentifier { SimulationAddress _simulationAddress; /** */ - unsigned short _mineEntityNumber; + uint16_t _mineEntityNumber; public: MineEntityIdentifier(); @@ -32,8 +32,8 @@ class OPENDIS7_EXPORT MineEntityIdentifier { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getMineEntityNumber() const; - void setMineEntityNumber(unsigned short pX); + uint16_t getMineEntityNumber() const; + void setMineEntityNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/MinefieldIdentifier.cpp b/src/dis7/MinefieldIdentifier.cpp index 95551579..c71786e5 100644 --- a/src/dis7/MinefieldIdentifier.cpp +++ b/src/dis7/MinefieldIdentifier.cpp @@ -19,11 +19,11 @@ void MinefieldIdentifier::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short MinefieldIdentifier::getMinefieldNumber() const { +uint16_t MinefieldIdentifier::getMinefieldNumber() const { return _minefieldNumber; } -void MinefieldIdentifier::setMinefieldNumber(unsigned short pX) { +void MinefieldIdentifier::setMinefieldNumber(uint16_t pX) { _minefieldNumber = pX; } diff --git a/src/dis7/MinefieldIdentifier.h b/src/dis7/MinefieldIdentifier.h index b76295a9..a41289cb 100644 --- a/src/dis7/MinefieldIdentifier.h +++ b/src/dis7/MinefieldIdentifier.h @@ -18,7 +18,7 @@ class OPENDIS7_EXPORT MinefieldIdentifier { SimulationAddress _simulationAddress; /** */ - unsigned short _minefieldNumber; + uint16_t _minefieldNumber; public: MinefieldIdentifier(); @@ -31,8 +31,8 @@ class OPENDIS7_EXPORT MinefieldIdentifier { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getMinefieldNumber() const; - void setMinefieldNumber(unsigned short pX); + uint16_t getMinefieldNumber() const; + void setMinefieldNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/MinefieldResponseNackPdu.cpp b/src/dis7/MinefieldResponseNackPdu.cpp index c5014a43..e43e7191 100644 --- a/src/dis7/MinefieldResponseNackPdu.cpp +++ b/src/dis7/MinefieldResponseNackPdu.cpp @@ -37,15 +37,15 @@ void MinefieldResponseNackPdu::setRequestingEntityID(const EntityID& pX) { _requestingEntityID = pX; } -unsigned char MinefieldResponseNackPdu::getRequestID() const { +uint8_t MinefieldResponseNackPdu::getRequestID() const { return _requestID; } -void MinefieldResponseNackPdu::setRequestID(unsigned char pX) { +void MinefieldResponseNackPdu::setRequestID(uint8_t pX) { _requestID = pX; } -unsigned char MinefieldResponseNackPdu::getNumberOfMissingPdus() const { +uint8_t MinefieldResponseNackPdu::getNumberOfMissingPdus() const { return _missingPduSequenceNumbers.size(); } @@ -70,7 +70,7 @@ void MinefieldResponseNackPdu::marshal(DataStream& dataStream) const { _minefieldID.marshal(dataStream); _requestingEntityID.marshal(dataStream); dataStream << _requestID; - dataStream << (unsigned char)_missingPduSequenceNumbers.size(); + dataStream << (uint8_t)_missingPduSequenceNumbers.size(); for (size_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { EightByteChunk x = _missingPduSequenceNumbers[idx]; @@ -123,7 +123,7 @@ int MinefieldResponseNackPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _requestID marshalSize = marshalSize + 1; // _numberOfMissingPdus - for (unsigned long long idx = 0; idx < _missingPduSequenceNumbers.size(); + for (uint64_t idx = 0; idx < _missingPduSequenceNumbers.size(); idx++) { EightByteChunk listElement = _missingPduSequenceNumbers[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); diff --git a/src/dis7/MinefieldResponseNackPdu.h b/src/dis7/MinefieldResponseNackPdu.h index 62c0d665..8ad94832 100644 --- a/src/dis7/MinefieldResponseNackPdu.h +++ b/src/dis7/MinefieldResponseNackPdu.h @@ -26,10 +26,10 @@ class OPENDIS7_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu { EntityID _requestingEntityID; /** request ID */ - unsigned char _requestID; + uint8_t _requestID; /** how many pdus were missing */ - unsigned char _numberOfMissingPdus; + uint8_t _numberOfMissingPdus; /** PDU sequence numbers that were missing */ std::vector _missingPduSequenceNumbers; @@ -49,10 +49,10 @@ class OPENDIS7_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu { const EntityID& getRequestingEntityID() const; void setRequestingEntityID(const EntityID& pX); - unsigned char getRequestID() const; - void setRequestID(unsigned char pX); + uint8_t getRequestID() const; + void setRequestID(uint8_t pX); - unsigned char getNumberOfMissingPdus() const; + uint8_t getNumberOfMissingPdus() const; std::vector& getMissingPduSequenceNumbers(); const std::vector& getMissingPduSequenceNumbers() const; diff --git a/src/dis7/MinefieldStatePdu.cpp b/src/dis7/MinefieldStatePdu.cpp index b37ddf7a..8d58eb2b 100644 --- a/src/dis7/MinefieldStatePdu.cpp +++ b/src/dis7/MinefieldStatePdu.cpp @@ -34,19 +34,19 @@ void MinefieldStatePdu::setMinefieldID(const MinefieldIdentifier& pX) { _minefieldID = pX; } -unsigned short MinefieldStatePdu::getMinefieldSequence() const { +uint16_t MinefieldStatePdu::getMinefieldSequence() const { return _minefieldSequence; } -void MinefieldStatePdu::setMinefieldSequence(unsigned short pX) { +void MinefieldStatePdu::setMinefieldSequence(uint16_t pX) { _minefieldSequence = pX; } -unsigned char MinefieldStatePdu::getForceID() const { return _forceID; } +uint8_t MinefieldStatePdu::getForceID() const { return _forceID; } -void MinefieldStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void MinefieldStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char MinefieldStatePdu::getNumberOfPerimeterPoints() const { +uint8_t MinefieldStatePdu::getNumberOfPerimeterPoints() const { return _perimeterPoints.size(); } @@ -60,7 +60,7 @@ void MinefieldStatePdu::setMinefieldType(const EntityType& pX) { _minefieldType = pX; } -unsigned short MinefieldStatePdu::getNumberOfMineTypes() const { +uint16_t MinefieldStatePdu::getNumberOfMineTypes() const { return _mineType.size(); } @@ -88,15 +88,15 @@ void MinefieldStatePdu::setMinefieldOrientation(const EulerAngles& pX) { _minefieldOrientation = pX; } -unsigned short MinefieldStatePdu::getAppearance() const { return _appearance; } +uint16_t MinefieldStatePdu::getAppearance() const { return _appearance; } -void MinefieldStatePdu::setAppearance(unsigned short pX) { _appearance = pX; } +void MinefieldStatePdu::setAppearance(uint16_t pX) { _appearance = pX; } -unsigned short MinefieldStatePdu::getProtocolMode() const { +uint16_t MinefieldStatePdu::getProtocolMode() const { return _protocolMode; } -void MinefieldStatePdu::setProtocolMode(unsigned short pX) { +void MinefieldStatePdu::setProtocolMode(uint16_t pX) { _protocolMode = pX; } @@ -129,9 +129,9 @@ void MinefieldStatePdu::marshal(DataStream& dataStream) const { _minefieldID.marshal(dataStream); dataStream << _minefieldSequence; dataStream << _forceID; - dataStream << (unsigned char)_perimeterPoints.size(); + dataStream << (uint8_t)_perimeterPoints.size(); _minefieldType.marshal(dataStream); - dataStream << (unsigned short)_mineType.size(); + dataStream << (uint16_t)_mineType.size(); _minefieldLocation.marshal(dataStream); _minefieldOrientation.marshal(dataStream); dataStream << _appearance; @@ -222,12 +222,12 @@ int MinefieldStatePdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _appearance marshalSize = marshalSize + 2; // _protocolMode - for (unsigned long long idx = 0; idx < _perimeterPoints.size(); idx++) { + for (uint64_t idx = 0; idx < _perimeterPoints.size(); idx++) { Vector2Float listElement = _perimeterPoints[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _mineType.size(); idx++) { + for (uint64_t idx = 0; idx < _mineType.size(); idx++) { EntityType listElement = _mineType[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/MinefieldStatePdu.h b/src/dis7/MinefieldStatePdu.h index 4d0cf8c4..5838a2d7 100644 --- a/src/dis7/MinefieldStatePdu.h +++ b/src/dis7/MinefieldStatePdu.h @@ -26,19 +26,19 @@ class OPENDIS7_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { MinefieldIdentifier _minefieldID; /** Minefield sequence */ - unsigned short _minefieldSequence; + uint16_t _minefieldSequence; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** Number of permieter points */ - unsigned char _numberOfPerimeterPoints; + uint8_t _numberOfPerimeterPoints; /** type of minefield */ EntityType _minefieldType; /** how many mine types */ - unsigned short _numberOfMineTypes; + uint16_t _numberOfMineTypes; /** location of center of minefield in world coords */ Vector3Double _minefieldLocation; @@ -47,10 +47,10 @@ class OPENDIS7_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { EulerAngles _minefieldOrientation; /** appearance bitflags */ - unsigned short _appearance; + uint16_t _appearance; /** protocolMode. First two bits are the protocol mode, 14 bits reserved. */ - unsigned short _protocolMode; + uint16_t _protocolMode; /** perimeter points for the minefield */ std::vector _perimeterPoints; @@ -69,19 +69,19 @@ class OPENDIS7_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { const MinefieldIdentifier& getMinefieldID() const; void setMinefieldID(const MinefieldIdentifier& pX); - unsigned short getMinefieldSequence() const; - void setMinefieldSequence(unsigned short pX); + uint16_t getMinefieldSequence() const; + void setMinefieldSequence(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getNumberOfPerimeterPoints() const; + uint8_t getNumberOfPerimeterPoints() const; EntityType& getMinefieldType(); const EntityType& getMinefieldType() const; void setMinefieldType(const EntityType& pX); - unsigned short getNumberOfMineTypes() const; + uint16_t getNumberOfMineTypes() const; Vector3Double& getMinefieldLocation(); const Vector3Double& getMinefieldLocation() const; @@ -91,11 +91,11 @@ class OPENDIS7_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { const EulerAngles& getMinefieldOrientation() const; void setMinefieldOrientation(const EulerAngles& pX); - unsigned short getAppearance() const; - void setAppearance(unsigned short pX); + uint16_t getAppearance() const; + void setAppearance(uint16_t pX); - unsigned short getProtocolMode() const; - void setProtocolMode(unsigned short pX); + uint16_t getProtocolMode() const; + void setProtocolMode(uint16_t pX); std::vector& getPerimeterPoints(); const std::vector& getPerimeterPoints() const; diff --git a/src/dis7/ModulationType.cpp b/src/dis7/ModulationType.cpp index 973a0fdf..dc7c2037 100644 --- a/src/dis7/ModulationType.cpp +++ b/src/dis7/ModulationType.cpp @@ -7,29 +7,29 @@ ModulationType::ModulationType() ModulationType::~ModulationType() {} -unsigned short ModulationType::getSpreadSpectrum() const { +uint16_t ModulationType::getSpreadSpectrum() const { return _spreadSpectrum; } -void ModulationType::setSpreadSpectrum(unsigned short pX) { +void ModulationType::setSpreadSpectrum(uint16_t pX) { _spreadSpectrum = pX; } -unsigned short ModulationType::getMajorModulation() const { +uint16_t ModulationType::getMajorModulation() const { return _majorModulation; } -void ModulationType::setMajorModulation(unsigned short pX) { +void ModulationType::setMajorModulation(uint16_t pX) { _majorModulation = pX; } -unsigned short ModulationType::getDetail() const { return _detail; } +uint16_t ModulationType::getDetail() const { return _detail; } -void ModulationType::setDetail(unsigned short pX) { _detail = pX; } +void ModulationType::setDetail(uint16_t pX) { _detail = pX; } -unsigned short ModulationType::getRadioSystem() const { return _radioSystem; } +uint16_t ModulationType::getRadioSystem() const { return _radioSystem; } -void ModulationType::setRadioSystem(unsigned short pX) { _radioSystem = pX; } +void ModulationType::setRadioSystem(uint16_t pX) { _radioSystem = pX; } void ModulationType::marshal(DataStream& dataStream) const { dataStream << _spreadSpectrum; diff --git a/src/dis7/ModulationType.h b/src/dis7/ModulationType.h index c5eb0295..4b1ae5f1 100644 --- a/src/dis7/ModulationType.h +++ b/src/dis7/ModulationType.h @@ -15,19 +15,19 @@ class OPENDIS7_EXPORT ModulationType { protected: /** This field shall indicate the spread spectrum technique or combination of * spread spectrum techniques in use. Bt field. */ - unsigned short _spreadSpectrum; + uint16_t _spreadSpectrum; /** the major classification of the modulation type. */ - unsigned short _majorModulation; + uint16_t _majorModulation; /** provide certain detailed information depending upon the major modulation * type */ - unsigned short _detail; + uint16_t _detail; /** the radio system associated with this Transmitter PDU and shall be used as * the basis to interpret other fields whose values depend on a specific radio * system. */ - unsigned short _radioSystem; + uint16_t _radioSystem; public: ModulationType(); @@ -36,17 +36,17 @@ class OPENDIS7_EXPORT ModulationType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSpreadSpectrum() const; - void setSpreadSpectrum(unsigned short pX); + uint16_t getSpreadSpectrum() const; + void setSpreadSpectrum(uint16_t pX); - unsigned short getMajorModulation() const; - void setMajorModulation(unsigned short pX); + uint16_t getMajorModulation() const; + void setMajorModulation(uint16_t pX); - unsigned short getDetail() const; - void setDetail(unsigned short pX); + uint16_t getDetail() const; + void setDetail(uint16_t pX); - unsigned short getRadioSystem() const; - void setRadioSystem(unsigned short pX); + uint16_t getRadioSystem() const; + void setRadioSystem(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/Munition.cpp b/src/dis7/Munition.cpp index 97688878..372ce28d 100644 --- a/src/dis7/Munition.cpp +++ b/src/dis7/Munition.cpp @@ -17,21 +17,21 @@ const EntityType& Munition::getMunitionType() const { return _munitionType; } void Munition::setMunitionType(const EntityType& pX) { _munitionType = pX; } -unsigned int Munition::getStation() const { return _station; } +uint32_t Munition::getStation() const { return _station; } -void Munition::setStation(unsigned int pX) { _station = pX; } +void Munition::setStation(uint32_t pX) { _station = pX; } -unsigned short Munition::getQuantity() const { return _quantity; } +uint16_t Munition::getQuantity() const { return _quantity; } -void Munition::setQuantity(unsigned short pX) { _quantity = pX; } +void Munition::setQuantity(uint16_t pX) { _quantity = pX; } -unsigned char Munition::getMunitionStatus() const { return _munitionStatus; } +uint8_t Munition::getMunitionStatus() const { return _munitionStatus; } -void Munition::setMunitionStatus(unsigned char pX) { _munitionStatus = pX; } +void Munition::setMunitionStatus(uint8_t pX) { _munitionStatus = pX; } -unsigned char Munition::getPadding() const { return _padding; } +uint8_t Munition::getPadding() const { return _padding; } -void Munition::setPadding(unsigned char pX) { _padding = pX; } +void Munition::setPadding(uint8_t pX) { _padding = pX; } void Munition::marshal(DataStream& dataStream) const { _munitionType.marshal(dataStream); diff --git a/src/dis7/Munition.h b/src/dis7/Munition.h index 7436babc..83b2d33b 100644 --- a/src/dis7/Munition.h +++ b/src/dis7/Munition.h @@ -22,17 +22,17 @@ class OPENDIS7_EXPORT Munition { EntityType _munitionType; /** the station or launcher to which the munition is assigned. See Annex I */ - unsigned int _station; + uint32_t _station; /** the quantity remaining of this munition. */ - unsigned short _quantity; + uint16_t _quantity; /** the status of the munition. It shall be represented by an 8-bit * enumeration. */ - unsigned char _munitionStatus; + uint8_t _munitionStatus; /** padding */ - unsigned char _padding; + uint8_t _padding; public: Munition(); @@ -45,17 +45,17 @@ class OPENDIS7_EXPORT Munition { const EntityType& getMunitionType() const; void setMunitionType(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + uint32_t getStation() const; + void setStation(uint32_t pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + uint16_t getQuantity() const; + void setQuantity(uint16_t pX); - unsigned char getMunitionStatus() const; - void setMunitionStatus(unsigned char pX); + uint8_t getMunitionStatus() const; + void setMunitionStatus(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/MunitionDescriptor.cpp b/src/dis7/MunitionDescriptor.cpp index 1f5024e2..2ed5c9d0 100644 --- a/src/dis7/MunitionDescriptor.cpp +++ b/src/dis7/MunitionDescriptor.cpp @@ -17,21 +17,21 @@ void MunitionDescriptor::setMunitionType(const EntityType& pX) { _munitionType = pX; } -unsigned short MunitionDescriptor::getWarhead() const { return _warhead; } +uint16_t MunitionDescriptor::getWarhead() const { return _warhead; } -void MunitionDescriptor::setWarhead(unsigned short pX) { _warhead = pX; } +void MunitionDescriptor::setWarhead(uint16_t pX) { _warhead = pX; } -unsigned short MunitionDescriptor::getFuse() const { return _fuse; } +uint16_t MunitionDescriptor::getFuse() const { return _fuse; } -void MunitionDescriptor::setFuse(unsigned short pX) { _fuse = pX; } +void MunitionDescriptor::setFuse(uint16_t pX) { _fuse = pX; } -unsigned short MunitionDescriptor::getQuantity() const { return _quantity; } +uint16_t MunitionDescriptor::getQuantity() const { return _quantity; } -void MunitionDescriptor::setQuantity(unsigned short pX) { _quantity = pX; } +void MunitionDescriptor::setQuantity(uint16_t pX) { _quantity = pX; } -unsigned short MunitionDescriptor::getRate() const { return _rate; } +uint16_t MunitionDescriptor::getRate() const { return _rate; } -void MunitionDescriptor::setRate(unsigned short pX) { _rate = pX; } +void MunitionDescriptor::setRate(uint16_t pX) { _rate = pX; } void MunitionDescriptor::marshal(DataStream& dataStream) const { _munitionType.marshal(dataStream); diff --git a/src/dis7/MunitionDescriptor.h b/src/dis7/MunitionDescriptor.h index 8fd3c644..853db6f2 100644 --- a/src/dis7/MunitionDescriptor.h +++ b/src/dis7/MunitionDescriptor.h @@ -18,16 +18,16 @@ class OPENDIS7_EXPORT MunitionDescriptor { EntityType _munitionType; /** type of warhead */ - unsigned short _warhead; + uint16_t _warhead; /** type of fuse used */ - unsigned short _fuse; + uint16_t _fuse; /** how many of the munition were fired */ - unsigned short _quantity; + uint16_t _quantity; /** rate at which the munition was fired */ - unsigned short _rate; + uint16_t _rate; public: MunitionDescriptor(); @@ -40,17 +40,17 @@ class OPENDIS7_EXPORT MunitionDescriptor { const EntityType& getMunitionType() const; void setMunitionType(const EntityType& pX); - unsigned short getWarhead() const; - void setWarhead(unsigned short pX); + uint16_t getWarhead() const; + void setWarhead(uint16_t pX); - unsigned short getFuse() const; - void setFuse(unsigned short pX); + uint16_t getFuse() const; + void setFuse(uint16_t pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + uint16_t getQuantity() const; + void setQuantity(uint16_t pX); - unsigned short getRate() const; - void setRate(unsigned short pX); + uint16_t getRate() const; + void setRate(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/MunitionReload.cpp b/src/dis7/MunitionReload.cpp index 556b9b31..e444ea8a 100644 --- a/src/dis7/MunitionReload.cpp +++ b/src/dis7/MunitionReload.cpp @@ -22,35 +22,35 @@ void MunitionReload::setMunitionType(const EntityType& pX) { _munitionType = pX; } -unsigned int MunitionReload::getStation() const { return _station; } +uint32_t MunitionReload::getStation() const { return _station; } -void MunitionReload::setStation(unsigned int pX) { _station = pX; } +void MunitionReload::setStation(uint32_t pX) { _station = pX; } -unsigned short MunitionReload::getStandardQuantity() const { +uint16_t MunitionReload::getStandardQuantity() const { return _standardQuantity; } -void MunitionReload::setStandardQuantity(unsigned short pX) { +void MunitionReload::setStandardQuantity(uint16_t pX) { _standardQuantity = pX; } -unsigned short MunitionReload::getMaximumQuantity() const { +uint16_t MunitionReload::getMaximumQuantity() const { return _maximumQuantity; } -void MunitionReload::setMaximumQuantity(unsigned short pX) { +void MunitionReload::setMaximumQuantity(uint16_t pX) { _maximumQuantity = pX; } -unsigned short MunitionReload::getStationName() const { return _stationName; } +uint16_t MunitionReload::getStationName() const { return _stationName; } -void MunitionReload::setStationName(unsigned short pX) { _stationName = pX; } +void MunitionReload::setStationName(uint16_t pX) { _stationName = pX; } -unsigned short MunitionReload::getStationNumber() const { +uint16_t MunitionReload::getStationNumber() const { return _stationNumber; } -void MunitionReload::setStationNumber(unsigned short pX) { +void MunitionReload::setStationNumber(uint16_t pX) { _stationNumber = pX; } diff --git a/src/dis7/MunitionReload.h b/src/dis7/MunitionReload.h index 6a65ef59..10377d26 100644 --- a/src/dis7/MunitionReload.h +++ b/src/dis7/MunitionReload.h @@ -20,22 +20,22 @@ class OPENDIS7_EXPORT MunitionReload { EntityType _munitionType; /** the station or launcher to which the munition is assigned. See Annex I */ - unsigned int _station; + uint32_t _station; /** the standard quantity of this munition type normally loaded at this * station/launcher if a station/launcher is specified. */ - unsigned short _standardQuantity; + uint16_t _standardQuantity; /** the maximum quantity of this munition type that this station/launcher is * capable of holding when a station/launcher is specified */ - unsigned short _maximumQuantity; + uint16_t _maximumQuantity; /** the station name within the host at which the part entity is located. */ - unsigned short _stationName; + uint16_t _stationName; /** the number of the particular wing station, cargo hold etc., at which the * part is attached. */ - unsigned short _stationNumber; + uint16_t _stationNumber; public: MunitionReload(); @@ -48,20 +48,20 @@ class OPENDIS7_EXPORT MunitionReload { const EntityType& getMunitionType() const; void setMunitionType(const EntityType& pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + uint32_t getStation() const; + void setStation(uint32_t pX); - unsigned short getStandardQuantity() const; - void setStandardQuantity(unsigned short pX); + uint16_t getStandardQuantity() const; + void setStandardQuantity(uint16_t pX); - unsigned short getMaximumQuantity() const; - void setMaximumQuantity(unsigned short pX); + uint16_t getMaximumQuantity() const; + void setMaximumQuantity(uint16_t pX); - unsigned short getStationName() const; - void setStationName(unsigned short pX); + uint16_t getStationName() const; + void setStationName(uint16_t pX); - unsigned short getStationNumber() const; - void setStationNumber(unsigned short pX); + uint16_t getStationNumber() const; + void setStationNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/NamedLocationIdentification.cpp b/src/dis7/NamedLocationIdentification.cpp index 27a26226..3e83b03e 100644 --- a/src/dis7/NamedLocationIdentification.cpp +++ b/src/dis7/NamedLocationIdentification.cpp @@ -7,19 +7,19 @@ NamedLocationIdentification::NamedLocationIdentification() NamedLocationIdentification::~NamedLocationIdentification() {} -unsigned short NamedLocationIdentification::getStationName() const { +uint16_t NamedLocationIdentification::getStationName() const { return _stationName; } -void NamedLocationIdentification::setStationName(unsigned short pX) { +void NamedLocationIdentification::setStationName(uint16_t pX) { _stationName = pX; } -unsigned short NamedLocationIdentification::getStationNumber() const { +uint16_t NamedLocationIdentification::getStationNumber() const { return _stationNumber; } -void NamedLocationIdentification::setStationNumber(unsigned short pX) { +void NamedLocationIdentification::setStationNumber(uint16_t pX) { _stationNumber = pX; } diff --git a/src/dis7/NamedLocationIdentification.h b/src/dis7/NamedLocationIdentification.h index ee1aead7..3bc3588d 100644 --- a/src/dis7/NamedLocationIdentification.h +++ b/src/dis7/NamedLocationIdentification.h @@ -18,11 +18,11 @@ class OPENDIS7_EXPORT NamedLocationIdentification { * the part entity is On Station, this field shall specify the representation * of the part’s location data fields. This field shall be specified by a * 16-bit enumeration */ - unsigned short _stationName; + uint16_t _stationName; /** the number of the particular wing station, cargo hold etc., at which the * part is attached. */ - unsigned short _stationNumber; + uint16_t _stationNumber; public: NamedLocationIdentification(); @@ -31,11 +31,11 @@ class OPENDIS7_EXPORT NamedLocationIdentification { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getStationName() const; - void setStationName(unsigned short pX); + uint16_t getStationName() const; + void setStationName(uint16_t pX); - unsigned short getStationNumber() const; - void setStationNumber(unsigned short pX); + uint16_t getStationNumber() const; + void setStationNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ObjectIdentifier.cpp b/src/dis7/ObjectIdentifier.cpp index d3d35dd7..783ead40 100644 --- a/src/dis7/ObjectIdentifier.cpp +++ b/src/dis7/ObjectIdentifier.cpp @@ -18,11 +18,11 @@ void ObjectIdentifier::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short ObjectIdentifier::getObjectNumber() const { +uint16_t ObjectIdentifier::getObjectNumber() const { return _objectNumber; } -void ObjectIdentifier::setObjectNumber(unsigned short pX) { +void ObjectIdentifier::setObjectNumber(uint16_t pX) { _objectNumber = pX; } diff --git a/src/dis7/ObjectIdentifier.h b/src/dis7/ObjectIdentifier.h index a4a3ea0f..2817bd84 100644 --- a/src/dis7/ObjectIdentifier.h +++ b/src/dis7/ObjectIdentifier.h @@ -18,7 +18,7 @@ class OPENDIS7_EXPORT ObjectIdentifier { SimulationAddress _simulationAddress; /** */ - unsigned short _objectNumber; + uint16_t _objectNumber; public: ObjectIdentifier(); @@ -31,8 +31,8 @@ class OPENDIS7_EXPORT ObjectIdentifier { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getObjectNumber() const; - void setObjectNumber(unsigned short pX); + uint16_t getObjectNumber() const; + void setObjectNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ObjectType.cpp b/src/dis7/ObjectType.cpp index c7a9e4f4..6e336030 100644 --- a/src/dis7/ObjectType.cpp +++ b/src/dis7/ObjectType.cpp @@ -7,21 +7,21 @@ ObjectType::ObjectType() ObjectType::~ObjectType() {} -unsigned char ObjectType::getDomain() const { return _domain; } +uint8_t ObjectType::getDomain() const { return _domain; } -void ObjectType::setDomain(unsigned char pX) { _domain = pX; } +void ObjectType::setDomain(uint8_t pX) { _domain = pX; } -unsigned char ObjectType::getObjectKind() const { return _objectKind; } +uint8_t ObjectType::getObjectKind() const { return _objectKind; } -void ObjectType::setObjectKind(unsigned char pX) { _objectKind = pX; } +void ObjectType::setObjectKind(uint8_t pX) { _objectKind = pX; } -unsigned char ObjectType::getCategory() const { return _category; } +uint8_t ObjectType::getCategory() const { return _category; } -void ObjectType::setCategory(unsigned char pX) { _category = pX; } +void ObjectType::setCategory(uint8_t pX) { _category = pX; } -unsigned char ObjectType::getSubcategory() const { return _subcategory; } +uint8_t ObjectType::getSubcategory() const { return _subcategory; } -void ObjectType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void ObjectType::setSubcategory(uint8_t pX) { _subcategory = pX; } void ObjectType::marshal(DataStream& dataStream) const { dataStream << _domain; diff --git a/src/dis7/ObjectType.h b/src/dis7/ObjectType.h index baa0735e..4991c583 100644 --- a/src/dis7/ObjectType.h +++ b/src/dis7/ObjectType.h @@ -14,16 +14,16 @@ namespace DIS { class OPENDIS7_EXPORT ObjectType { protected: /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ - unsigned char _objectKind; + uint8_t _objectKind; /** category of entity */ - unsigned char _category; + uint8_t _category; /** subcategory of entity */ - unsigned char _subcategory; + uint8_t _subcategory; public: ObjectType(); @@ -32,17 +32,17 @@ class OPENDIS7_EXPORT ObjectType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); - unsigned char getObjectKind() const; - void setObjectKind(unsigned char pX); + uint8_t getObjectKind() const; + void setObjectKind(uint8_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/OwnershipStatus.cpp b/src/dis7/OwnershipStatus.cpp index e04f1c37..b9ad2b4b 100644 --- a/src/dis7/OwnershipStatus.cpp +++ b/src/dis7/OwnershipStatus.cpp @@ -13,17 +13,17 @@ const EntityID& OwnershipStatus::getEntityId() const { return _entityId; } void OwnershipStatus::setEntityId(const EntityID& pX) { _entityId = pX; } -unsigned char OwnershipStatus::getOwnershipStatus() const { +uint8_t OwnershipStatus::getOwnershipStatus() const { return _ownershipStatus; } -void OwnershipStatus::setOwnershipStatus(unsigned char pX) { +void OwnershipStatus::setOwnershipStatus(uint8_t pX) { _ownershipStatus = pX; } -unsigned char OwnershipStatus::getPadding() const { return _padding; } +uint8_t OwnershipStatus::getPadding() const { return _padding; } -void OwnershipStatus::setPadding(unsigned char pX) { _padding = pX; } +void OwnershipStatus::setPadding(uint8_t pX) { _padding = pX; } void OwnershipStatus::marshal(DataStream& dataStream) const { _entityId.marshal(dataStream); diff --git a/src/dis7/OwnershipStatus.h b/src/dis7/OwnershipStatus.h index c95c5f73..28fa75cf 100644 --- a/src/dis7/OwnershipStatus.h +++ b/src/dis7/OwnershipStatus.h @@ -20,10 +20,10 @@ class OPENDIS7_EXPORT OwnershipStatus { /** The ownership and/or ownership conflict status of the entity represented * by the Entity ID field. */ - unsigned char _ownershipStatus; + uint8_t _ownershipStatus; /** padding */ - unsigned char _padding; + uint8_t _padding; public: OwnershipStatus(); @@ -36,11 +36,11 @@ class OPENDIS7_EXPORT OwnershipStatus { const EntityID& getEntityId() const; void setEntityId(const EntityID& pX); - unsigned char getOwnershipStatus() const; - void setOwnershipStatus(unsigned char pX); + uint8_t getOwnershipStatus() const; + void setOwnershipStatus(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/Pdu.cpp b/src/dis7/Pdu.cpp index 671519fe..0d5effa4 100644 --- a/src/dis7/Pdu.cpp +++ b/src/dis7/Pdu.cpp @@ -6,13 +6,13 @@ Pdu::Pdu() : PduSuperclass(), _pduStatus(0), _padding(0) {} Pdu::~Pdu() {} -unsigned char Pdu::getPduStatus() const { return _pduStatus; } +uint8_t Pdu::getPduStatus() const { return _pduStatus; } -void Pdu::setPduStatus(unsigned char pX) { _pduStatus = pX; } +void Pdu::setPduStatus(uint8_t pX) { _pduStatus = pX; } -unsigned char Pdu::getPadding() const { return _padding; } +uint8_t Pdu::getPadding() const { return _padding; } -void Pdu::setPadding(unsigned char pX) { _padding = pX; } +void Pdu::setPadding(uint8_t pX) { _padding = pX; } void Pdu::marshal(DataStream& dataStream) const { PduSuperclass::marshal( diff --git a/src/dis7/Pdu.h b/src/dis7/Pdu.h index 844c1e71..bb2f22c8 100644 --- a/src/dis7/Pdu.h +++ b/src/dis7/Pdu.h @@ -16,10 +16,10 @@ class OPENDIS7_EXPORT Pdu : public PduSuperclass { protected: /** PDU Status Record. Described in 6.2.67. This field is not present in * earlier DIS versions */ - unsigned char _pduStatus; + uint8_t _pduStatus; /** zero-filled array of padding */ - unsigned char _padding; + uint8_t _padding; public: Pdu(); @@ -28,11 +28,11 @@ class OPENDIS7_EXPORT Pdu : public PduSuperclass { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getPduStatus() const; - void setPduStatus(unsigned char pX); + uint8_t getPduStatus() const; + void setPduStatus(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/PduContainer.cpp b/src/dis7/PduContainer.cpp index fc1a5785..87337902 100644 --- a/src/dis7/PduContainer.cpp +++ b/src/dis7/PduContainer.cpp @@ -6,7 +6,7 @@ PduContainer::PduContainer() : _numberOfPdus(0) {} PduContainer::~PduContainer() { _pdus.clear(); } -unsigned int PduContainer::getNumberOfPdus() const { return _pdus.size(); } +uint32_t PduContainer::getNumberOfPdus() const { return _pdus.size(); } std::vector& PduContainer::getPdus() { return _pdus; } @@ -49,7 +49,7 @@ int PduContainer::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfPdus - for (unsigned long long idx = 0; idx < _pdus.size(); idx++) { + for (uint64_t idx = 0; idx < _pdus.size(); idx++) { Pdu listElement = _pdus[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/PduContainer.h b/src/dis7/PduContainer.h index 9dd0145c..d06ca539 100644 --- a/src/dis7/PduContainer.h +++ b/src/dis7/PduContainer.h @@ -17,7 +17,7 @@ namespace DIS { class OPENDIS7_EXPORT PduContainer { protected: /** Number of PDUs in the container list */ - unsigned int _numberOfPdus; + uint32_t _numberOfPdus; /** record sets */ std::vector _pdus; @@ -29,7 +29,7 @@ class OPENDIS7_EXPORT PduContainer { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfPdus() const; + uint32_t getNumberOfPdus() const; std::vector& getPdus(); const std::vector& getPdus() const; diff --git a/src/dis7/PduHeader.cpp b/src/dis7/PduHeader.cpp index 41c433d1..f8d800c4 100644 --- a/src/dis7/PduHeader.cpp +++ b/src/dis7/PduHeader.cpp @@ -14,37 +14,37 @@ PduHeader::PduHeader() PduHeader::~PduHeader() {} -unsigned char PduHeader::getProtocolVersion() const { return _protocolVersion; } +uint8_t PduHeader::getProtocolVersion() const { return _protocolVersion; } -void PduHeader::setProtocolVersion(unsigned char pX) { _protocolVersion = pX; } +void PduHeader::setProtocolVersion(uint8_t pX) { _protocolVersion = pX; } -unsigned char PduHeader::getExerciseID() const { return _exerciseID; } +uint8_t PduHeader::getExerciseID() const { return _exerciseID; } -void PduHeader::setExerciseID(unsigned char pX) { _exerciseID = pX; } +void PduHeader::setExerciseID(uint8_t pX) { _exerciseID = pX; } -unsigned char PduHeader::getPduType() const { return _pduType; } +uint8_t PduHeader::getPduType() const { return _pduType; } -void PduHeader::setPduType(unsigned char pX) { _pduType = pX; } +void PduHeader::setPduType(uint8_t pX) { _pduType = pX; } -unsigned char PduHeader::getProtocolFamily() const { return _protocolFamily; } +uint8_t PduHeader::getProtocolFamily() const { return _protocolFamily; } -void PduHeader::setProtocolFamily(unsigned char pX) { _protocolFamily = pX; } +void PduHeader::setProtocolFamily(uint8_t pX) { _protocolFamily = pX; } -unsigned int PduHeader::getTimestamp() const { return _timestamp; } +uint32_t PduHeader::getTimestamp() const { return _timestamp; } -void PduHeader::setTimestamp(unsigned int pX) { _timestamp = pX; } +void PduHeader::setTimestamp(uint32_t pX) { _timestamp = pX; } -unsigned char PduHeader::getPduLength() const { return _pduLength; } +uint8_t PduHeader::getPduLength() const { return _pduLength; } -void PduHeader::setPduLength(unsigned char pX) { _pduLength = pX; } +void PduHeader::setPduLength(uint8_t pX) { _pduLength = pX; } -unsigned short PduHeader::getPduStatus() const { return _pduStatus; } +uint16_t PduHeader::getPduStatus() const { return _pduStatus; } -void PduHeader::setPduStatus(unsigned short pX) { _pduStatus = pX; } +void PduHeader::setPduStatus(uint16_t pX) { _pduStatus = pX; } -unsigned char PduHeader::getPadding() const { return _padding; } +uint8_t PduHeader::getPadding() const { return _padding; } -void PduHeader::setPadding(unsigned char pX) { _padding = pX; } +void PduHeader::setPadding(uint8_t pX) { _padding = pX; } void PduHeader::marshal(DataStream& dataStream) const { dataStream << _protocolVersion; diff --git a/src/dis7/PduHeader.h b/src/dis7/PduHeader.h index 5ef985de..8c63413b 100644 --- a/src/dis7/PduHeader.h +++ b/src/dis7/PduHeader.h @@ -15,30 +15,30 @@ namespace DIS { class OPENDIS7_EXPORT PduHeader { protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009. */ - unsigned char _protocolVersion; + uint8_t _protocolVersion; /** Exercise ID */ - unsigned char _exerciseID; + uint8_t _exerciseID; /** Type of pdu, unique for each PDU class */ - unsigned char _pduType; + uint8_t _pduType; /** value that refers to the protocol family, eg SimulationManagement, etc */ - unsigned char _protocolFamily; + uint8_t _protocolFamily; /** Timestamp value */ - unsigned int _timestamp; + uint32_t _timestamp; /** Length, in bytes, of the PDU. Changed name from length to avoid use of * Hibernate QL reserved word. */ - unsigned char _pduLength; + uint8_t _pduLength; /** PDU Status Record. Described in 6.2.67. This field is not present in * earlier DIS versions */ - unsigned short _pduStatus; + uint16_t _pduStatus; /** zero filled array of padding */ - unsigned char _padding; + uint8_t _padding; public: PduHeader(); @@ -47,29 +47,29 @@ class OPENDIS7_EXPORT PduHeader { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getProtocolVersion() const; - void setProtocolVersion(unsigned char pX); + uint8_t getProtocolVersion() const; + void setProtocolVersion(uint8_t pX); - unsigned char getExerciseID() const; - void setExerciseID(unsigned char pX); + uint8_t getExerciseID() const; + void setExerciseID(uint8_t pX); - unsigned char getPduType() const; - void setPduType(unsigned char pX); + uint8_t getPduType() const; + void setPduType(uint8_t pX); - unsigned char getProtocolFamily() const; - void setProtocolFamily(unsigned char pX); + uint8_t getProtocolFamily() const; + void setProtocolFamily(uint8_t pX); - unsigned int getTimestamp() const; - void setTimestamp(unsigned int pX); + uint32_t getTimestamp() const; + void setTimestamp(uint32_t pX); - unsigned char getPduLength() const; - void setPduLength(unsigned char pX); + uint8_t getPduLength() const; + void setPduLength(uint8_t pX); - unsigned short getPduStatus() const; - void setPduStatus(unsigned short pX); + uint16_t getPduStatus() const; + void setPduStatus(uint16_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/PduStatus.cpp b/src/dis7/PduStatus.cpp index 05e8f993..f1e59bc7 100644 --- a/src/dis7/PduStatus.cpp +++ b/src/dis7/PduStatus.cpp @@ -6,9 +6,9 @@ PduStatus::PduStatus() : _pduStatus(0) {} PduStatus::~PduStatus() {} -unsigned char PduStatus::getPduStatus() const { return _pduStatus; } +uint8_t PduStatus::getPduStatus() const { return _pduStatus; } -void PduStatus::setPduStatus(unsigned char pX) { _pduStatus = pX; } +void PduStatus::setPduStatus(uint8_t pX) { _pduStatus = pX; } void PduStatus::marshal(DataStream& dataStream) const { dataStream << _pduStatus; diff --git a/src/dis7/PduStatus.h b/src/dis7/PduStatus.h index 85fb11c1..18ea2bd6 100644 --- a/src/dis7/PduStatus.h +++ b/src/dis7/PduStatus.h @@ -15,7 +15,7 @@ namespace DIS { class OPENDIS7_EXPORT PduStatus { protected: /** Bit fields */ - unsigned char _pduStatus; + uint8_t _pduStatus; public: PduStatus(); @@ -24,8 +24,8 @@ class OPENDIS7_EXPORT PduStatus { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getPduStatus() const; - void setPduStatus(unsigned char pX); + uint8_t getPduStatus() const; + void setPduStatus(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/PduSuperclass.cpp b/src/dis7/PduSuperclass.cpp index a4a2e1ac..adf13dc2 100644 --- a/src/dis7/PduSuperclass.cpp +++ b/src/dis7/PduSuperclass.cpp @@ -12,37 +12,37 @@ PduSuperclass::PduSuperclass() PduSuperclass::~PduSuperclass() {} -unsigned char PduSuperclass::getProtocolVersion() const { +uint8_t PduSuperclass::getProtocolVersion() const { return _protocolVersion; } -void PduSuperclass::setProtocolVersion(unsigned char pX) { +void PduSuperclass::setProtocolVersion(uint8_t pX) { _protocolVersion = pX; } -unsigned char PduSuperclass::getExerciseID() const { return _exerciseID; } +uint8_t PduSuperclass::getExerciseID() const { return _exerciseID; } -void PduSuperclass::setExerciseID(unsigned char pX) { _exerciseID = pX; } +void PduSuperclass::setExerciseID(uint8_t pX) { _exerciseID = pX; } -unsigned char PduSuperclass::getPduType() const { return _pduType; } +uint8_t PduSuperclass::getPduType() const { return _pduType; } -void PduSuperclass::setPduType(unsigned char pX) { _pduType = pX; } +void PduSuperclass::setPduType(uint8_t pX) { _pduType = pX; } -unsigned char PduSuperclass::getProtocolFamily() const { +uint8_t PduSuperclass::getProtocolFamily() const { return _protocolFamily; } -void PduSuperclass::setProtocolFamily(unsigned char pX) { +void PduSuperclass::setProtocolFamily(uint8_t pX) { _protocolFamily = pX; } -unsigned int PduSuperclass::getTimestamp() const { return _timestamp; } +uint32_t PduSuperclass::getTimestamp() const { return _timestamp; } -void PduSuperclass::setTimestamp(unsigned int pX) { _timestamp = pX; } +void PduSuperclass::setTimestamp(uint32_t pX) { _timestamp = pX; } -unsigned short PduSuperclass::getLength() const { return _length; } +uint16_t PduSuperclass::getLength() const { return _length; } -void PduSuperclass::setLength(unsigned short pX) { _length = pX; } +void PduSuperclass::setLength(uint16_t pX) { _length = pX; } void PduSuperclass::marshal(DataStream& dataStream) const { dataStream << _protocolVersion; diff --git a/src/dis7/PduSuperclass.h b/src/dis7/PduSuperclass.h index 4a64e043..d7603a17 100644 --- a/src/dis7/PduSuperclass.h +++ b/src/dis7/PduSuperclass.h @@ -15,22 +15,22 @@ namespace DIS { class OPENDIS7_EXPORT PduSuperclass { protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009. */ - unsigned char _protocolVersion; + uint8_t _protocolVersion; /** Exercise ID */ - unsigned char _exerciseID; + uint8_t _exerciseID; /** Type of pdu, unique for each PDU class */ - unsigned char _pduType; + uint8_t _pduType; /** value that refers to the protocol family, eg SimulationManagement, et */ - unsigned char _protocolFamily; + uint8_t _protocolFamily; /** Timestamp value */ - unsigned int _timestamp; + uint32_t _timestamp; /** Length, in bytes, of the PDU */ - unsigned short _length; + uint16_t _length; public: PduSuperclass(); @@ -39,23 +39,23 @@ class OPENDIS7_EXPORT PduSuperclass { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getProtocolVersion() const; - void setProtocolVersion(unsigned char pX); + uint8_t getProtocolVersion() const; + void setProtocolVersion(uint8_t pX); - unsigned char getExerciseID() const; - void setExerciseID(unsigned char pX); + uint8_t getExerciseID() const; + void setExerciseID(uint8_t pX); - unsigned char getPduType() const; - void setPduType(unsigned char pX); + uint8_t getPduType() const; + void setPduType(uint8_t pX); - unsigned char getProtocolFamily() const; - void setProtocolFamily(unsigned char pX); + uint8_t getProtocolFamily() const; + void setProtocolFamily(uint8_t pX); - unsigned int getTimestamp() const; - void setTimestamp(unsigned int pX); + uint32_t getTimestamp() const; + void setTimestamp(uint32_t pX); - unsigned short getLength() const; - void setLength(unsigned short pX); + uint16_t getLength() const; + void setLength(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/PointObjectStatePdu.cpp b/src/dis7/PointObjectStatePdu.cpp index 2375d88d..deeedee7 100644 --- a/src/dis7/PointObjectStatePdu.cpp +++ b/src/dis7/PointObjectStatePdu.cpp @@ -39,23 +39,23 @@ void PointObjectStatePdu::setReferencedObjectID(const EntityID& pX) { _referencedObjectID = pX; } -unsigned short PointObjectStatePdu::getUpdateNumber() const { +uint16_t PointObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void PointObjectStatePdu::setUpdateNumber(unsigned short pX) { +void PointObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } -unsigned char PointObjectStatePdu::getForceID() const { return _forceID; } +uint8_t PointObjectStatePdu::getForceID() const { return _forceID; } -void PointObjectStatePdu::setForceID(unsigned char pX) { _forceID = pX; } +void PointObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -unsigned char PointObjectStatePdu::getModifications() const { +uint8_t PointObjectStatePdu::getModifications() const { return _modifications; } -void PointObjectStatePdu::setModifications(unsigned char pX) { +void PointObjectStatePdu::setModifications(uint8_t pX) { _modifications = pX; } @@ -125,9 +125,9 @@ void PointObjectStatePdu::setReceivingID(const SimulationAddress& pX) { _receivingID = pX; } -unsigned int PointObjectStatePdu::getPad2() const { return _pad2; } +uint32_t PointObjectStatePdu::getPad2() const { return _pad2; } -void PointObjectStatePdu::setPad2(unsigned int pX) { _pad2 = pX; } +void PointObjectStatePdu::setPad2(uint32_t pX) { _pad2 = pX; } void PointObjectStatePdu::marshal(DataStream& dataStream) const { SyntheticEnvironmentFamilyPdu::marshal( diff --git a/src/dis7/PointObjectStatePdu.h b/src/dis7/PointObjectStatePdu.h index bd62cdcf..7f5a96cc 100644 --- a/src/dis7/PointObjectStatePdu.h +++ b/src/dis7/PointObjectStatePdu.h @@ -29,13 +29,13 @@ class OPENDIS7_EXPORT PointObjectStatePdu EntityID _referencedObjectID; /** unique update number of each state transition of an object */ - unsigned short _updateNumber; + uint16_t _updateNumber; /** force ID */ - unsigned char _forceID; + uint8_t _forceID; /** modifications */ - unsigned char _modifications; + uint8_t _modifications; /** Object type */ ObjectType _objectType; @@ -56,7 +56,7 @@ class OPENDIS7_EXPORT PointObjectStatePdu SimulationAddress _receivingID; /** padding */ - unsigned int _pad2; + uint32_t _pad2; public: PointObjectStatePdu(); @@ -73,14 +73,14 @@ class OPENDIS7_EXPORT PointObjectStatePdu const EntityID& getReferencedObjectID() const; void setReferencedObjectID(const EntityID& pX); - unsigned short getUpdateNumber() const; - void setUpdateNumber(unsigned short pX); + uint16_t getUpdateNumber() const; + void setUpdateNumber(uint16_t pX); - unsigned char getForceID() const; - void setForceID(unsigned char pX); + uint8_t getForceID() const; + void setForceID(uint8_t pX); - unsigned char getModifications() const; - void setModifications(unsigned char pX); + uint8_t getModifications() const; + void setModifications(uint8_t pX); ObjectType& getObjectType(); const ObjectType& getObjectType() const; @@ -105,8 +105,8 @@ class OPENDIS7_EXPORT PointObjectStatePdu const SimulationAddress& getReceivingID() const; void setReceivingID(const SimulationAddress& pX); - unsigned int getPad2() const; - void setPad2(unsigned int pX); + uint32_t getPad2() const; + void setPad2(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RadioCommunicationsFamilyPdu.cpp b/src/dis7/RadioCommunicationsFamilyPdu.cpp index f00d5881..bef5da9e 100644 --- a/src/dis7/RadioCommunicationsFamilyPdu.cpp +++ b/src/dis7/RadioCommunicationsFamilyPdu.cpp @@ -19,11 +19,11 @@ void RadioCommunicationsFamilyPdu::setEntityId(const EntityID& pX) { _entityId = pX; } -unsigned short RadioCommunicationsFamilyPdu::getRadioId() const { +uint16_t RadioCommunicationsFamilyPdu::getRadioId() const { return _radioId; } -void RadioCommunicationsFamilyPdu::setRadioId(unsigned short pX) { +void RadioCommunicationsFamilyPdu::setRadioId(uint16_t pX) { _radioId = pX; } diff --git a/src/dis7/RadioCommunicationsFamilyPdu.h b/src/dis7/RadioCommunicationsFamilyPdu.h index dfe56bbd..cafa5853 100644 --- a/src/dis7/RadioCommunicationsFamilyPdu.h +++ b/src/dis7/RadioCommunicationsFamilyPdu.h @@ -19,7 +19,7 @@ class OPENDIS7_EXPORT RadioCommunicationsFamilyPdu : public Pdu { EntityID _entityId; /** particular radio within an entity */ - unsigned short _radioId; + uint16_t _radioId; public: RadioCommunicationsFamilyPdu(); @@ -32,8 +32,8 @@ class OPENDIS7_EXPORT RadioCommunicationsFamilyPdu : public Pdu { const EntityID& getEntityId() const; void setEntityId(const EntityID& pX); - unsigned short getRadioId() const; - void setRadioId(unsigned short pX); + uint16_t getRadioId() const; + void setRadioId(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RadioIdentifier.cpp b/src/dis7/RadioIdentifier.cpp index 005f5d32..d16cfc2e 100644 --- a/src/dis7/RadioIdentifier.cpp +++ b/src/dis7/RadioIdentifier.cpp @@ -10,29 +10,29 @@ RadioIdentifier::RadioIdentifier() RadioIdentifier::~RadioIdentifier() {} -unsigned short RadioIdentifier::getSiteNumber() const { return _siteNumber; } +uint16_t RadioIdentifier::getSiteNumber() const { return _siteNumber; } -void RadioIdentifier::setSiteNumber(unsigned short pX) { _siteNumber = pX; } +void RadioIdentifier::setSiteNumber(uint16_t pX) { _siteNumber = pX; } -unsigned short RadioIdentifier::getApplicationNumber() const { +uint16_t RadioIdentifier::getApplicationNumber() const { return _applicationNumber; } -void RadioIdentifier::setApplicationNumber(unsigned short pX) { +void RadioIdentifier::setApplicationNumber(uint16_t pX) { _applicationNumber = pX; } -unsigned short RadioIdentifier::getReferenceNumber() const { +uint16_t RadioIdentifier::getReferenceNumber() const { return _referenceNumber; } -void RadioIdentifier::setReferenceNumber(unsigned short pX) { +void RadioIdentifier::setReferenceNumber(uint16_t pX) { _referenceNumber = pX; } -unsigned short RadioIdentifier::getRadioNumber() const { return _radioNumber; } +uint16_t RadioIdentifier::getRadioNumber() const { return _radioNumber; } -void RadioIdentifier::setRadioNumber(unsigned short pX) { _radioNumber = pX; } +void RadioIdentifier::setRadioNumber(uint16_t pX) { _radioNumber = pX; } void RadioIdentifier::marshal(DataStream& dataStream) const { dataStream << _siteNumber; diff --git a/src/dis7/RadioIdentifier.h b/src/dis7/RadioIdentifier.h index 4df25b99..b46ec820 100644 --- a/src/dis7/RadioIdentifier.h +++ b/src/dis7/RadioIdentifier.h @@ -15,16 +15,16 @@ namespace DIS { class OPENDIS7_EXPORT RadioIdentifier { protected: /** site */ - unsigned short _siteNumber; + uint16_t _siteNumber; /** application number */ - unsigned short _applicationNumber; + uint16_t _applicationNumber; /** reference number */ - unsigned short _referenceNumber; + uint16_t _referenceNumber; /** Radio number */ - unsigned short _radioNumber; + uint16_t _radioNumber; public: RadioIdentifier(); @@ -33,17 +33,17 @@ class OPENDIS7_EXPORT RadioIdentifier { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSiteNumber() const; - void setSiteNumber(unsigned short pX); + uint16_t getSiteNumber() const; + void setSiteNumber(uint16_t pX); - unsigned short getApplicationNumber() const; - void setApplicationNumber(unsigned short pX); + uint16_t getApplicationNumber() const; + void setApplicationNumber(uint16_t pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + uint16_t getReferenceNumber() const; + void setReferenceNumber(uint16_t pX); - unsigned short getRadioNumber() const; - void setRadioNumber(unsigned short pX); + uint16_t getRadioNumber() const; + void setRadioNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RadioType.cpp b/src/dis7/RadioType.cpp index 5daa6b6c..c24e9557 100644 --- a/src/dis7/RadioType.cpp +++ b/src/dis7/RadioType.cpp @@ -13,33 +13,33 @@ RadioType::RadioType() RadioType::~RadioType() {} -unsigned char RadioType::getEntityKind() const { return _entityKind; } +uint8_t RadioType::getEntityKind() const { return _entityKind; } -void RadioType::setEntityKind(unsigned char pX) { _entityKind = pX; } +void RadioType::setEntityKind(uint8_t pX) { _entityKind = pX; } -unsigned char RadioType::getDomain() const { return _domain; } +uint8_t RadioType::getDomain() const { return _domain; } -void RadioType::setDomain(unsigned char pX) { _domain = pX; } +void RadioType::setDomain(uint8_t pX) { _domain = pX; } -unsigned short RadioType::getCountry() const { return _country; } +uint16_t RadioType::getCountry() const { return _country; } -void RadioType::setCountry(unsigned short pX) { _country = pX; } +void RadioType::setCountry(uint16_t pX) { _country = pX; } -unsigned char RadioType::getCategory() const { return _category; } +uint8_t RadioType::getCategory() const { return _category; } -void RadioType::setCategory(unsigned char pX) { _category = pX; } +void RadioType::setCategory(uint8_t pX) { _category = pX; } -unsigned char RadioType::getSubcategory() const { return _subcategory; } +uint8_t RadioType::getSubcategory() const { return _subcategory; } -void RadioType::setSubcategory(unsigned char pX) { _subcategory = pX; } +void RadioType::setSubcategory(uint8_t pX) { _subcategory = pX; } -unsigned char RadioType::getSpecific() const { return _specific; } +uint8_t RadioType::getSpecific() const { return _specific; } -void RadioType::setSpecific(unsigned char pX) { _specific = pX; } +void RadioType::setSpecific(uint8_t pX) { _specific = pX; } -unsigned char RadioType::getExtra() const { return _extra; } +uint8_t RadioType::getExtra() const { return _extra; } -void RadioType::setExtra(unsigned char pX) { _extra = pX; } +void RadioType::setExtra(uint8_t pX) { _extra = pX; } void RadioType::marshal(DataStream& dataStream) const { dataStream << _entityKind; diff --git a/src/dis7/RadioType.h b/src/dis7/RadioType.h index 58ee55ef..555f6e3e 100644 --- a/src/dis7/RadioType.h +++ b/src/dis7/RadioType.h @@ -14,23 +14,23 @@ namespace DIS { class OPENDIS7_EXPORT RadioType { protected: /** Kind of entity */ - unsigned char _entityKind; + uint8_t _entityKind; /** Domain of entity (air, surface, subsurface, space, etc) */ - unsigned char _domain; + uint8_t _domain; /** country to which the design of the entity is attributed */ - unsigned short _country; + uint16_t _country; /** category of entity */ - unsigned char _category; + uint8_t _category; /** specific info based on subcategory field */ - unsigned char _subcategory; + uint8_t _subcategory; - unsigned char _specific; + uint8_t _specific; - unsigned char _extra; + uint8_t _extra; public: RadioType(); @@ -39,26 +39,26 @@ class OPENDIS7_EXPORT RadioType { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getEntityKind() const; - void setEntityKind(unsigned char pX); + uint8_t getEntityKind() const; + void setEntityKind(uint8_t pX); - unsigned char getDomain() const; - void setDomain(unsigned char pX); + uint8_t getDomain() const; + void setDomain(uint8_t pX); - unsigned short getCountry() const; - void setCountry(unsigned short pX); + uint16_t getCountry() const; + void setCountry(uint16_t pX); - unsigned char getCategory() const; - void setCategory(unsigned char pX); + uint8_t getCategory() const; + void setCategory(uint8_t pX); - unsigned char getSubcategory() const; - void setSubcategory(unsigned char pX); + uint8_t getSubcategory() const; + void setSubcategory(uint8_t pX); - unsigned char getSpecific() const; - void setSpecific(unsigned char pX); + uint8_t getSpecific() const; + void setSpecific(uint8_t pX); - unsigned char getExtra() const; - void setExtra(unsigned char pX); + uint8_t getExtra() const; + void setExtra(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ReceiverPdu.cpp b/src/dis7/ReceiverPdu.cpp index 8137cc12..f3c06d41 100644 --- a/src/dis7/ReceiverPdu.cpp +++ b/src/dis7/ReceiverPdu.cpp @@ -14,13 +14,13 @@ ReceiverPdu::ReceiverPdu() ReceiverPdu::~ReceiverPdu() {} -unsigned short ReceiverPdu::getReceiverState() const { return _receiverState; } +uint16_t ReceiverPdu::getReceiverState() const { return _receiverState; } -void ReceiverPdu::setReceiverState(unsigned short pX) { _receiverState = pX; } +void ReceiverPdu::setReceiverState(uint16_t pX) { _receiverState = pX; } -unsigned short ReceiverPdu::getPadding1() const { return _padding1; } +uint16_t ReceiverPdu::getPadding1() const { return _padding1; } -void ReceiverPdu::setPadding1(unsigned short pX) { _padding1 = pX; } +void ReceiverPdu::setPadding1(uint16_t pX) { _padding1 = pX; } float ReceiverPdu::getReceivedPower() const { return _receivedPower; } @@ -36,11 +36,11 @@ void ReceiverPdu::setTransmitterEntityId(const EntityID& pX) { _transmitterEntityId = pX; } -unsigned short ReceiverPdu::getTransmitterRadioId() const { +uint16_t ReceiverPdu::getTransmitterRadioId() const { return _transmitterRadioId; } -void ReceiverPdu::setTransmitterRadioId(unsigned short pX) { +void ReceiverPdu::setTransmitterRadioId(uint16_t pX) { _transmitterRadioId = pX; } diff --git a/src/dis7/ReceiverPdu.h b/src/dis7/ReceiverPdu.h index e9360518..032d3712 100644 --- a/src/dis7/ReceiverPdu.h +++ b/src/dis7/ReceiverPdu.h @@ -16,10 +16,10 @@ namespace DIS { class OPENDIS7_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { protected: /** encoding scheme used, and enumeration */ - unsigned short _receiverState; + uint16_t _receiverState; /** padding */ - unsigned short _padding1; + uint16_t _padding1; /** received power */ float _receivedPower; @@ -28,7 +28,7 @@ class OPENDIS7_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { EntityID _transmitterEntityId; /** ID of transmitting radio */ - unsigned short _transmitterRadioId; + uint16_t _transmitterRadioId; public: ReceiverPdu(); @@ -37,11 +37,11 @@ class OPENDIS7_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getReceiverState() const; - void setReceiverState(unsigned short pX); + uint16_t getReceiverState() const; + void setReceiverState(uint16_t pX); - unsigned short getPadding1() const; - void setPadding1(unsigned short pX); + uint16_t getPadding1() const; + void setPadding1(uint16_t pX); float getReceivedPower() const; void setReceivedPower(float pX); @@ -50,8 +50,8 @@ class OPENDIS7_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { const EntityID& getTransmitterEntityId() const; void setTransmitterEntityId(const EntityID& pX); - unsigned short getTransmitterRadioId() const; - void setTransmitterRadioId(unsigned short pX); + uint16_t getTransmitterRadioId() const; + void setTransmitterRadioId(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RecordQueryReliablePdu.cpp b/src/dis7/RecordQueryReliablePdu.cpp index 018e89d9..4cece548 100644 --- a/src/dis7/RecordQueryReliablePdu.cpp +++ b/src/dis7/RecordQueryReliablePdu.cpp @@ -16,39 +16,39 @@ RecordQueryReliablePdu::RecordQueryReliablePdu() RecordQueryReliablePdu::~RecordQueryReliablePdu() { _recordIDs.clear(); } -unsigned int RecordQueryReliablePdu::getRequestID() const { return _requestID; } +uint32_t RecordQueryReliablePdu::getRequestID() const { return _requestID; } -void RecordQueryReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void RecordQueryReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned char RecordQueryReliablePdu::getRequiredReliabilityService() const { +uint8_t RecordQueryReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void RecordQueryReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void RecordQueryReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short RecordQueryReliablePdu::getPad1() const { return _pad1; } +uint16_t RecordQueryReliablePdu::getPad1() const { return _pad1; } -void RecordQueryReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void RecordQueryReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char RecordQueryReliablePdu::getPad2() const { return _pad2; } +uint8_t RecordQueryReliablePdu::getPad2() const { return _pad2; } -void RecordQueryReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void RecordQueryReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned short RecordQueryReliablePdu::getEventType() const { +uint16_t RecordQueryReliablePdu::getEventType() const { return _eventType; } -void RecordQueryReliablePdu::setEventType(unsigned short pX) { +void RecordQueryReliablePdu::setEventType(uint16_t pX) { _eventType = pX; } -unsigned int RecordQueryReliablePdu::getTime() const { return _time; } +uint32_t RecordQueryReliablePdu::getTime() const { return _time; } -void RecordQueryReliablePdu::setTime(unsigned int pX) { _time = pX; } +void RecordQueryReliablePdu::setTime(uint32_t pX) { _time = pX; } -unsigned int RecordQueryReliablePdu::getNumberOfRecords() const { +uint32_t RecordQueryReliablePdu::getNumberOfRecords() const { return _recordIDs.size(); } @@ -74,7 +74,7 @@ void RecordQueryReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad2; dataStream << _eventType; dataStream << _time; - dataStream << (unsigned int)_recordIDs.size(); + dataStream << (uint32_t)_recordIDs.size(); for (size_t idx = 0; idx < _recordIDs.size(); idx++) { FourByteChunk x = _recordIDs[idx]; @@ -135,7 +135,7 @@ int RecordQueryReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _time marshalSize = marshalSize + 4; // _numberOfRecords - for (unsigned long long idx = 0; idx < _recordIDs.size(); idx++) { + for (uint64_t idx = 0; idx < _recordIDs.size(); idx++) { FourByteChunk listElement = _recordIDs[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/RecordQueryReliablePdu.h b/src/dis7/RecordQueryReliablePdu.h index 82a4bd61..5abc8134 100644 --- a/src/dis7/RecordQueryReliablePdu.h +++ b/src/dis7/RecordQueryReliablePdu.h @@ -20,25 +20,25 @@ class OPENDIS7_EXPORT RecordQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ - unsigned int _requestID; + uint32_t _requestID; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding. The spec is unclear and contradictory here. */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** event type */ - unsigned short _eventType; + uint16_t _eventType; /** time */ - unsigned int _time; + uint32_t _time; /** numberOfRecords */ - unsigned int _numberOfRecords; + uint32_t _numberOfRecords; /** record IDs */ std::vector _recordIDs; @@ -50,25 +50,25 @@ class OPENDIS7_EXPORT RecordQueryReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned short getEventType() const; - void setEventType(unsigned short pX); + uint16_t getEventType() const; + void setEventType(uint16_t pX); - unsigned int getTime() const; - void setTime(unsigned int pX); + uint32_t getTime() const; + void setTime(uint32_t pX); - unsigned int getNumberOfRecords() const; + uint32_t getNumberOfRecords() const; std::vector& getRecordIDs(); const std::vector& getRecordIDs() const; diff --git a/src/dis7/RecordQuerySpecification.cpp b/src/dis7/RecordQuerySpecification.cpp index 6bae53f8..11b1e986 100644 --- a/src/dis7/RecordQuerySpecification.cpp +++ b/src/dis7/RecordQuerySpecification.cpp @@ -6,7 +6,7 @@ RecordQuerySpecification::RecordQuerySpecification() : _numberOfRecords(0) {} RecordQuerySpecification::~RecordQuerySpecification() { _records.clear(); } -unsigned int RecordQuerySpecification::getNumberOfRecords() const { +uint32_t RecordQuerySpecification::getNumberOfRecords() const { return _records.size(); } @@ -24,7 +24,7 @@ void RecordQuerySpecification::setRecords( } void RecordQuerySpecification::marshal(DataStream& dataStream) const { - dataStream << (unsigned int)_records.size(); + dataStream << (uint32_t)_records.size(); for (size_t idx = 0; idx < _records.size(); idx++) { FourByteChunk x = _records[idx]; @@ -59,7 +59,7 @@ int RecordQuerySpecification::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfRecords - for (unsigned long long idx = 0; idx < _records.size(); idx++) { + for (uint64_t idx = 0; idx < _records.size(); idx++) { FourByteChunk listElement = _records[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/RecordQuerySpecification.h b/src/dis7/RecordQuerySpecification.h index 85add2c4..4c18a40a 100644 --- a/src/dis7/RecordQuerySpecification.h +++ b/src/dis7/RecordQuerySpecification.h @@ -16,7 +16,7 @@ namespace DIS { class OPENDIS7_EXPORT RecordQuerySpecification { protected: - unsigned int _numberOfRecords; + uint32_t _numberOfRecords; /** variable length list of 32 bit records */ std::vector _records; @@ -28,7 +28,7 @@ class OPENDIS7_EXPORT RecordQuerySpecification { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfRecords() const; + uint32_t getNumberOfRecords() const; std::vector& getRecords(); const std::vector& getRecords() const; diff --git a/src/dis7/RecordSpecification.cpp b/src/dis7/RecordSpecification.cpp index d2ce8811..fd337f9c 100644 --- a/src/dis7/RecordSpecification.cpp +++ b/src/dis7/RecordSpecification.cpp @@ -6,7 +6,7 @@ RecordSpecification::RecordSpecification() : _numberOfRecordSets(0) {} RecordSpecification::~RecordSpecification() { _recordSets.clear(); } -unsigned int RecordSpecification::getNumberOfRecordSets() const { +uint32_t RecordSpecification::getNumberOfRecordSets() const { return _recordSets.size(); } @@ -25,7 +25,7 @@ void RecordSpecification::setRecordSets( } void RecordSpecification::marshal(DataStream& dataStream) const { - dataStream << (unsigned int)_recordSets.size(); + dataStream << (uint32_t)_recordSets.size(); for (size_t idx = 0; idx < _recordSets.size(); idx++) { RecordSpecificationElement x = _recordSets[idx]; @@ -59,7 +59,7 @@ int RecordSpecification::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfRecordSets - for (unsigned long long idx = 0; idx < _recordSets.size(); idx++) { + for (uint64_t idx = 0; idx < _recordSets.size(); idx++) { RecordSpecificationElement listElement = _recordSets[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/RecordSpecification.h b/src/dis7/RecordSpecification.h index 7d42fa4d..147e7a07 100644 --- a/src/dis7/RecordSpecification.h +++ b/src/dis7/RecordSpecification.h @@ -18,7 +18,7 @@ namespace DIS { class OPENDIS7_EXPORT RecordSpecification { protected: /** The number of record sets */ - unsigned int _numberOfRecordSets; + uint32_t _numberOfRecordSets; /** variable length list record specifications. */ std::vector _recordSets; @@ -30,7 +30,7 @@ class OPENDIS7_EXPORT RecordSpecification { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getNumberOfRecordSets() const; + uint32_t getNumberOfRecordSets() const; std::vector& getRecordSets(); const std::vector& getRecordSets() const; diff --git a/src/dis7/RecordSpecificationElement.cpp b/src/dis7/RecordSpecificationElement.cpp index 8decc3df..9e51a1ee 100644 --- a/src/dis7/RecordSpecificationElement.cpp +++ b/src/dis7/RecordSpecificationElement.cpp @@ -12,49 +12,49 @@ RecordSpecificationElement::RecordSpecificationElement() RecordSpecificationElement::~RecordSpecificationElement() {} -unsigned int RecordSpecificationElement::getRecordID() const { +uint32_t RecordSpecificationElement::getRecordID() const { return _recordID; } -void RecordSpecificationElement::setRecordID(unsigned int pX) { +void RecordSpecificationElement::setRecordID(uint32_t pX) { _recordID = pX; } -unsigned int RecordSpecificationElement::getRecordSetSerialNumber() const { +uint32_t RecordSpecificationElement::getRecordSetSerialNumber() const { return _recordSetSerialNumber; } -void RecordSpecificationElement::setRecordSetSerialNumber(unsigned int pX) { +void RecordSpecificationElement::setRecordSetSerialNumber(uint32_t pX) { _recordSetSerialNumber = pX; } -unsigned short RecordSpecificationElement::getRecordLength() const { +uint16_t RecordSpecificationElement::getRecordLength() const { return _recordLength; } -void RecordSpecificationElement::setRecordLength(unsigned short pX) { +void RecordSpecificationElement::setRecordLength(uint16_t pX) { _recordLength = pX; } -unsigned short RecordSpecificationElement::getRecordCount() const { +uint16_t RecordSpecificationElement::getRecordCount() const { return _recordCount; } -void RecordSpecificationElement::setRecordCount(unsigned short pX) { +void RecordSpecificationElement::setRecordCount(uint16_t pX) { _recordCount = pX; } -unsigned short RecordSpecificationElement::getRecordValues() const { +uint16_t RecordSpecificationElement::getRecordValues() const { return _recordValues; } -void RecordSpecificationElement::setRecordValues(unsigned short pX) { +void RecordSpecificationElement::setRecordValues(uint16_t pX) { _recordValues = pX; } -unsigned char RecordSpecificationElement::getPad4() const { return _pad4; } +uint8_t RecordSpecificationElement::getPad4() const { return _pad4; } -void RecordSpecificationElement::setPad4(unsigned char pX) { _pad4 = pX; } +void RecordSpecificationElement::setPad4(uint8_t pX) { _pad4 = pX; } void RecordSpecificationElement::marshal(DataStream& dataStream) const { dataStream << _recordID; diff --git a/src/dis7/RecordSpecificationElement.h b/src/dis7/RecordSpecificationElement.h index 13169eaa..ff24a495 100644 --- a/src/dis7/RecordSpecificationElement.h +++ b/src/dis7/RecordSpecificationElement.h @@ -16,27 +16,27 @@ class OPENDIS7_EXPORT RecordSpecificationElement { protected: /** the data structure used to convey the parameter values of the record for * each record. 32 bit enumeration. */ - unsigned int _recordID; + uint32_t _recordID; /** the serial number of the first record in the block of records */ - unsigned int _recordSetSerialNumber; + uint32_t _recordSetSerialNumber; /** the length, in bits, of the record. Note, bits, not bytes. */ - unsigned short _recordLength; + uint16_t _recordLength; /** the number of records included in the record set */ - unsigned short _recordCount; + uint16_t _recordCount; /** the concatenated records of the format specified by the Record ID field. * The length of this field is the Record Length multiplied by the Record * Count, in units of bits. ^^^This is wrong--variable sized data records, bit * values. THis MUST be patched after generation. */ - unsigned short _recordValues; + uint16_t _recordValues; /** Padding of 0 to 31 unused bits as required for 32-bit alignment of the * Record Set field. ^^^This is wrong--variable sized padding. MUST be patched * post-code generation */ - unsigned char _pad4; + uint8_t _pad4; public: RecordSpecificationElement(); @@ -45,23 +45,23 @@ class OPENDIS7_EXPORT RecordSpecificationElement { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordID() const; - void setRecordID(unsigned int pX); + uint32_t getRecordID() const; + void setRecordID(uint32_t pX); - unsigned int getRecordSetSerialNumber() const; - void setRecordSetSerialNumber(unsigned int pX); + uint32_t getRecordSetSerialNumber() const; + void setRecordSetSerialNumber(uint32_t pX); - unsigned short getRecordLength() const; - void setRecordLength(unsigned short pX); + uint16_t getRecordLength() const; + void setRecordLength(uint16_t pX); - unsigned short getRecordCount() const; - void setRecordCount(unsigned short pX); + uint16_t getRecordCount() const; + void setRecordCount(uint16_t pX); - unsigned short getRecordValues() const; - void setRecordValues(unsigned short pX); + uint16_t getRecordValues() const; + void setRecordValues(uint16_t pX); - unsigned char getPad4() const; - void setPad4(unsigned char pX); + uint8_t getPad4() const; + void setPad4(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/Relationship.cpp b/src/dis7/Relationship.cpp index 830145e5..8e9ac6d8 100644 --- a/src/dis7/Relationship.cpp +++ b/src/dis7/Relationship.cpp @@ -6,13 +6,13 @@ Relationship::Relationship() : _nature(0), _position(0) {} Relationship::~Relationship() {} -unsigned short Relationship::getNature() const { return _nature; } +uint16_t Relationship::getNature() const { return _nature; } -void Relationship::setNature(unsigned short pX) { _nature = pX; } +void Relationship::setNature(uint16_t pX) { _nature = pX; } -unsigned short Relationship::getPosition() const { return _position; } +uint16_t Relationship::getPosition() const { return _position; } -void Relationship::setPosition(unsigned short pX) { _position = pX; } +void Relationship::setPosition(uint16_t pX) { _position = pX; } void Relationship::marshal(DataStream& dataStream) const { dataStream << _nature; diff --git a/src/dis7/Relationship.h b/src/dis7/Relationship.h index c1591701..75522c7f 100644 --- a/src/dis7/Relationship.h +++ b/src/dis7/Relationship.h @@ -15,11 +15,11 @@ class OPENDIS7_EXPORT Relationship { protected: /** the nature or purpose for joining of the part entity to the host entity * and shall be represented by a 16-bit enumeration */ - unsigned short _nature; + uint16_t _nature; /** the position of the part entity with respect to the host entity and shall * be represented by a 16-bit enumeration */ - unsigned short _position; + uint16_t _position; public: Relationship(); @@ -28,11 +28,11 @@ class OPENDIS7_EXPORT Relationship { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getNature() const; - void setNature(unsigned short pX); + uint16_t getNature() const; + void setNature(uint16_t pX); - unsigned short getPosition() const; - void setPosition(unsigned short pX); + uint16_t getPosition() const; + void setPosition(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RemoveEntityPdu.cpp b/src/dis7/RemoveEntityPdu.cpp index 0e10ef2e..dfb0252f 100644 --- a/src/dis7/RemoveEntityPdu.cpp +++ b/src/dis7/RemoveEntityPdu.cpp @@ -28,9 +28,9 @@ const EntityID& RemoveEntityPdu::getReceivingID() const { return _receivingID; } void RemoveEntityPdu::setReceivingID(const EntityID& pX) { _receivingID = pX; } -unsigned int RemoveEntityPdu::getRequestID() const { return _requestID; } +uint32_t RemoveEntityPdu::getRequestID() const { return _requestID; } -void RemoveEntityPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void RemoveEntityPdu::setRequestID(uint32_t pX) { _requestID = pX; } void RemoveEntityPdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis7/RemoveEntityPdu.h b/src/dis7/RemoveEntityPdu.h index ed250157..8600229c 100644 --- a/src/dis7/RemoveEntityPdu.h +++ b/src/dis7/RemoveEntityPdu.h @@ -24,7 +24,7 @@ class OPENDIS7_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu { /** This field shall identify the specific and unique start/resume request * being made by the SM */ - unsigned int _requestID; + uint32_t _requestID; public: RemoveEntityPdu(); @@ -41,8 +41,8 @@ class OPENDIS7_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu { const EntityID& getReceivingID() const; void setReceivingID(const EntityID& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RemoveEntityReliablePdu.cpp b/src/dis7/RemoveEntityReliablePdu.cpp index 81a064e8..352c2bd2 100644 --- a/src/dis7/RemoveEntityReliablePdu.cpp +++ b/src/dis7/RemoveEntityReliablePdu.cpp @@ -13,27 +13,27 @@ RemoveEntityReliablePdu::RemoveEntityReliablePdu() RemoveEntityReliablePdu::~RemoveEntityReliablePdu() {} -unsigned char RemoveEntityReliablePdu::getRequiredReliabilityService() const { +uint8_t RemoveEntityReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void RemoveEntityReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void RemoveEntityReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short RemoveEntityReliablePdu::getPad1() const { return _pad1; } +uint16_t RemoveEntityReliablePdu::getPad1() const { return _pad1; } -void RemoveEntityReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void RemoveEntityReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char RemoveEntityReliablePdu::getPad2() const { return _pad2; } +uint8_t RemoveEntityReliablePdu::getPad2() const { return _pad2; } -void RemoveEntityReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void RemoveEntityReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int RemoveEntityReliablePdu::getRequestID() const { +uint32_t RemoveEntityReliablePdu::getRequestID() const { return _requestID; } -void RemoveEntityReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void RemoveEntityReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void RemoveEntityReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis7/RemoveEntityReliablePdu.h b/src/dis7/RemoveEntityReliablePdu.h index c9915547..65750ccb 100644 --- a/src/dis7/RemoveEntityReliablePdu.h +++ b/src/dis7/RemoveEntityReliablePdu.h @@ -16,16 +16,16 @@ class OPENDIS7_EXPORT RemoveEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: RemoveEntityReliablePdu(); @@ -34,17 +34,17 @@ class OPENDIS7_EXPORT RemoveEntityReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RepairCompletePdu.cpp b/src/dis7/RepairCompletePdu.cpp index 298bc739..dd0884f9 100644 --- a/src/dis7/RepairCompletePdu.cpp +++ b/src/dis7/RepairCompletePdu.cpp @@ -37,13 +37,13 @@ void RepairCompletePdu::setRepairingEntityID(const EntityID& pX) { _repairingEntityID = pX; } -unsigned short RepairCompletePdu::getRepair() const { return _repair; } +uint16_t RepairCompletePdu::getRepair() const { return _repair; } -void RepairCompletePdu::setRepair(unsigned short pX) { _repair = pX; } +void RepairCompletePdu::setRepair(uint16_t pX) { _repair = pX; } -short RepairCompletePdu::getPadding4() const { return _padding4; } +int16_t RepairCompletePdu::getPadding4() const { return _padding4; } -void RepairCompletePdu::setPadding4(short pX) { _padding4 = pX; } +void RepairCompletePdu::setPadding4(int16_t pX) { _padding4 = pX; } void RepairCompletePdu::marshal(DataStream& dataStream) const { LogisticsFamilyPdu::marshal( diff --git a/src/dis7/RepairCompletePdu.h b/src/dis7/RepairCompletePdu.h index 142ed94a..a04a678c 100644 --- a/src/dis7/RepairCompletePdu.h +++ b/src/dis7/RepairCompletePdu.h @@ -23,10 +23,10 @@ class OPENDIS7_EXPORT RepairCompletePdu : public LogisticsFamilyPdu { EntityID _repairingEntityID; /** Enumeration for type of repair. See 6.2.74 */ - unsigned short _repair; + uint16_t _repair; /** padding, number prevents conflict with superclass ivar name */ - short _padding4; + int16_t _padding4; public: RepairCompletePdu(); @@ -43,11 +43,11 @@ class OPENDIS7_EXPORT RepairCompletePdu : public LogisticsFamilyPdu { const EntityID& getRepairingEntityID() const; void setRepairingEntityID(const EntityID& pX); - unsigned short getRepair() const; - void setRepair(unsigned short pX); + uint16_t getRepair() const; + void setRepair(uint16_t pX); - short getPadding4() const; - void setPadding4(short pX); + int16_t getPadding4() const; + void setPadding4(int16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/RepairResponsePdu.cpp b/src/dis7/RepairResponsePdu.cpp index dbc0d8dd..6240207e 100644 --- a/src/dis7/RepairResponsePdu.cpp +++ b/src/dis7/RepairResponsePdu.cpp @@ -38,17 +38,17 @@ void RepairResponsePdu::setRepairingEntityID(const EntityID& pX) { _repairingEntityID = pX; } -unsigned char RepairResponsePdu::getRepairResult() const { +uint8_t RepairResponsePdu::getRepairResult() const { return _repairResult; } -void RepairResponsePdu::setRepairResult(unsigned char pX) { +void RepairResponsePdu::setRepairResult(uint8_t pX) { _repairResult = pX; } -short RepairResponsePdu::getPadding1() const { return _padding1; } +int16_t RepairResponsePdu::getPadding1() const { return _padding1; } -void RepairResponsePdu::setPadding1(short pX) { _padding1 = pX; } +void RepairResponsePdu::setPadding1(int16_t pX) { _padding1 = pX; } char RepairResponsePdu::getPadding2() const { return _padding2; } diff --git a/src/dis7/RepairResponsePdu.h b/src/dis7/RepairResponsePdu.h index 15713787..fa1bd53f 100644 --- a/src/dis7/RepairResponsePdu.h +++ b/src/dis7/RepairResponsePdu.h @@ -22,10 +22,10 @@ class OPENDIS7_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { EntityID _repairingEntityID; /** Result of repair operation */ - unsigned char _repairResult; + uint8_t _repairResult; /** padding */ - short _padding1; + int16_t _padding1; /** padding */ char _padding2; @@ -45,11 +45,11 @@ class OPENDIS7_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { const EntityID& getRepairingEntityID() const; void setRepairingEntityID(const EntityID& pX); - unsigned char getRepairResult() const; - void setRepairResult(unsigned char pX); + uint8_t getRepairResult() const; + void setRepairResult(uint8_t pX); - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis7/ResupplyOfferPdu.cpp b/src/dis7/ResupplyOfferPdu.cpp index 42434a4f..b8f0cdd7 100644 --- a/src/dis7/ResupplyOfferPdu.cpp +++ b/src/dis7/ResupplyOfferPdu.cpp @@ -38,7 +38,7 @@ void ResupplyOfferPdu::setSupplyingEntityID(const EntityID& pX) { _supplyingEntityID = pX; } -unsigned char ResupplyOfferPdu::getNumberOfSupplyTypes() const { +uint8_t ResupplyOfferPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } @@ -46,9 +46,9 @@ char ResupplyOfferPdu::getPadding1() const { return _padding1; } void ResupplyOfferPdu::setPadding1(char pX) { _padding1 = pX; } -short ResupplyOfferPdu::getPadding2() const { return _padding2; } +int16_t ResupplyOfferPdu::getPadding2() const { return _padding2; } -void ResupplyOfferPdu::setPadding2(short pX) { _padding2 = pX; } +void ResupplyOfferPdu::setPadding2(int16_t pX) { _padding2 = pX; } std::vector& ResupplyOfferPdu::getSupplies() { return _supplies; @@ -67,7 +67,7 @@ void ResupplyOfferPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _receivingEntityID.marshal(dataStream); _supplyingEntityID.marshal(dataStream); - dataStream << (unsigned char)_supplies.size(); + dataStream << (uint8_t)_supplies.size(); dataStream << _padding1; dataStream << _padding2; @@ -123,7 +123,7 @@ int ResupplyOfferPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _padding1 marshalSize = marshalSize + 2; // _padding2 - for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + for (uint64_t idx = 0; idx < _supplies.size(); idx++) { SupplyQuantity listElement = _supplies[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ResupplyOfferPdu.h b/src/dis7/ResupplyOfferPdu.h index 53373013..8128e074 100644 --- a/src/dis7/ResupplyOfferPdu.h +++ b/src/dis7/ResupplyOfferPdu.h @@ -28,13 +28,13 @@ class OPENDIS7_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { EntityID _supplyingEntityID; /** How many supplies types are being offered, Section 7.4.3 */ - unsigned char _numberOfSupplyTypes; + uint8_t _numberOfSupplyTypes; /** padding */ char _padding1; /** padding */ - short _padding2; + int16_t _padding2; /** A Reord that Specifies the type of supply and the amount of that supply * for each of the supply types in numberOfSupplyTypes (see 6.2.85), @@ -56,13 +56,13 @@ class OPENDIS7_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { const EntityID& getSupplyingEntityID() const; void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + uint8_t getNumberOfSupplyTypes() const; char getPadding1() const; void setPadding1(char pX); - short getPadding2() const; - void setPadding2(short pX); + int16_t getPadding2() const; + void setPadding2(int16_t pX); std::vector& getSupplies(); const std::vector& getSupplies() const; diff --git a/src/dis7/ResupplyReceivedPdu.cpp b/src/dis7/ResupplyReceivedPdu.cpp index 98bb658f..088216b6 100644 --- a/src/dis7/ResupplyReceivedPdu.cpp +++ b/src/dis7/ResupplyReceivedPdu.cpp @@ -38,13 +38,13 @@ void ResupplyReceivedPdu::setSupplyingEntityID(const EntityID& pX) { _supplyingEntityID = pX; } -unsigned char ResupplyReceivedPdu::getNumberOfSupplyTypes() const { +uint8_t ResupplyReceivedPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } -short ResupplyReceivedPdu::getPadding1() const { return _padding1; } +int16_t ResupplyReceivedPdu::getPadding1() const { return _padding1; } -void ResupplyReceivedPdu::setPadding1(short pX) { _padding1 = pX; } +void ResupplyReceivedPdu::setPadding1(int16_t pX) { _padding1 = pX; } char ResupplyReceivedPdu::getPadding2() const { return _padding2; } @@ -67,7 +67,7 @@ void ResupplyReceivedPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first _receivingEntityID.marshal(dataStream); _supplyingEntityID.marshal(dataStream); - dataStream << (unsigned char)_supplies.size(); + dataStream << (uint8_t)_supplies.size(); dataStream << _padding1; dataStream << _padding2; @@ -123,7 +123,7 @@ int ResupplyReceivedPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _padding1 marshalSize = marshalSize + 1; // _padding2 - for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + for (uint64_t idx = 0; idx < _supplies.size(); idx++) { SupplyQuantity listElement = _supplies[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ResupplyReceivedPdu.h b/src/dis7/ResupplyReceivedPdu.h index ef38a79c..deb69ff2 100644 --- a/src/dis7/ResupplyReceivedPdu.h +++ b/src/dis7/ResupplyReceivedPdu.h @@ -28,10 +28,10 @@ class OPENDIS7_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { EntityID _supplyingEntityID; /** How many supplies are taken by receiving entity */ - unsigned char _numberOfSupplyTypes; + uint8_t _numberOfSupplyTypes; /** padding */ - short _padding1; + int16_t _padding1; /** padding */ char _padding2; @@ -55,10 +55,10 @@ class OPENDIS7_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { const EntityID& getSupplyingEntityID() const; void setSupplyingEntityID(const EntityID& pX); - unsigned char getNumberOfSupplyTypes() const; + uint8_t getNumberOfSupplyTypes() const; - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); char getPadding2() const; void setPadding2(char pX); diff --git a/src/dis7/SecondaryOperationalData.cpp b/src/dis7/SecondaryOperationalData.cpp index 894dd69b..6ad61e1c 100644 --- a/src/dis7/SecondaryOperationalData.cpp +++ b/src/dis7/SecondaryOperationalData.cpp @@ -9,29 +9,29 @@ SecondaryOperationalData::SecondaryOperationalData() SecondaryOperationalData::~SecondaryOperationalData() {} -unsigned char SecondaryOperationalData::getOperationalData1() const { +uint8_t SecondaryOperationalData::getOperationalData1() const { return _operationalData1; } -void SecondaryOperationalData::setOperationalData1(unsigned char pX) { +void SecondaryOperationalData::setOperationalData1(uint8_t pX) { _operationalData1 = pX; } -unsigned char SecondaryOperationalData::getOperationalData2() const { +uint8_t SecondaryOperationalData::getOperationalData2() const { return _operationalData2; } -void SecondaryOperationalData::setOperationalData2(unsigned char pX) { +void SecondaryOperationalData::setOperationalData2(uint8_t pX) { _operationalData2 = pX; } -unsigned short +uint16_t SecondaryOperationalData::getNumberOfIFFFundamentalParameterRecords() const { return _numberOfIFFFundamentalParameterRecords; } void SecondaryOperationalData::setNumberOfIFFFundamentalParameterRecords( - unsigned short pX) { + uint16_t pX) { _numberOfIFFFundamentalParameterRecords = pX; } diff --git a/src/dis7/SecondaryOperationalData.h b/src/dis7/SecondaryOperationalData.h index 8f286edc..e40ead8e 100644 --- a/src/dis7/SecondaryOperationalData.h +++ b/src/dis7/SecondaryOperationalData.h @@ -16,14 +16,14 @@ class OPENDIS7_EXPORT SecondaryOperationalData { protected: /** additional operational characteristics of the IFF emitting system. Each * 8-bit field will vary depending on the system type. */ - unsigned char _operationalData1; + uint8_t _operationalData1; /** additional operational characteristics of the IFF emitting system. Each * 8-bit field will vary depending on the system type. */ - unsigned char _operationalData2; + uint8_t _operationalData2; /** the number of IFF Fundamental Parameter Data records that follow */ - unsigned short _numberOfIFFFundamentalParameterRecords; + uint16_t _numberOfIFFFundamentalParameterRecords; public: SecondaryOperationalData(); @@ -32,14 +32,14 @@ class OPENDIS7_EXPORT SecondaryOperationalData { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getOperationalData1() const; - void setOperationalData1(unsigned char pX); + uint8_t getOperationalData1() const; + void setOperationalData1(uint8_t pX); - unsigned char getOperationalData2() const; - void setOperationalData2(unsigned char pX); + uint8_t getOperationalData2() const; + void setOperationalData2(uint8_t pX); - unsigned short getNumberOfIFFFundamentalParameterRecords() const; - void setNumberOfIFFFundamentalParameterRecords(unsigned short pX); + uint16_t getNumberOfIFFFundamentalParameterRecords() const; + void setNumberOfIFFFundamentalParameterRecords(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/SeesPdu.cpp b/src/dis7/SeesPdu.cpp index 4febaaec..22e7f902 100644 --- a/src/dis7/SeesPdu.cpp +++ b/src/dis7/SeesPdu.cpp @@ -28,37 +28,37 @@ void SeesPdu::setOrginatingEntityID(const EntityID& pX) { _orginatingEntityID = pX; } -unsigned short SeesPdu::getInfraredSignatureRepresentationIndex() const { +uint16_t SeesPdu::getInfraredSignatureRepresentationIndex() const { return _infraredSignatureRepresentationIndex; } -void SeesPdu::setInfraredSignatureRepresentationIndex(unsigned short pX) { +void SeesPdu::setInfraredSignatureRepresentationIndex(uint16_t pX) { _infraredSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getAcousticSignatureRepresentationIndex() const { +uint16_t SeesPdu::getAcousticSignatureRepresentationIndex() const { return _acousticSignatureRepresentationIndex; } -void SeesPdu::setAcousticSignatureRepresentationIndex(unsigned short pX) { +void SeesPdu::setAcousticSignatureRepresentationIndex(uint16_t pX) { _acousticSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() +uint16_t SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() const { return _radarCrossSectionSignatureRepresentationIndex; } void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex( - unsigned short pX) { + uint16_t pX) { _radarCrossSectionSignatureRepresentationIndex = pX; } -unsigned short SeesPdu::getNumberOfPropulsionSystems() const { +uint16_t SeesPdu::getNumberOfPropulsionSystems() const { return _propulsionSystemData.size(); } -unsigned short SeesPdu::getNumberOfVectoringNozzleSystems() const { +uint16_t SeesPdu::getNumberOfVectoringNozzleSystems() const { return _vectoringSystemData.size(); } @@ -97,8 +97,8 @@ void SeesPdu::marshal(DataStream& dataStream) const { dataStream << _infraredSignatureRepresentationIndex; dataStream << _acousticSignatureRepresentationIndex; dataStream << _radarCrossSectionSignatureRepresentationIndex; - dataStream << (unsigned short)_propulsionSystemData.size(); - dataStream << (unsigned short)_vectoringSystemData.size(); + dataStream << (uint16_t)_propulsionSystemData.size(); + dataStream << (uint16_t)_vectoringSystemData.size(); for (size_t idx = 0; idx < _propulsionSystemData.size(); idx++) { PropulsionSystemData x = _propulsionSystemData[idx]; @@ -178,12 +178,12 @@ int SeesPdu::getMarshalledSize() const { marshalSize = marshalSize + 2; // _numberOfPropulsionSystems marshalSize = marshalSize + 2; // _numberOfVectoringNozzleSystems - for (unsigned long long idx = 0; idx < _propulsionSystemData.size(); idx++) { + for (uint64_t idx = 0; idx < _propulsionSystemData.size(); idx++) { PropulsionSystemData listElement = _propulsionSystemData[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _vectoringSystemData.size(); idx++) { + for (uint64_t idx = 0; idx < _vectoringSystemData.size(); idx++) { VectoringNozzleSystem listElement = _vectoringSystemData[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/SeesPdu.h b/src/dis7/SeesPdu.h index 091c6c4d..3c1dc652 100644 --- a/src/dis7/SeesPdu.h +++ b/src/dis7/SeesPdu.h @@ -24,19 +24,19 @@ class OPENDIS7_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu { EntityID _orginatingEntityID; /** IR Signature representation index */ - unsigned short _infraredSignatureRepresentationIndex; + uint16_t _infraredSignatureRepresentationIndex; /** acoustic Signature representation index */ - unsigned short _acousticSignatureRepresentationIndex; + uint16_t _acousticSignatureRepresentationIndex; /** radar cross section representation index */ - unsigned short _radarCrossSectionSignatureRepresentationIndex; + uint16_t _radarCrossSectionSignatureRepresentationIndex; /** how many propulsion systems */ - unsigned short _numberOfPropulsionSystems; + uint16_t _numberOfPropulsionSystems; /** how many vectoring nozzle systems */ - unsigned short _numberOfVectoringNozzleSystems; + uint16_t _numberOfVectoringNozzleSystems; /** variable length list of propulsion system data */ std::vector _propulsionSystemData; @@ -55,18 +55,18 @@ class OPENDIS7_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu { const EntityID& getOrginatingEntityID() const; void setOrginatingEntityID(const EntityID& pX); - unsigned short getInfraredSignatureRepresentationIndex() const; - void setInfraredSignatureRepresentationIndex(unsigned short pX); + uint16_t getInfraredSignatureRepresentationIndex() const; + void setInfraredSignatureRepresentationIndex(uint16_t pX); - unsigned short getAcousticSignatureRepresentationIndex() const; - void setAcousticSignatureRepresentationIndex(unsigned short pX); + uint16_t getAcousticSignatureRepresentationIndex() const; + void setAcousticSignatureRepresentationIndex(uint16_t pX); - unsigned short getRadarCrossSectionSignatureRepresentationIndex() const; - void setRadarCrossSectionSignatureRepresentationIndex(unsigned short pX); + uint16_t getRadarCrossSectionSignatureRepresentationIndex() const; + void setRadarCrossSectionSignatureRepresentationIndex(uint16_t pX); - unsigned short getNumberOfPropulsionSystems() const; + uint16_t getNumberOfPropulsionSystems() const; - unsigned short getNumberOfVectoringNozzleSystems() const; + uint16_t getNumberOfVectoringNozzleSystems() const; std::vector& getPropulsionSystemData(); const std::vector& getPropulsionSystemData() const; diff --git a/src/dis7/Sensor.cpp b/src/dis7/Sensor.cpp index 0c904aa4..178f4488 100644 --- a/src/dis7/Sensor.cpp +++ b/src/dis7/Sensor.cpp @@ -12,31 +12,31 @@ Sensor::Sensor() Sensor::~Sensor() {} -unsigned char Sensor::getSensorTypeSource() const { return _sensorTypeSource; } +uint8_t Sensor::getSensorTypeSource() const { return _sensorTypeSource; } -void Sensor::setSensorTypeSource(unsigned char pX) { _sensorTypeSource = pX; } +void Sensor::setSensorTypeSource(uint8_t pX) { _sensorTypeSource = pX; } -unsigned char Sensor::getSensorOnOffStatus() const { +uint8_t Sensor::getSensorOnOffStatus() const { return _sensorOnOffStatus; } -void Sensor::setSensorOnOffStatus(unsigned char pX) { _sensorOnOffStatus = pX; } +void Sensor::setSensorOnOffStatus(uint8_t pX) { _sensorOnOffStatus = pX; } -unsigned short Sensor::getSensorType() const { return _sensorType; } +uint16_t Sensor::getSensorType() const { return _sensorType; } -void Sensor::setSensorType(unsigned short pX) { _sensorType = pX; } +void Sensor::setSensorType(uint16_t pX) { _sensorType = pX; } -unsigned int Sensor::getStation() const { return _station; } +uint32_t Sensor::getStation() const { return _station; } -void Sensor::setStation(unsigned int pX) { _station = pX; } +void Sensor::setStation(uint32_t pX) { _station = pX; } -unsigned short Sensor::getQuantity() const { return _quantity; } +uint16_t Sensor::getQuantity() const { return _quantity; } -void Sensor::setQuantity(unsigned short pX) { _quantity = pX; } +void Sensor::setQuantity(uint16_t pX) { _quantity = pX; } -unsigned short Sensor::getPadding() const { return _padding; } +uint16_t Sensor::getPadding() const { return _padding; } -void Sensor::setPadding(unsigned short pX) { _padding = pX; } +void Sensor::setPadding(uint16_t pX) { _padding = pX; } void Sensor::marshal(DataStream& dataStream) const { dataStream << _sensorTypeSource; diff --git a/src/dis7/Sensor.h b/src/dis7/Sensor.h index d7841003..bb4afd96 100644 --- a/src/dis7/Sensor.h +++ b/src/dis7/Sensor.h @@ -14,26 +14,26 @@ namespace DIS { class OPENDIS7_EXPORT Sensor { protected: /** the source of the Sensor Type field */ - unsigned char _sensorTypeSource; + uint8_t _sensorTypeSource; /** the on/off status of the sensor */ - unsigned char _sensorOnOffStatus; + uint8_t _sensorOnOffStatus; /** the sensor type and shall be represented by a 16-bit enumeration. */ - unsigned short _sensorType; + uint16_t _sensorType; /** the station to which the sensor is assigned. A zero value shall indi- * cate that this Sensor record is not associated with any particular station * and represents the total quan- tity of this sensor for this entity. If this * field is non-zero, it shall either reference an attached part or an * articulated part */ - unsigned int _station; + uint32_t _station; /** quantity of the sensor */ - unsigned short _quantity; + uint16_t _quantity; /** padding */ - unsigned short _padding; + uint16_t _padding; public: Sensor(); @@ -42,23 +42,23 @@ class OPENDIS7_EXPORT Sensor { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getSensorTypeSource() const; - void setSensorTypeSource(unsigned char pX); + uint8_t getSensorTypeSource() const; + void setSensorTypeSource(uint8_t pX); - unsigned char getSensorOnOffStatus() const; - void setSensorOnOffStatus(unsigned char pX); + uint8_t getSensorOnOffStatus() const; + void setSensorOnOffStatus(uint8_t pX); - unsigned short getSensorType() const; - void setSensorType(unsigned short pX); + uint16_t getSensorType() const; + void setSensorType(uint16_t pX); - unsigned int getStation() const; - void setStation(unsigned int pX); + uint32_t getStation() const; + void setStation(uint32_t pX); - unsigned short getQuantity() const; - void setQuantity(unsigned short pX); + uint16_t getQuantity() const; + void setQuantity(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/SeparationVP.cpp b/src/dis7/SeparationVP.cpp index 212480e1..c5838a3e 100644 --- a/src/dis7/SeparationVP.cpp +++ b/src/dis7/SeparationVP.cpp @@ -13,29 +13,29 @@ SeparationVP::SeparationVP() SeparationVP::~SeparationVP() {} -unsigned char SeparationVP::getRecordType() const { return _recordType; } +uint8_t SeparationVP::getRecordType() const { return _recordType; } -void SeparationVP::setRecordType(unsigned char pX) { _recordType = pX; } +void SeparationVP::setRecordType(uint8_t pX) { _recordType = pX; } -unsigned char SeparationVP::getReasonForSeparation() const { +uint8_t SeparationVP::getReasonForSeparation() const { return _reasonForSeparation; } -void SeparationVP::setReasonForSeparation(unsigned char pX) { +void SeparationVP::setReasonForSeparation(uint8_t pX) { _reasonForSeparation = pX; } -unsigned char SeparationVP::getPreEntityIndicator() const { +uint8_t SeparationVP::getPreEntityIndicator() const { return _preEntityIndicator; } -void SeparationVP::setPreEntityIndicator(unsigned char pX) { +void SeparationVP::setPreEntityIndicator(uint8_t pX) { _preEntityIndicator = pX; } -unsigned char SeparationVP::getPadding1() const { return _padding1; } +uint8_t SeparationVP::getPadding1() const { return _padding1; } -void SeparationVP::setPadding1(unsigned char pX) { _padding1 = pX; } +void SeparationVP::setPadding1(uint8_t pX) { _padding1 = pX; } EntityID& SeparationVP::getParentEntityID() { return _parentEntityID; } @@ -47,15 +47,15 @@ void SeparationVP::setParentEntityID(const EntityID& pX) { _parentEntityID = pX; } -unsigned short SeparationVP::getPadding2() const { return _padding2; } +uint16_t SeparationVP::getPadding2() const { return _padding2; } -void SeparationVP::setPadding2(unsigned short pX) { _padding2 = pX; } +void SeparationVP::setPadding2(uint16_t pX) { _padding2 = pX; } -unsigned int SeparationVP::getStationLocation() const { +uint32_t SeparationVP::getStationLocation() const { return _stationLocation; } -void SeparationVP::setStationLocation(unsigned int pX) { +void SeparationVP::setStationLocation(uint32_t pX) { _stationLocation = pX; } diff --git a/src/dis7/SeparationVP.h b/src/dis7/SeparationVP.h index 343a042c..c9933b67 100644 --- a/src/dis7/SeparationVP.h +++ b/src/dis7/SeparationVP.h @@ -16,25 +16,25 @@ class OPENDIS7_EXPORT SeparationVP { protected: /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; + uint8_t _recordType; /** Reason for separation. EBV */ - unsigned char _reasonForSeparation; + uint8_t _reasonForSeparation; /** Whether the entity existed prior to separation EBV */ - unsigned char _preEntityIndicator; + uint8_t _preEntityIndicator; /** padding */ - unsigned char _padding1; + uint8_t _padding1; /** ID of parent */ EntityID _parentEntityID; /** padding */ - unsigned short _padding2; + uint16_t _padding2; /** Station separated from */ - unsigned int _stationLocation; + uint32_t _stationLocation; public: SeparationVP(); @@ -43,27 +43,27 @@ class OPENDIS7_EXPORT SeparationVP { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + uint8_t getRecordType() const; + void setRecordType(uint8_t pX); - unsigned char getReasonForSeparation() const; - void setReasonForSeparation(unsigned char pX); + uint8_t getReasonForSeparation() const; + void setReasonForSeparation(uint8_t pX); - unsigned char getPreEntityIndicator() const; - void setPreEntityIndicator(unsigned char pX); + uint8_t getPreEntityIndicator() const; + void setPreEntityIndicator(uint8_t pX); - unsigned char getPadding1() const; - void setPadding1(unsigned char pX); + uint8_t getPadding1() const; + void setPadding1(uint8_t pX); EntityID& getParentEntityID(); const EntityID& getParentEntityID() const; void setParentEntityID(const EntityID& pX); - unsigned short getPadding2() const; - void setPadding2(unsigned short pX); + uint16_t getPadding2() const; + void setPadding2(uint16_t pX); - unsigned int getStationLocation() const; - void setStationLocation(unsigned int pX); + uint32_t getStationLocation() const; + void setStationLocation(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/ServiceRequestPdu.cpp b/src/dis7/ServiceRequestPdu.cpp index 9ef835ad..8307be2b 100644 --- a/src/dis7/ServiceRequestPdu.cpp +++ b/src/dis7/ServiceRequestPdu.cpp @@ -38,23 +38,23 @@ void ServiceRequestPdu::setServicingEntityID(const EntityID& pX) { _servicingEntityID = pX; } -unsigned char ServiceRequestPdu::getServiceTypeRequested() const { +uint8_t ServiceRequestPdu::getServiceTypeRequested() const { return _serviceTypeRequested; } -void ServiceRequestPdu::setServiceTypeRequested(unsigned char pX) { +void ServiceRequestPdu::setServiceTypeRequested(uint8_t pX) { _serviceTypeRequested = pX; } -unsigned char ServiceRequestPdu::getNumberOfSupplyTypes() const { +uint8_t ServiceRequestPdu::getNumberOfSupplyTypes() const { return _supplies.size(); } -short ServiceRequestPdu::getServiceRequestPadding() const { +int16_t ServiceRequestPdu::getServiceRequestPadding() const { return _serviceRequestPadding; } -void ServiceRequestPdu::setServiceRequestPadding(short pX) { +void ServiceRequestPdu::setServiceRequestPadding(int16_t pX) { _serviceRequestPadding = pX; } @@ -76,7 +76,7 @@ void ServiceRequestPdu::marshal(DataStream& dataStream) const { _requestingEntityID.marshal(dataStream); _servicingEntityID.marshal(dataStream); dataStream << _serviceTypeRequested; - dataStream << (unsigned char)_supplies.size(); + dataStream << (uint8_t)_supplies.size(); dataStream << _serviceRequestPadding; for (size_t idx = 0; idx < _supplies.size(); idx++) { @@ -132,7 +132,7 @@ int ServiceRequestPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfSupplyTypes marshalSize = marshalSize + 2; // _serviceRequestPadding - for (unsigned long long idx = 0; idx < _supplies.size(); idx++) { + for (uint64_t idx = 0; idx < _supplies.size(); idx++) { SupplyQuantity listElement = _supplies[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/ServiceRequestPdu.h b/src/dis7/ServiceRequestPdu.h index ff2a779f..6595fbc6 100644 --- a/src/dis7/ServiceRequestPdu.h +++ b/src/dis7/ServiceRequestPdu.h @@ -26,13 +26,13 @@ class OPENDIS7_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { EntityID _servicingEntityID; /** Type of service requested, Section 7.4.2 */ - unsigned char _serviceTypeRequested; + uint8_t _serviceTypeRequested; /** How many requested, Section 7.4.2 */ - unsigned char _numberOfSupplyTypes; + uint8_t _numberOfSupplyTypes; /** padding */ - short _serviceRequestPadding; + int16_t _serviceRequestPadding; std::vector _supplies; @@ -51,13 +51,13 @@ class OPENDIS7_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { const EntityID& getServicingEntityID() const; void setServicingEntityID(const EntityID& pX); - unsigned char getServiceTypeRequested() const; - void setServiceTypeRequested(unsigned char pX); + uint8_t getServiceTypeRequested() const; + void setServiceTypeRequested(uint8_t pX); - unsigned char getNumberOfSupplyTypes() const; + uint8_t getNumberOfSupplyTypes() const; - short getServiceRequestPadding() const; - void setServiceRequestPadding(short pX); + int16_t getServiceRequestPadding() const; + void setServiceRequestPadding(int16_t pX); std::vector& getSupplies(); const std::vector& getSupplies() const; diff --git a/src/dis7/SetDataPdu.cpp b/src/dis7/SetDataPdu.cpp index b3e02edf..0d3d186f 100644 --- a/src/dis7/SetDataPdu.cpp +++ b/src/dis7/SetDataPdu.cpp @@ -16,19 +16,19 @@ SetDataPdu::~SetDataPdu() { _variableDatums.clear(); } -unsigned int SetDataPdu::getRequestID() const { return _requestID; } +uint32_t SetDataPdu::getRequestID() const { return _requestID; } -void SetDataPdu::setRequestID(unsigned int pX) { _requestID = pX; } +void SetDataPdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int SetDataPdu::getPadding1() const { return _padding1; } +uint32_t SetDataPdu::getPadding1() const { return _padding1; } -void SetDataPdu::setPadding1(unsigned int pX) { _padding1 = pX; } +void SetDataPdu::setPadding1(uint32_t pX) { _padding1 = pX; } -unsigned int SetDataPdu::getNumberOfFixedDatumRecords() const { +uint32_t SetDataPdu::getNumberOfFixedDatumRecords() const { return _fixedDatums.size(); } -unsigned int SetDataPdu::getNumberOfVariableDatumRecords() const { +uint32_t SetDataPdu::getNumberOfVariableDatumRecords() const { return _variableDatums.size(); } @@ -59,8 +59,8 @@ void SetDataPdu::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _requestID; dataStream << _padding1; - dataStream << (unsigned int)_fixedDatums.size(); - dataStream << (unsigned int)_variableDatums.size(); + dataStream << (uint32_t)_fixedDatums.size(); + dataStream << (uint32_t)_variableDatums.size(); for (size_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum x = _fixedDatums[idx]; @@ -124,12 +124,12 @@ int SetDataPdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatums.size(); idx++) { FixedDatum listElement = _fixedDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatums.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatums.size(); idx++) { VariableDatum listElement = _variableDatums[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/SetDataPdu.h b/src/dis7/SetDataPdu.h index 85611343..bf5eeaa2 100644 --- a/src/dis7/SetDataPdu.h +++ b/src/dis7/SetDataPdu.h @@ -20,16 +20,16 @@ namespace DIS { class OPENDIS7_EXPORT SetDataPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ - unsigned int _requestID; + uint32_t _requestID; /** padding */ - unsigned int _padding1; + uint32_t _padding1; /** Number of fixed datum records */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** Number of variable datum records */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** variable length list of fixed datums */ std::vector _fixedDatums; @@ -44,15 +44,15 @@ class OPENDIS7_EXPORT SetDataPdu : public SimulationManagementFamilyPdu { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getPadding1() const; - void setPadding1(unsigned int pX); + uint32_t getPadding1() const; + void setPadding1(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatums(); const std::vector& getFixedDatums() const; diff --git a/src/dis7/SetDataReliablePdu.cpp b/src/dis7/SetDataReliablePdu.cpp index 34341c00..8de4d9d1 100644 --- a/src/dis7/SetDataReliablePdu.cpp +++ b/src/dis7/SetDataReliablePdu.cpp @@ -18,31 +18,31 @@ SetDataReliablePdu::~SetDataReliablePdu() { _variableDatumRecords.clear(); } -unsigned char SetDataReliablePdu::getRequiredReliabilityService() const { +uint8_t SetDataReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void SetDataReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void SetDataReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short SetDataReliablePdu::getPad1() const { return _pad1; } +uint16_t SetDataReliablePdu::getPad1() const { return _pad1; } -void SetDataReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void SetDataReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char SetDataReliablePdu::getPad2() const { return _pad2; } +uint8_t SetDataReliablePdu::getPad2() const { return _pad2; } -void SetDataReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void SetDataReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int SetDataReliablePdu::getRequestID() const { return _requestID; } +uint32_t SetDataReliablePdu::getRequestID() const { return _requestID; } -void SetDataReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void SetDataReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } -unsigned int SetDataReliablePdu::getNumberOfFixedDatumRecords() const { +uint32_t SetDataReliablePdu::getNumberOfFixedDatumRecords() const { return _fixedDatumRecords.size(); } -unsigned int SetDataReliablePdu::getNumberOfVariableDatumRecords() const { +uint32_t SetDataReliablePdu::getNumberOfVariableDatumRecords() const { return _variableDatumRecords.size(); } @@ -81,8 +81,8 @@ void SetDataReliablePdu::marshal(DataStream& dataStream) const { dataStream << _pad1; dataStream << _pad2; dataStream << _requestID; - dataStream << (unsigned int)_fixedDatumRecords.size(); - dataStream << (unsigned int)_variableDatumRecords.size(); + dataStream << (uint32_t)_fixedDatumRecords.size(); + dataStream << (uint32_t)_variableDatumRecords.size(); for (size_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum x = _fixedDatumRecords[idx]; @@ -156,12 +156,12 @@ int SetDataReliablePdu::getMarshalledSize() const { marshalSize = marshalSize + 4; // _numberOfFixedDatumRecords marshalSize = marshalSize + 4; // _numberOfVariableDatumRecords - for (unsigned long long idx = 0; idx < _fixedDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _fixedDatumRecords.size(); idx++) { FixedDatum listElement = _fixedDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _variableDatumRecords.size(); idx++) { + for (uint64_t idx = 0; idx < _variableDatumRecords.size(); idx++) { VariableDatum listElement = _variableDatumRecords[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/SetDataReliablePdu.h b/src/dis7/SetDataReliablePdu.h index e0e48033..a5171e50 100644 --- a/src/dis7/SetDataReliablePdu.h +++ b/src/dis7/SetDataReliablePdu.h @@ -22,22 +22,22 @@ class OPENDIS7_EXPORT SetDataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; /** Fixed datum record count */ - unsigned int _numberOfFixedDatumRecords; + uint32_t _numberOfFixedDatumRecords; /** variable datum record count */ - unsigned int _numberOfVariableDatumRecords; + uint32_t _numberOfVariableDatumRecords; /** Fixed datum records */ std::vector _fixedDatumRecords; @@ -52,21 +52,21 @@ class OPENDIS7_EXPORT SetDataReliablePdu virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); - unsigned int getNumberOfFixedDatumRecords() const; + uint32_t getNumberOfFixedDatumRecords() const; - unsigned int getNumberOfVariableDatumRecords() const; + uint32_t getNumberOfVariableDatumRecords() const; std::vector& getFixedDatumRecords(); const std::vector& getFixedDatumRecords() const; diff --git a/src/dis7/SimulationAddress.cpp b/src/dis7/SimulationAddress.cpp index d664fd72..754f219c 100644 --- a/src/dis7/SimulationAddress.cpp +++ b/src/dis7/SimulationAddress.cpp @@ -6,15 +6,15 @@ SimulationAddress::SimulationAddress() : _site(0), _application(0) {} SimulationAddress::~SimulationAddress() {} -unsigned short SimulationAddress::getSite() const { return _site; } +uint16_t SimulationAddress::getSite() const { return _site; } -void SimulationAddress::setSite(unsigned short pX) { _site = pX; } +void SimulationAddress::setSite(uint16_t pX) { _site = pX; } -unsigned short SimulationAddress::getApplication() const { +uint16_t SimulationAddress::getApplication() const { return _application; } -void SimulationAddress::setApplication(unsigned short pX) { _application = pX; } +void SimulationAddress::setApplication(uint16_t pX) { _application = pX; } void SimulationAddress::marshal(DataStream& dataStream) const { dataStream << _site; diff --git a/src/dis7/SimulationAddress.h b/src/dis7/SimulationAddress.h index b299dc8c..23e2ad26 100644 --- a/src/dis7/SimulationAddress.h +++ b/src/dis7/SimulationAddress.h @@ -17,12 +17,12 @@ class OPENDIS7_EXPORT SimulationAddress { /** A site is defined as a facility, installation, organizational unit or a * geographic location that has one or more simulation applications capable of * participating in a distributed event. */ - unsigned short _site; + uint16_t _site; /** An application is defined as a software program that is used to generate * and process distributed simulation data including live, virtual and * constructive data. */ - unsigned short _application; + uint16_t _application; public: SimulationAddress(); @@ -31,11 +31,11 @@ class OPENDIS7_EXPORT SimulationAddress { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSite() const; - void setSite(unsigned short pX); + uint16_t getSite() const; + void setSite(uint16_t pX); - unsigned short getApplication() const; - void setApplication(unsigned short pX); + uint16_t getApplication() const; + void setApplication(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/SimulationIdentifier.cpp b/src/dis7/SimulationIdentifier.cpp index ca3ead09..11313c45 100644 --- a/src/dis7/SimulationIdentifier.cpp +++ b/src/dis7/SimulationIdentifier.cpp @@ -19,11 +19,11 @@ void SimulationIdentifier::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short SimulationIdentifier::getReferenceNumber() const { +uint16_t SimulationIdentifier::getReferenceNumber() const { return _referenceNumber; } -void SimulationIdentifier::setReferenceNumber(unsigned short pX) { +void SimulationIdentifier::setReferenceNumber(uint16_t pX) { _referenceNumber = pX; } diff --git a/src/dis7/SimulationIdentifier.h b/src/dis7/SimulationIdentifier.h index 7124daac..944b1664 100644 --- a/src/dis7/SimulationIdentifier.h +++ b/src/dis7/SimulationIdentifier.h @@ -24,7 +24,7 @@ class OPENDIS7_EXPORT SimulationIdentifier { /** This field shall be set to zero as there is no reference number associated * with a Simulation Identifier. */ - unsigned short _referenceNumber; + uint16_t _referenceNumber; public: SimulationIdentifier(); @@ -37,8 +37,8 @@ class OPENDIS7_EXPORT SimulationIdentifier { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + uint16_t getReferenceNumber() const; + void setReferenceNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/StandardVariableSpecification.cpp b/src/dis7/StandardVariableSpecification.cpp index ff48d6f6..0fd1b346 100644 --- a/src/dis7/StandardVariableSpecification.cpp +++ b/src/dis7/StandardVariableSpecification.cpp @@ -9,7 +9,7 @@ StandardVariableSpecification::~StandardVariableSpecification() { _standardVariables.clear(); } -unsigned short +uint16_t StandardVariableSpecification::getNumberOfStandardVariableRecords() const { return _standardVariables.size(); } @@ -30,7 +30,7 @@ void StandardVariableSpecification::setStandardVariables( } void StandardVariableSpecification::marshal(DataStream& dataStream) const { - dataStream << (unsigned short)_standardVariables.size(); + dataStream << (uint16_t)_standardVariables.size(); for (size_t idx = 0; idx < _standardVariables.size(); idx++) { SimulationManagementPduHeader x = _standardVariables[idx]; @@ -66,7 +66,7 @@ int StandardVariableSpecification::getMarshalledSize() const { marshalSize = marshalSize + 2; // _numberOfStandardVariableRecords - for (unsigned long long idx = 0; idx < _standardVariables.size(); idx++) { + for (uint64_t idx = 0; idx < _standardVariables.size(); idx++) { SimulationManagementPduHeader listElement = _standardVariables[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/StandardVariableSpecification.h b/src/dis7/StandardVariableSpecification.h index e24c546f..352b903b 100644 --- a/src/dis7/StandardVariableSpecification.h +++ b/src/dis7/StandardVariableSpecification.h @@ -18,7 +18,7 @@ namespace DIS { class OPENDIS7_EXPORT StandardVariableSpecification { protected: /** Number of static variable records */ - unsigned short _numberOfStandardVariableRecords; + uint16_t _numberOfStandardVariableRecords; /** variable length list of standard variables, The class type and length here * are WRONG and will cause the incorrect serialization of any class in whihc @@ -32,7 +32,7 @@ class OPENDIS7_EXPORT StandardVariableSpecification { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getNumberOfStandardVariableRecords() const; + uint16_t getNumberOfStandardVariableRecords() const; std::vector& getStandardVariables(); const std::vector& getStandardVariables() diff --git a/src/dis7/StartResumePdu.cpp b/src/dis7/StartResumePdu.cpp index 29a4f0bd..64928be0 100644 --- a/src/dis7/StartResumePdu.cpp +++ b/src/dis7/StartResumePdu.cpp @@ -50,9 +50,9 @@ void StartResumePdu::setSimulationTime(const ClockTime& pX) { _simulationTime = pX; } -unsigned int StartResumePdu::getRequestID() const { return _requestID; } +uint32_t StartResumePdu::getRequestID() const { return _requestID; } -void StartResumePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StartResumePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StartResumePdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis7/StartResumePdu.h b/src/dis7/StartResumePdu.h index 2c437de0..137d20ef 100644 --- a/src/dis7/StartResumePdu.h +++ b/src/dis7/StartResumePdu.h @@ -37,7 +37,7 @@ class OPENDIS7_EXPORT StartResumePdu : public SimulationManagementFamilyPdu { ClockTime _simulationTime; /** Identifier for the specific and unique start/resume request */ - unsigned int _requestID; + uint32_t _requestID; public: StartResumePdu(); @@ -62,8 +62,8 @@ class OPENDIS7_EXPORT StartResumePdu : public SimulationManagementFamilyPdu { const ClockTime& getSimulationTime() const; void setSimulationTime(const ClockTime& pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/StartResumeReliablePdu.cpp b/src/dis7/StartResumeReliablePdu.cpp index cec58eeb..9e3de8c6 100644 --- a/src/dis7/StartResumeReliablePdu.cpp +++ b/src/dis7/StartResumeReliablePdu.cpp @@ -37,25 +37,25 @@ void StartResumeReliablePdu::setSimulationTime(const ClockTime& pX) { _simulationTime = pX; } -unsigned char StartResumeReliablePdu::getRequiredReliabilityService() const { +uint8_t StartResumeReliablePdu::getRequiredReliabilityService() const { return _requiredReliabilityService; } -void StartResumeReliablePdu::setRequiredReliabilityService(unsigned char pX) { +void StartResumeReliablePdu::setRequiredReliabilityService(uint8_t pX) { _requiredReliabilityService = pX; } -unsigned short StartResumeReliablePdu::getPad1() const { return _pad1; } +uint16_t StartResumeReliablePdu::getPad1() const { return _pad1; } -void StartResumeReliablePdu::setPad1(unsigned short pX) { _pad1 = pX; } +void StartResumeReliablePdu::setPad1(uint16_t pX) { _pad1 = pX; } -unsigned char StartResumeReliablePdu::getPad2() const { return _pad2; } +uint8_t StartResumeReliablePdu::getPad2() const { return _pad2; } -void StartResumeReliablePdu::setPad2(unsigned char pX) { _pad2 = pX; } +void StartResumeReliablePdu::setPad2(uint8_t pX) { _pad2 = pX; } -unsigned int StartResumeReliablePdu::getRequestID() const { return _requestID; } +uint32_t StartResumeReliablePdu::getRequestID() const { return _requestID; } -void StartResumeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StartResumeReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StartResumeReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis7/StartResumeReliablePdu.h b/src/dis7/StartResumeReliablePdu.h index ad3064c2..518e3e78 100644 --- a/src/dis7/StartResumeReliablePdu.h +++ b/src/dis7/StartResumeReliablePdu.h @@ -23,16 +23,16 @@ class OPENDIS7_EXPORT StartResumeReliablePdu ClockTime _simulationTime; /** level of reliability service used for this transaction */ - unsigned char _requiredReliabilityService; + uint8_t _requiredReliabilityService; /** padding */ - unsigned short _pad1; + uint16_t _pad1; /** padding */ - unsigned char _pad2; + uint8_t _pad2; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: StartResumeReliablePdu(); @@ -49,17 +49,17 @@ class OPENDIS7_EXPORT StartResumeReliablePdu const ClockTime& getSimulationTime() const; void setSimulationTime(const ClockTime& pX); - unsigned char getRequiredReliabilityService() const; - void setRequiredReliabilityService(unsigned char pX); + uint8_t getRequiredReliabilityService() const; + void setRequiredReliabilityService(uint8_t pX); - unsigned short getPad1() const; - void setPad1(unsigned short pX); + uint16_t getPad1() const; + void setPad1(uint16_t pX); - unsigned char getPad2() const; - void setPad2(unsigned char pX); + uint8_t getPad2() const; + void setPad2(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/StopFreezePdu.cpp b/src/dis7/StopFreezePdu.cpp index e7f7b551..051589fe 100644 --- a/src/dis7/StopFreezePdu.cpp +++ b/src/dis7/StopFreezePdu.cpp @@ -42,25 +42,25 @@ void StopFreezePdu::setRealWorldTime(const ClockTime& pX) { _realWorldTime = pX; } -unsigned char StopFreezePdu::getReason() const { return _reason; } +uint8_t StopFreezePdu::getReason() const { return _reason; } -void StopFreezePdu::setReason(unsigned char pX) { _reason = pX; } +void StopFreezePdu::setReason(uint8_t pX) { _reason = pX; } -unsigned char StopFreezePdu::getFrozenBehavior() const { +uint8_t StopFreezePdu::getFrozenBehavior() const { return _frozenBehavior; } -void StopFreezePdu::setFrozenBehavior(unsigned char pX) { +void StopFreezePdu::setFrozenBehavior(uint8_t pX) { _frozenBehavior = pX; } -short StopFreezePdu::getPadding1() const { return _padding1; } +int16_t StopFreezePdu::getPadding1() const { return _padding1; } -void StopFreezePdu::setPadding1(short pX) { _padding1 = pX; } +void StopFreezePdu::setPadding1(int16_t pX) { _padding1 = pX; } -unsigned int StopFreezePdu::getRequestID() const { return _requestID; } +uint32_t StopFreezePdu::getRequestID() const { return _requestID; } -void StopFreezePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StopFreezePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StopFreezePdu::marshal(DataStream& dataStream) const { SimulationManagementFamilyPdu::marshal( diff --git a/src/dis7/StopFreezePdu.h b/src/dis7/StopFreezePdu.h index 1f5067e4..7b5ba7b4 100644 --- a/src/dis7/StopFreezePdu.h +++ b/src/dis7/StopFreezePdu.h @@ -28,17 +28,17 @@ class OPENDIS7_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { /** Reason the simulation was stopped or frozen (see section 7 of * SISO-REF-010) represented by an 8-bit enumeration */ - unsigned char _reason; + uint8_t _reason; /** Internal behavior of the entity(or simulation) and its appearance while * frozen to the other participants */ - unsigned char _frozenBehavior; + uint8_t _frozenBehavior; /** padding */ - short _padding1; + int16_t _padding1; /** Request ID that is unique */ - unsigned int _requestID; + uint32_t _requestID; public: StopFreezePdu(); @@ -59,17 +59,17 @@ class OPENDIS7_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { const ClockTime& getRealWorldTime() const; void setRealWorldTime(const ClockTime& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + uint8_t getReason() const; + void setReason(uint8_t pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + uint8_t getFrozenBehavior() const; + void setFrozenBehavior(uint8_t pX); - short getPadding1() const; - void setPadding1(short pX); + int16_t getPadding1() const; + void setPadding1(int16_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/StopFreezeReliablePdu.cpp b/src/dis7/StopFreezeReliablePdu.cpp index ca0948cc..e7797f45 100644 --- a/src/dis7/StopFreezeReliablePdu.cpp +++ b/src/dis7/StopFreezeReliablePdu.cpp @@ -25,33 +25,33 @@ void StopFreezeReliablePdu::setRealWorldTime(const ClockTime& pX) { _realWorldTime = pX; } -unsigned char StopFreezeReliablePdu::getReason() const { return _reason; } +uint8_t StopFreezeReliablePdu::getReason() const { return _reason; } -void StopFreezeReliablePdu::setReason(unsigned char pX) { _reason = pX; } +void StopFreezeReliablePdu::setReason(uint8_t pX) { _reason = pX; } -unsigned char StopFreezeReliablePdu::getFrozenBehavior() const { +uint8_t StopFreezeReliablePdu::getFrozenBehavior() const { return _frozenBehavior; } -void StopFreezeReliablePdu::setFrozenBehavior(unsigned char pX) { +void StopFreezeReliablePdu::setFrozenBehavior(uint8_t pX) { _frozenBehavior = pX; } -unsigned char StopFreezeReliablePdu::getRequiredReliablityService() const { +uint8_t StopFreezeReliablePdu::getRequiredReliablityService() const { return _requiredReliablityService; } -void StopFreezeReliablePdu::setRequiredReliablityService(unsigned char pX) { +void StopFreezeReliablePdu::setRequiredReliablityService(uint8_t pX) { _requiredReliablityService = pX; } -unsigned char StopFreezeReliablePdu::getPad1() const { return _pad1; } +uint8_t StopFreezeReliablePdu::getPad1() const { return _pad1; } -void StopFreezeReliablePdu::setPad1(unsigned char pX) { _pad1 = pX; } +void StopFreezeReliablePdu::setPad1(uint8_t pX) { _pad1 = pX; } -unsigned int StopFreezeReliablePdu::getRequestID() const { return _requestID; } +uint32_t StopFreezeReliablePdu::getRequestID() const { return _requestID; } -void StopFreezeReliablePdu::setRequestID(unsigned int pX) { _requestID = pX; } +void StopFreezeReliablePdu::setRequestID(uint32_t pX) { _requestID = pX; } void StopFreezeReliablePdu::marshal(DataStream& dataStream) const { SimulationManagementWithReliabilityFamilyPdu::marshal( diff --git a/src/dis7/StopFreezeReliablePdu.h b/src/dis7/StopFreezeReliablePdu.h index 23c59e7c..d60ddda1 100644 --- a/src/dis7/StopFreezeReliablePdu.h +++ b/src/dis7/StopFreezeReliablePdu.h @@ -20,19 +20,19 @@ class OPENDIS7_EXPORT StopFreezeReliablePdu ClockTime _realWorldTime; /** Reason for stopping/freezing simulation */ - unsigned char _reason; + uint8_t _reason; /** internal behvior of the simulation while frozen */ - unsigned char _frozenBehavior; + uint8_t _frozenBehavior; /** reliablity level */ - unsigned char _requiredReliablityService; + uint8_t _requiredReliablityService; /** padding */ - unsigned char _pad1; + uint8_t _pad1; /** Request ID */ - unsigned int _requestID; + uint32_t _requestID; public: StopFreezeReliablePdu(); @@ -45,20 +45,20 @@ class OPENDIS7_EXPORT StopFreezeReliablePdu const ClockTime& getRealWorldTime() const; void setRealWorldTime(const ClockTime& pX); - unsigned char getReason() const; - void setReason(unsigned char pX); + uint8_t getReason() const; + void setReason(uint8_t pX); - unsigned char getFrozenBehavior() const; - void setFrozenBehavior(unsigned char pX); + uint8_t getFrozenBehavior() const; + void setFrozenBehavior(uint8_t pX); - unsigned char getRequiredReliablityService() const; - void setRequiredReliablityService(unsigned char pX); + uint8_t getRequiredReliablityService() const; + void setRequiredReliablityService(uint8_t pX); - unsigned char getPad1() const; - void setPad1(unsigned char pX); + uint8_t getPad1() const; + void setPad1(uint8_t pX); - unsigned int getRequestID() const; - void setRequestID(unsigned int pX); + uint32_t getRequestID() const; + void setRequestID(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/StorageFuel.cpp b/src/dis7/StorageFuel.cpp index eb7b062e..6e9b42d7 100644 --- a/src/dis7/StorageFuel.cpp +++ b/src/dis7/StorageFuel.cpp @@ -11,29 +11,29 @@ StorageFuel::StorageFuel() StorageFuel::~StorageFuel() {} -unsigned int StorageFuel::getFuelQuantity() const { return _fuelQuantity; } +uint32_t StorageFuel::getFuelQuantity() const { return _fuelQuantity; } -void StorageFuel::setFuelQuantity(unsigned int pX) { _fuelQuantity = pX; } +void StorageFuel::setFuelQuantity(uint32_t pX) { _fuelQuantity = pX; } -unsigned char StorageFuel::getFuelMeasurementUnits() const { +uint8_t StorageFuel::getFuelMeasurementUnits() const { return _fuelMeasurementUnits; } -void StorageFuel::setFuelMeasurementUnits(unsigned char pX) { +void StorageFuel::setFuelMeasurementUnits(uint8_t pX) { _fuelMeasurementUnits = pX; } -unsigned char StorageFuel::getFuelType() const { return _fuelType; } +uint8_t StorageFuel::getFuelType() const { return _fuelType; } -void StorageFuel::setFuelType(unsigned char pX) { _fuelType = pX; } +void StorageFuel::setFuelType(uint8_t pX) { _fuelType = pX; } -unsigned char StorageFuel::getFuelLocation() const { return _fuelLocation; } +uint8_t StorageFuel::getFuelLocation() const { return _fuelLocation; } -void StorageFuel::setFuelLocation(unsigned char pX) { _fuelLocation = pX; } +void StorageFuel::setFuelLocation(uint8_t pX) { _fuelLocation = pX; } -unsigned char StorageFuel::getPadding() const { return _padding; } +uint8_t StorageFuel::getPadding() const { return _padding; } -void StorageFuel::setPadding(unsigned char pX) { _padding = pX; } +void StorageFuel::setPadding(uint8_t pX) { _padding = pX; } void StorageFuel::marshal(DataStream& dataStream) const { dataStream << _fuelQuantity; diff --git a/src/dis7/StorageFuel.h b/src/dis7/StorageFuel.h index faf6f361..0359e97a 100644 --- a/src/dis7/StorageFuel.h +++ b/src/dis7/StorageFuel.h @@ -14,19 +14,19 @@ namespace DIS { class OPENDIS7_EXPORT StorageFuel { protected: /** Fuel quantity, units specified by next field */ - unsigned int _fuelQuantity; + uint32_t _fuelQuantity; /** Units in which the fuel is measured */ - unsigned char _fuelMeasurementUnits; + uint8_t _fuelMeasurementUnits; /** Type of fuel */ - unsigned char _fuelType; + uint8_t _fuelType; /** Location of fuel as related to entity. See section 14 of EBV document */ - unsigned char _fuelLocation; + uint8_t _fuelLocation; /** padding */ - unsigned char _padding; + uint8_t _padding; public: StorageFuel(); @@ -35,20 +35,20 @@ class OPENDIS7_EXPORT StorageFuel { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getFuelQuantity() const; - void setFuelQuantity(unsigned int pX); + uint32_t getFuelQuantity() const; + void setFuelQuantity(uint32_t pX); - unsigned char getFuelMeasurementUnits() const; - void setFuelMeasurementUnits(unsigned char pX); + uint8_t getFuelMeasurementUnits() const; + void setFuelMeasurementUnits(uint8_t pX); - unsigned char getFuelType() const; - void setFuelType(unsigned char pX); + uint8_t getFuelType() const; + void setFuelType(uint8_t pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + uint8_t getFuelLocation() const; + void setFuelLocation(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/StorageFuelReload.cpp b/src/dis7/StorageFuelReload.cpp index 78b43311..a2c51947 100644 --- a/src/dis7/StorageFuelReload.cpp +++ b/src/dis7/StorageFuelReload.cpp @@ -14,61 +14,61 @@ StorageFuelReload::StorageFuelReload() StorageFuelReload::~StorageFuelReload() {} -unsigned int StorageFuelReload::getStandardQuantity() const { +uint32_t StorageFuelReload::getStandardQuantity() const { return _standardQuantity; } -void StorageFuelReload::setStandardQuantity(unsigned int pX) { +void StorageFuelReload::setStandardQuantity(uint32_t pX) { _standardQuantity = pX; } -unsigned int StorageFuelReload::getMaximumQuantity() const { +uint32_t StorageFuelReload::getMaximumQuantity() const { return _maximumQuantity; } -void StorageFuelReload::setMaximumQuantity(unsigned int pX) { +void StorageFuelReload::setMaximumQuantity(uint32_t pX) { _maximumQuantity = pX; } -unsigned char StorageFuelReload::getStandardQuantityReloadTime() const { +uint8_t StorageFuelReload::getStandardQuantityReloadTime() const { return _standardQuantityReloadTime; } -void StorageFuelReload::setStandardQuantityReloadTime(unsigned char pX) { +void StorageFuelReload::setStandardQuantityReloadTime(uint8_t pX) { _standardQuantityReloadTime = pX; } -unsigned char StorageFuelReload::getMaximumQuantityReloadTime() const { +uint8_t StorageFuelReload::getMaximumQuantityReloadTime() const { return _maximumQuantityReloadTime; } -void StorageFuelReload::setMaximumQuantityReloadTime(unsigned char pX) { +void StorageFuelReload::setMaximumQuantityReloadTime(uint8_t pX) { _maximumQuantityReloadTime = pX; } -unsigned char StorageFuelReload::getFuelMeasurementUnits() const { +uint8_t StorageFuelReload::getFuelMeasurementUnits() const { return _fuelMeasurementUnits; } -void StorageFuelReload::setFuelMeasurementUnits(unsigned char pX) { +void StorageFuelReload::setFuelMeasurementUnits(uint8_t pX) { _fuelMeasurementUnits = pX; } -unsigned char StorageFuelReload::getFuelType() const { return _fuelType; } +uint8_t StorageFuelReload::getFuelType() const { return _fuelType; } -void StorageFuelReload::setFuelType(unsigned char pX) { _fuelType = pX; } +void StorageFuelReload::setFuelType(uint8_t pX) { _fuelType = pX; } -unsigned char StorageFuelReload::getFuelLocation() const { +uint8_t StorageFuelReload::getFuelLocation() const { return _fuelLocation; } -void StorageFuelReload::setFuelLocation(unsigned char pX) { +void StorageFuelReload::setFuelLocation(uint8_t pX) { _fuelLocation = pX; } -unsigned char StorageFuelReload::getPadding() const { return _padding; } +uint8_t StorageFuelReload::getPadding() const { return _padding; } -void StorageFuelReload::setPadding(unsigned char pX) { _padding = pX; } +void StorageFuelReload::setPadding(uint8_t pX) { _padding = pX; } void StorageFuelReload::marshal(DataStream& dataStream) const { dataStream << _standardQuantity; diff --git a/src/dis7/StorageFuelReload.h b/src/dis7/StorageFuelReload.h index c083115d..5b0cb66b 100644 --- a/src/dis7/StorageFuelReload.h +++ b/src/dis7/StorageFuelReload.h @@ -21,7 +21,7 @@ class OPENDIS7_EXPORT StorageFuelReload { * Station/Launcher field is set to zero, then this is the total quantity of * this fuel type that would be present in a standard reload of all appli- * cable stations/launchers associated with this entity. */ - unsigned int _standardQuantity; + uint32_t _standardQuantity; /** the maximum quantity of this fuel type that this sta- tion/launcher is * capable of holding when a station/launcher is specified. This would be the @@ -29,33 +29,33 @@ class OPENDIS7_EXPORT StorageFuelReload { * station/launcher. If the Station/launcher field is set to zero, then this * is the maximum quantity of this fuel type that would be present on this * entity at all stations/launchers that can accept this fuel type. */ - unsigned int _maximumQuantity; + uint32_t _maximumQuantity; /** the seconds normally required to reload the standard quantity of this fuel * type at this specific station/launcher. When the Station/Launcher field is * set to zero, this shall be the time it takes to perform a standard quantity * reload of this fuel type at all applicable stations/launchers for this * entity. */ - unsigned char _standardQuantityReloadTime; + uint8_t _standardQuantityReloadTime; /** the seconds normally required to reload the maximum possible quantity of * this fuel type at this station/launcher. When the Station/Launcher field is * set to zero, this shall be the time it takes to perform a maximum quantity * load/reload of this fuel type at all applicable stations/launchers for this * entity. */ - unsigned char _maximumQuantityReloadTime; + uint8_t _maximumQuantityReloadTime; /** the fuel measurement units. Enumeration */ - unsigned char _fuelMeasurementUnits; + uint8_t _fuelMeasurementUnits; /** Fuel type. Enumeration */ - unsigned char _fuelType; + uint8_t _fuelType; /** Location of fuel as related to entity. See section 14 of EBV document */ - unsigned char _fuelLocation; + uint8_t _fuelLocation; /** padding */ - unsigned char _padding; + uint8_t _padding; public: StorageFuelReload(); @@ -64,29 +64,29 @@ class OPENDIS7_EXPORT StorageFuelReload { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getStandardQuantity() const; - void setStandardQuantity(unsigned int pX); + uint32_t getStandardQuantity() const; + void setStandardQuantity(uint32_t pX); - unsigned int getMaximumQuantity() const; - void setMaximumQuantity(unsigned int pX); + uint32_t getMaximumQuantity() const; + void setMaximumQuantity(uint32_t pX); - unsigned char getStandardQuantityReloadTime() const; - void setStandardQuantityReloadTime(unsigned char pX); + uint8_t getStandardQuantityReloadTime() const; + void setStandardQuantityReloadTime(uint8_t pX); - unsigned char getMaximumQuantityReloadTime() const; - void setMaximumQuantityReloadTime(unsigned char pX); + uint8_t getMaximumQuantityReloadTime() const; + void setMaximumQuantityReloadTime(uint8_t pX); - unsigned char getFuelMeasurementUnits() const; - void setFuelMeasurementUnits(unsigned char pX); + uint8_t getFuelMeasurementUnits() const; + void setFuelMeasurementUnits(uint8_t pX); - unsigned char getFuelType() const; - void setFuelType(unsigned char pX); + uint8_t getFuelType() const; + void setFuelType(uint8_t pX); - unsigned char getFuelLocation() const; - void setFuelLocation(unsigned char pX); + uint8_t getFuelLocation() const; + void setFuelLocation(uint8_t pX); - unsigned char getPadding() const; - void setPadding(unsigned char pX); + uint8_t getPadding() const; + void setPadding(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/SyntheticEnvironmentFamilyPdu.cpp b/src/dis7/SyntheticEnvironmentFamilyPdu.cpp index 5bdf1acf..2378f631 100644 --- a/src/dis7/SyntheticEnvironmentFamilyPdu.cpp +++ b/src/dis7/SyntheticEnvironmentFamilyPdu.cpp @@ -2,10 +2,7 @@ using namespace DIS; -SyntheticEnvironmentFamilyPdu::SyntheticEnvironmentFamilyPdu() - : Pdu() - -{ +SyntheticEnvironmentFamilyPdu::SyntheticEnvironmentFamilyPdu() : Pdu() { setProtocolFamily(9); } diff --git a/src/dis7/SystemIdentifier.cpp b/src/dis7/SystemIdentifier.cpp index e8d51943..c33fc35b 100644 --- a/src/dis7/SystemIdentifier.cpp +++ b/src/dis7/SystemIdentifier.cpp @@ -7,23 +7,23 @@ SystemIdentifier::SystemIdentifier() SystemIdentifier::~SystemIdentifier() {} -unsigned short SystemIdentifier::getSystemType() const { return _systemType; } +uint16_t SystemIdentifier::getSystemType() const { return _systemType; } -void SystemIdentifier::setSystemType(unsigned short pX) { _systemType = pX; } +void SystemIdentifier::setSystemType(uint16_t pX) { _systemType = pX; } -unsigned short SystemIdentifier::getSystemName() const { return _systemName; } +uint16_t SystemIdentifier::getSystemName() const { return _systemName; } -void SystemIdentifier::setSystemName(unsigned short pX) { _systemName = pX; } +void SystemIdentifier::setSystemName(uint16_t pX) { _systemName = pX; } -unsigned char SystemIdentifier::getSystemMode() const { return _systemMode; } +uint8_t SystemIdentifier::getSystemMode() const { return _systemMode; } -void SystemIdentifier::setSystemMode(unsigned char pX) { _systemMode = pX; } +void SystemIdentifier::setSystemMode(uint8_t pX) { _systemMode = pX; } -unsigned char SystemIdentifier::getChangeOptions() const { +uint8_t SystemIdentifier::getChangeOptions() const { return _changeOptions; } -void SystemIdentifier::setChangeOptions(unsigned char pX) { +void SystemIdentifier::setChangeOptions(uint8_t pX) { _changeOptions = pX; } diff --git a/src/dis7/SystemIdentifier.h b/src/dis7/SystemIdentifier.h index 3177e54d..870f81d9 100644 --- a/src/dis7/SystemIdentifier.h +++ b/src/dis7/SystemIdentifier.h @@ -14,16 +14,16 @@ namespace DIS { class OPENDIS7_EXPORT SystemIdentifier { protected: /** general type of emitting system, an enumeration */ - unsigned short _systemType; + uint16_t _systemType; /** named type of system, an enumeration */ - unsigned short _systemName; + uint16_t _systemName; /** mode of operation for the system, an enumeration */ - unsigned char _systemMode; + uint8_t _systemMode; /** status of this PDU, see section 6.2.15 */ - unsigned char _changeOptions; + uint8_t _changeOptions; public: SystemIdentifier(); @@ -32,17 +32,17 @@ class OPENDIS7_EXPORT SystemIdentifier { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getSystemType() const; - void setSystemType(unsigned short pX); + uint16_t getSystemType() const; + void setSystemType(uint16_t pX); - unsigned short getSystemName() const; - void setSystemName(unsigned short pX); + uint16_t getSystemName() const; + void setSystemName(uint16_t pX); - unsigned char getSystemMode() const; - void setSystemMode(unsigned char pX); + uint8_t getSystemMode() const; + void setSystemMode(uint8_t pX); - unsigned char getChangeOptions() const; - void setChangeOptions(unsigned char pX); + uint8_t getChangeOptions() const; + void setChangeOptions(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/TotalRecordSets.cpp b/src/dis7/TotalRecordSets.cpp index aa09d137..9dba9953 100644 --- a/src/dis7/TotalRecordSets.cpp +++ b/src/dis7/TotalRecordSets.cpp @@ -6,17 +6,17 @@ TotalRecordSets::TotalRecordSets() : _totalRecordSets(0), _padding(0) {} TotalRecordSets::~TotalRecordSets() {} -unsigned short TotalRecordSets::getTotalRecordSets() const { +uint16_t TotalRecordSets::getTotalRecordSets() const { return _totalRecordSets; } -void TotalRecordSets::setTotalRecordSets(unsigned short pX) { +void TotalRecordSets::setTotalRecordSets(uint16_t pX) { _totalRecordSets = pX; } -unsigned short TotalRecordSets::getPadding() const { return _padding; } +uint16_t TotalRecordSets::getPadding() const { return _padding; } -void TotalRecordSets::setPadding(unsigned short pX) { _padding = pX; } +void TotalRecordSets::setPadding(uint16_t pX) { _padding = pX; } void TotalRecordSets::marshal(DataStream& dataStream) const { dataStream << _totalRecordSets; diff --git a/src/dis7/TotalRecordSets.h b/src/dis7/TotalRecordSets.h index 27928ea1..5fc5cda1 100644 --- a/src/dis7/TotalRecordSets.h +++ b/src/dis7/TotalRecordSets.h @@ -15,10 +15,10 @@ namespace DIS { class OPENDIS7_EXPORT TotalRecordSets { protected: /** Total number of record sets */ - unsigned short _totalRecordSets; + uint16_t _totalRecordSets; /** padding */ - unsigned short _padding; + uint16_t _padding; public: TotalRecordSets(); @@ -27,11 +27,11 @@ class OPENDIS7_EXPORT TotalRecordSets { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getTotalRecordSets() const; - void setTotalRecordSets(unsigned short pX); + uint16_t getTotalRecordSets() const; + void setTotalRecordSets(uint16_t pX); - unsigned short getPadding() const; - void setPadding(unsigned short pX); + uint16_t getPadding() const; + void setPadding(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/TrackJamData.cpp b/src/dis7/TrackJamData.cpp index 706e8b86..ded941e1 100644 --- a/src/dis7/TrackJamData.cpp +++ b/src/dis7/TrackJamData.cpp @@ -12,13 +12,13 @@ const EntityID& TrackJamData::getEntityID() const { return _entityID; } void TrackJamData::setEntityID(const EntityID& pX) { _entityID = pX; } -unsigned char TrackJamData::getEmitterNumber() const { return _emitterNumber; } +uint8_t TrackJamData::getEmitterNumber() const { return _emitterNumber; } -void TrackJamData::setEmitterNumber(unsigned char pX) { _emitterNumber = pX; } +void TrackJamData::setEmitterNumber(uint8_t pX) { _emitterNumber = pX; } -unsigned char TrackJamData::getBeamNumber() const { return _beamNumber; } +uint8_t TrackJamData::getBeamNumber() const { return _beamNumber; } -void TrackJamData::setBeamNumber(unsigned char pX) { _beamNumber = pX; } +void TrackJamData::setBeamNumber(uint8_t pX) { _beamNumber = pX; } void TrackJamData::marshal(DataStream& dataStream) const { _entityID.marshal(dataStream); diff --git a/src/dis7/TrackJamData.h b/src/dis7/TrackJamData.h index 69903c0b..71ebc688 100644 --- a/src/dis7/TrackJamData.h +++ b/src/dis7/TrackJamData.h @@ -19,10 +19,10 @@ class OPENDIS7_EXPORT TrackJamData { EntityID _entityID; /** Emitter system associated with the entity */ - unsigned char _emitterNumber; + uint8_t _emitterNumber; /** Beam associated with the entity */ - unsigned char _beamNumber; + uint8_t _beamNumber; public: TrackJamData(); @@ -35,11 +35,11 @@ class OPENDIS7_EXPORT TrackJamData { const EntityID& getEntityID() const; void setEntityID(const EntityID& pX); - unsigned char getEmitterNumber() const; - void setEmitterNumber(unsigned char pX); + uint8_t getEmitterNumber() const; + void setEmitterNumber(uint8_t pX); - unsigned char getBeamNumber() const; - void setBeamNumber(unsigned char pX); + uint8_t getBeamNumber() const; + void setBeamNumber(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/TwoByteChunk.cpp b/src/dis7/TwoByteChunk.cpp index 377921ba..d1a01353 100644 --- a/src/dis7/TwoByteChunk.cpp +++ b/src/dis7/TwoByteChunk.cpp @@ -39,7 +39,7 @@ void TwoByteChunk::unmarshal(DataStream& dataStream) { bool TwoByteChunk::operator==(const TwoByteChunk& rhs) const { bool ivarsEqual = true; - for (unsigned char idx = 0; idx < 2; idx++) { + for (uint8_t idx = 0; idx < 2; idx++) { if (!(_otherParameters[idx] == rhs._otherParameters[idx])) ivarsEqual = false; } diff --git a/src/dis7/UAFundamentalParameter.cpp b/src/dis7/UAFundamentalParameter.cpp index ecfcc57b..778f9694 100644 --- a/src/dis7/UAFundamentalParameter.cpp +++ b/src/dis7/UAFundamentalParameter.cpp @@ -12,20 +12,20 @@ UAFundamentalParameter::UAFundamentalParameter() UAFundamentalParameter::~UAFundamentalParameter() {} -unsigned short UAFundamentalParameter::getActiveEmissionParameterIndex() const { +uint16_t UAFundamentalParameter::getActiveEmissionParameterIndex() const { return _activeEmissionParameterIndex; } void UAFundamentalParameter::setActiveEmissionParameterIndex( - unsigned short pX) { + uint16_t pX) { _activeEmissionParameterIndex = pX; } -unsigned short UAFundamentalParameter::getScanPattern() const { +uint16_t UAFundamentalParameter::getScanPattern() const { return _scanPattern; } -void UAFundamentalParameter::setScanPattern(unsigned short pX) { +void UAFundamentalParameter::setScanPattern(uint16_t pX) { _scanPattern = pX; } diff --git a/src/dis7/UAFundamentalParameter.h b/src/dis7/UAFundamentalParameter.h index cb4a70ce..8f690be6 100644 --- a/src/dis7/UAFundamentalParameter.h +++ b/src/dis7/UAFundamentalParameter.h @@ -15,11 +15,11 @@ namespace DIS { class OPENDIS7_EXPORT UAFundamentalParameter { protected: /** Which database record shall be used. An enumeration from EBV document */ - unsigned short _activeEmissionParameterIndex; + uint16_t _activeEmissionParameterIndex; /** The type of scan pattern, If not used, zero. An enumeration from EBV * document */ - unsigned short _scanPattern; + uint16_t _scanPattern; /** center azimuth bearing of th emain beam. In radians. */ float _beamCenterAzimuthHorizontal; @@ -43,11 +43,11 @@ class OPENDIS7_EXPORT UAFundamentalParameter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned short getActiveEmissionParameterIndex() const; - void setActiveEmissionParameterIndex(unsigned short pX); + uint16_t getActiveEmissionParameterIndex() const; + void setActiveEmissionParameterIndex(uint16_t pX); - unsigned short getScanPattern() const; - void setScanPattern(unsigned short pX); + uint16_t getScanPattern() const; + void setScanPattern(uint16_t pX); float getBeamCenterAzimuthHorizontal() const; void setBeamCenterAzimuthHorizontal(float pX); diff --git a/src/dis7/UaPdu.cpp b/src/dis7/UaPdu.cpp index e5ae5527..c7ef66d2 100644 --- a/src/dis7/UaPdu.cpp +++ b/src/dis7/UaPdu.cpp @@ -42,27 +42,27 @@ char UaPdu::getPad() const { return _pad; } void UaPdu::setPad(char pX) { _pad = pX; } -unsigned short UaPdu::getPassiveParameterIndex() const { +uint16_t UaPdu::getPassiveParameterIndex() const { return _passiveParameterIndex; } -void UaPdu::setPassiveParameterIndex(unsigned short pX) { +void UaPdu::setPassiveParameterIndex(uint16_t pX) { _passiveParameterIndex = pX; } -unsigned char UaPdu::getPropulsionPlantConfiguration() const { +uint8_t UaPdu::getPropulsionPlantConfiguration() const { return _propulsionPlantConfiguration; } -void UaPdu::setPropulsionPlantConfiguration(unsigned char pX) { +void UaPdu::setPropulsionPlantConfiguration(uint8_t pX) { _propulsionPlantConfiguration = pX; } -unsigned char UaPdu::getNumberOfShafts() const { return _shaftRPMs.size(); } +uint8_t UaPdu::getNumberOfShafts() const { return _shaftRPMs.size(); } -unsigned char UaPdu::getNumberOfAPAs() const { return _apaData.size(); } +uint8_t UaPdu::getNumberOfAPAs() const { return _apaData.size(); } -unsigned char UaPdu::getNumberOfUAEmitterSystems() const { +uint8_t UaPdu::getNumberOfUAEmitterSystems() const { return _emitterSystems.size(); } @@ -103,9 +103,9 @@ void UaPdu::marshal(DataStream& dataStream) const { dataStream << _pad; dataStream << _passiveParameterIndex; dataStream << _propulsionPlantConfiguration; - dataStream << (unsigned char)_shaftRPMs.size(); - dataStream << (unsigned char)_apaData.size(); - dataStream << (unsigned char)_emitterSystems.size(); + dataStream << (uint8_t)_shaftRPMs.size(); + dataStream << (uint8_t)_apaData.size(); + dataStream << (uint8_t)_emitterSystems.size(); for (size_t idx = 0; idx < _shaftRPMs.size(); idx++) { Vector3Float x = _shaftRPMs[idx]; @@ -202,17 +202,17 @@ int UaPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfAPAs marshalSize = marshalSize + 1; // _numberOfUAEmitterSystems - for (unsigned long long idx = 0; idx < _shaftRPMs.size(); idx++) { + for (uint64_t idx = 0; idx < _shaftRPMs.size(); idx++) { Vector3Float listElement = _shaftRPMs[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _apaData.size(); idx++) { + for (uint64_t idx = 0; idx < _apaData.size(); idx++) { Vector3Float listElement = _apaData[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - for (unsigned long long idx = 0; idx < _emitterSystems.size(); idx++) { + for (uint64_t idx = 0; idx < _emitterSystems.size(); idx++) { Vector3Float listElement = _emitterSystems[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } diff --git a/src/dis7/UaPdu.h b/src/dis7/UaPdu.h index 0b46d3fb..a483869b 100644 --- a/src/dis7/UaPdu.h +++ b/src/dis7/UaPdu.h @@ -40,23 +40,23 @@ class OPENDIS7_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { * The indicated database record (or file) shall define all noise generated * as a function of propulsion plant configurations and associated * auxiliaries. */ - unsigned short _passiveParameterIndex; + uint16_t _passiveParameterIndex; /** This field shall specify the entity propulsion plant configuration. This * field is used to determine the passive signature characteristics of an * entity. */ - unsigned char _propulsionPlantConfiguration; + uint8_t _propulsionPlantConfiguration; /** This field shall represent the number of shafts on a platform */ - unsigned char _numberOfShafts; + uint8_t _numberOfShafts; /** This field shall indicate the number of APAs described in the current UA * PDU */ - unsigned char _numberOfAPAs; + uint8_t _numberOfAPAs; /** This field shall specify the number of UA emitter systems being described * in the current UA PDU */ - unsigned char _numberOfUAEmitterSystems; + uint8_t _numberOfUAEmitterSystems; /** shaft RPM values. THIS IS WRONG. It has the wrong class in the list. */ std::vector _shaftRPMs; @@ -88,17 +88,17 @@ class OPENDIS7_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { char getPad() const; void setPad(char pX); - unsigned short getPassiveParameterIndex() const; - void setPassiveParameterIndex(unsigned short pX); + uint16_t getPassiveParameterIndex() const; + void setPassiveParameterIndex(uint16_t pX); - unsigned char getPropulsionPlantConfiguration() const; - void setPropulsionPlantConfiguration(unsigned char pX); + uint8_t getPropulsionPlantConfiguration() const; + void setPropulsionPlantConfiguration(uint8_t pX); - unsigned char getNumberOfShafts() const; + uint8_t getNumberOfShafts() const; - unsigned char getNumberOfAPAs() const; + uint8_t getNumberOfAPAs() const; - unsigned char getNumberOfUAEmitterSystems() const; + uint8_t getNumberOfUAEmitterSystems() const; std::vector& getShaftRPMs(); const std::vector& getShaftRPMs() const; diff --git a/src/dis7/UnattachedIdentifier.cpp b/src/dis7/UnattachedIdentifier.cpp index cc8e73f5..5a28d55f 100644 --- a/src/dis7/UnattachedIdentifier.cpp +++ b/src/dis7/UnattachedIdentifier.cpp @@ -19,11 +19,11 @@ void UnattachedIdentifier::setSimulationAddress(const SimulationAddress& pX) { _simulationAddress = pX; } -unsigned short UnattachedIdentifier::getReferenceNumber() const { +uint16_t UnattachedIdentifier::getReferenceNumber() const { return _referenceNumber; } -void UnattachedIdentifier::setReferenceNumber(unsigned short pX) { +void UnattachedIdentifier::setReferenceNumber(uint16_t pX) { _referenceNumber = pX; } diff --git a/src/dis7/UnattachedIdentifier.h b/src/dis7/UnattachedIdentifier.h index 17217789..371bc171 100644 --- a/src/dis7/UnattachedIdentifier.h +++ b/src/dis7/UnattachedIdentifier.h @@ -19,7 +19,7 @@ class OPENDIS7_EXPORT UnattachedIdentifier { SimulationAddress _simulationAddress; /** Reference number */ - unsigned short _referenceNumber; + uint16_t _referenceNumber; public: UnattachedIdentifier(); @@ -32,8 +32,8 @@ class OPENDIS7_EXPORT UnattachedIdentifier { const SimulationAddress& getSimulationAddress() const; void setSimulationAddress(const SimulationAddress& pX); - unsigned short getReferenceNumber() const; - void setReferenceNumber(unsigned short pX); + uint16_t getReferenceNumber() const; + void setReferenceNumber(uint16_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/UnsignedDISInteger.cpp b/src/dis7/UnsignedDISInteger.cpp index 87f842a9..6bb9b8ea 100644 --- a/src/dis7/UnsignedDISInteger.cpp +++ b/src/dis7/UnsignedDISInteger.cpp @@ -6,9 +6,9 @@ UnsignedDISInteger::UnsignedDISInteger() : _val(0) {} UnsignedDISInteger::~UnsignedDISInteger() {} -unsigned int UnsignedDISInteger::getVal() const { return _val; } +uint32_t UnsignedDISInteger::getVal() const { return _val; } -void UnsignedDISInteger::setVal(unsigned int pX) { _val = pX; } +void UnsignedDISInteger::setVal(uint32_t pX) { _val = pX; } void UnsignedDISInteger::marshal(DataStream& dataStream) const { dataStream << _val; diff --git a/src/dis7/UnsignedDISInteger.h b/src/dis7/UnsignedDISInteger.h index e28c141a..6fc1dd8d 100644 --- a/src/dis7/UnsignedDISInteger.h +++ b/src/dis7/UnsignedDISInteger.h @@ -13,8 +13,8 @@ namespace DIS { class OPENDIS7_EXPORT UnsignedDISInteger { protected: - /** unsigned integer */ - unsigned int _val; + /** uint32_teger */ + uint32_t _val; public: UnsignedDISInteger(); @@ -23,8 +23,8 @@ class OPENDIS7_EXPORT UnsignedDISInteger { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getVal() const; - void setVal(unsigned int pX); + uint32_t getVal() const; + void setVal(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/VariableDatum.cpp b/src/dis7/VariableDatum.cpp index 63a661dd..9c89542e 100644 --- a/src/dis7/VariableDatum.cpp +++ b/src/dis7/VariableDatum.cpp @@ -10,37 +10,37 @@ VariableDatum::VariableDatum() VariableDatum::~VariableDatum() {} -unsigned int VariableDatum::getVariableDatumID() const { +uint32_t VariableDatum::getVariableDatumID() const { return _variableDatumID; } -void VariableDatum::setVariableDatumID(unsigned int pX) { +void VariableDatum::setVariableDatumID(uint32_t pX) { _variableDatumID = pX; } -unsigned int VariableDatum::getVariableDatumLength() const { +uint32_t VariableDatum::getVariableDatumLength() const { return _variableDatumLength; } -void VariableDatum::setVariableDatumLength(unsigned int pX) { +void VariableDatum::setVariableDatumLength(uint32_t pX) { _variableDatumLength = pX; } -unsigned int VariableDatum::getVariableDatumBits() const { +uint32_t VariableDatum::getVariableDatumBits() const { return _variableDatumBits; } -void VariableDatum::setVariableDatumBits(unsigned int pX) { +void VariableDatum::setVariableDatumBits(uint32_t pX) { _variableDatumBits = pX; } -unsigned int VariableDatum::getPadding() const { return _padding; } +uint32_t VariableDatum::getPadding() const { return _padding; } -void VariableDatum::setPadding(unsigned int pX) { _padding = pX; } +void VariableDatum::setPadding(uint32_t pX) { _padding = pX; } void VariableDatum::marshal(DataStream& dataStream) const { dataStream << _variableDatumID; - dataStream << (unsigned int)_variableDatums.size() * 64; + dataStream << (uint32_t)_variableDatums.size() * 64; for (size_t idx = 0; idx < _variableDatums.size(); idx++) { EightByteChunk x = _variableDatums[idx]; diff --git a/src/dis7/VariableDatum.h b/src/dis7/VariableDatum.h index 416b2886..c1a9d31b 100644 --- a/src/dis7/VariableDatum.h +++ b/src/dis7/VariableDatum.h @@ -19,17 +19,17 @@ class OPENDIS7_EXPORT VariableDatum { protected: /** Type of variable datum to be transmitted. 32 bit enumeration defined in * EBV */ - unsigned int _variableDatumID; + uint32_t _variableDatumID; /** Length, in bits, of the variable datum. */ - unsigned int _variableDatumLength; + uint32_t _variableDatumLength; /** Variable datum. This can be any number of bits long, depending on the * datum. */ - unsigned int _variableDatumBits; + uint32_t _variableDatumBits; /** padding to put the record on a 64 bit boundary */ - unsigned int _padding; + uint32_t _padding; // Variable Data std::vector _variableDatums; @@ -41,17 +41,17 @@ class OPENDIS7_EXPORT VariableDatum { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getVariableDatumID() const; - void setVariableDatumID(unsigned int pX); + uint32_t getVariableDatumID() const; + void setVariableDatumID(uint32_t pX); - unsigned int getVariableDatumLength() const; - void setVariableDatumLength(unsigned int pX); + uint32_t getVariableDatumLength() const; + void setVariableDatumLength(uint32_t pX); - unsigned int getVariableDatumBits() const; - void setVariableDatumBits(unsigned int pX); + uint32_t getVariableDatumBits() const; + void setVariableDatumBits(uint32_t pX); - unsigned int getPadding() const; - void setPadding(unsigned int pX); + uint32_t getPadding() const; + void setPadding(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/VariableParameter.cpp b/src/dis7/VariableParameter.cpp index 4ae30336..f7e3e998 100644 --- a/src/dis7/VariableParameter.cpp +++ b/src/dis7/VariableParameter.cpp @@ -11,9 +11,9 @@ VariableParameter::VariableParameter() VariableParameter::~VariableParameter() {} -unsigned char VariableParameter::getRecordType() const { return _recordType; } +uint8_t VariableParameter::getRecordType() const { return _recordType; } -void VariableParameter::setRecordType(unsigned char pX) { _recordType = pX; } +void VariableParameter::setRecordType(uint8_t pX) { _recordType = pX; } double VariableParameter::getVariableParameterFields1() const { return _variableParameterFields1; @@ -23,27 +23,27 @@ void VariableParameter::setVariableParameterFields1(double pX) { _variableParameterFields1 = pX; } -unsigned int VariableParameter::getVariableParameterFields2() const { +uint32_t VariableParameter::getVariableParameterFields2() const { return _variableParameterFields2; } -void VariableParameter::setVariableParameterFields2(unsigned int pX) { +void VariableParameter::setVariableParameterFields2(uint32_t pX) { _variableParameterFields2 = pX; } -unsigned short VariableParameter::getVariableParameterFields3() const { +uint16_t VariableParameter::getVariableParameterFields3() const { return _variableParameterFields3; } -void VariableParameter::setVariableParameterFields3(unsigned short pX) { +void VariableParameter::setVariableParameterFields3(uint16_t pX) { _variableParameterFields3 = pX; } -unsigned char VariableParameter::getVariableParameterFields4() const { +uint8_t VariableParameter::getVariableParameterFields4() const { return _variableParameterFields4; } -void VariableParameter::setVariableParameterFields4(unsigned char pX) { +void VariableParameter::setVariableParameterFields4(uint8_t pX) { _variableParameterFields4 = pX; } diff --git a/src/dis7/VariableParameter.h b/src/dis7/VariableParameter.h index 33b80a5a..5a2c2638 100644 --- a/src/dis7/VariableParameter.h +++ b/src/dis7/VariableParameter.h @@ -16,19 +16,19 @@ class OPENDIS7_EXPORT VariableParameter { protected: /** the identification of the Variable Parameter record. Enumeration from EBV */ - unsigned char _recordType; + uint8_t _recordType; /** Variable parameter data fields. Two doubles minus one byte */ double _variableParameterFields1; /** Variable parameter data fields. */ - unsigned int _variableParameterFields2; + uint32_t _variableParameterFields2; /** Variable parameter data fields. */ - unsigned short _variableParameterFields3; + uint16_t _variableParameterFields3; /** Variable parameter data fields. */ - unsigned char _variableParameterFields4; + uint8_t _variableParameterFields4; public: VariableParameter(); @@ -37,20 +37,20 @@ class OPENDIS7_EXPORT VariableParameter { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned char getRecordType() const; - void setRecordType(unsigned char pX); + uint8_t getRecordType() const; + void setRecordType(uint8_t pX); double getVariableParameterFields1() const; void setVariableParameterFields1(double pX); - unsigned int getVariableParameterFields2() const; - void setVariableParameterFields2(unsigned int pX); + uint32_t getVariableParameterFields2() const; + void setVariableParameterFields2(uint32_t pX); - unsigned short getVariableParameterFields3() const; - void setVariableParameterFields3(unsigned short pX); + uint16_t getVariableParameterFields3() const; + void setVariableParameterFields3(uint16_t pX); - unsigned char getVariableParameterFields4() const; - void setVariableParameterFields4(unsigned char pX); + uint8_t getVariableParameterFields4() const; + void setVariableParameterFields4(uint8_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/VariableTransmitterParameters.cpp b/src/dis7/VariableTransmitterParameters.cpp index 62a697df..5ab34cc1 100644 --- a/src/dis7/VariableTransmitterParameters.cpp +++ b/src/dis7/VariableTransmitterParameters.cpp @@ -7,19 +7,19 @@ VariableTransmitterParameters::VariableTransmitterParameters() VariableTransmitterParameters::~VariableTransmitterParameters() {} -unsigned int VariableTransmitterParameters::getRecordType() const { +uint32_t VariableTransmitterParameters::getRecordType() const { return _recordType; } -void VariableTransmitterParameters::setRecordType(unsigned int pX) { +void VariableTransmitterParameters::setRecordType(uint32_t pX) { _recordType = pX; } -unsigned int VariableTransmitterParameters::getRecordLength() const { +uint32_t VariableTransmitterParameters::getRecordLength() const { return _recordLength; } -void VariableTransmitterParameters::setRecordLength(unsigned int pX) { +void VariableTransmitterParameters::setRecordLength(uint32_t pX) { _recordLength = pX; } diff --git a/src/dis7/VariableTransmitterParameters.h b/src/dis7/VariableTransmitterParameters.h index bac61114..87354fe5 100644 --- a/src/dis7/VariableTransmitterParameters.h +++ b/src/dis7/VariableTransmitterParameters.h @@ -14,10 +14,10 @@ namespace DIS { class OPENDIS7_EXPORT VariableTransmitterParameters { protected: /** Type of VTP. Enumeration from EBV */ - unsigned int _recordType; + uint32_t _recordType; /** Length, in bytes */ - unsigned int _recordLength; + uint32_t _recordLength; public: VariableTransmitterParameters(); @@ -26,11 +26,11 @@ class OPENDIS7_EXPORT VariableTransmitterParameters { virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); - unsigned int getRecordType() const; - void setRecordType(unsigned int pX); + uint32_t getRecordType() const; + void setRecordType(uint32_t pX); - unsigned int getRecordLength() const; - void setRecordLength(unsigned int pX); + uint32_t getRecordLength() const; + void setRecordLength(uint32_t pX); virtual int getMarshalledSize() const; diff --git a/src/dis7/utils/DataStream.cpp b/src/dis7/utils/DataStream.cpp index 379ef45f..f8c590d5 100644 --- a/src/dis7/utils/DataStream.cpp +++ b/src/dis7/utils/DataStream.cpp @@ -62,7 +62,7 @@ void DataStream::clear() { bool DataStream::empty() const { return _buffer.empty(); } -const char& DataStream::operator[](unsigned int offset) const { +const char& DataStream::operator[](uint32_t offset) const { return _buffer[_read_pos + offset]; } @@ -81,7 +81,7 @@ void DataStream::SetStream(const char* buffer, size_t length, Endian stream) { // take ownership of the data // copy the data, expensive! - for (unsigned int i = 0; i < length; ++i) { + for (uint32_t i = 0; i < length; ++i) { _buffer[i] = buffer[i]; } } @@ -108,7 +108,7 @@ void DataStream::DoFlip(char* buf, size_t bufsize) { } void DataStream::DoWrite(const char* buf, size_t bufsize) { - for (unsigned int i = 0; i < bufsize; ++i) { + for (uint32_t i = 0; i < bufsize; ++i) { // ignores the _write_pos value currently, // this should allow for values to always be appended to the end of the // buffer. @@ -117,7 +117,7 @@ void DataStream::DoWrite(const char* buf, size_t bufsize) { } void DataStream::DoRead(char* ch, size_t bufsize) { - for (unsigned int i = 0; i < bufsize; i++) { + for (uint32_t i = 0; i < bufsize; i++) { ch[i] = _buffer.at(_read_pos + i); } } @@ -128,7 +128,7 @@ DataStream& DataStream::operator<<(char c) { return *this; } -DataStream& DataStream::operator<<(unsigned char c) { +DataStream& DataStream::operator<<(uint8_t c) { WriteAlgorithm(c); return *this; } @@ -148,27 +148,27 @@ DataStream& DataStream::operator<<(int d) { return *this; } -DataStream& DataStream::operator<<(unsigned int d) { +DataStream& DataStream::operator<<(uint32_t d) { WriteAlgorithm(d); return *this; } -DataStream& DataStream::operator<<(long long d) { +DataStream& DataStream::operator<<(int64_t d) { WriteAlgorithm(d); return *this; } -DataStream& DataStream::operator<<(unsigned long long d) { +DataStream& DataStream::operator<<(uint64_t d) { WriteAlgorithm(d); return *this; } -DataStream& DataStream::operator<<(unsigned short d) { +DataStream& DataStream::operator<<(uint16_t d) { WriteAlgorithm(d); return *this; } -DataStream& DataStream::operator<<(short d) { +DataStream& DataStream::operator<<(int16_t d) { WriteAlgorithm(d); return *this; } @@ -179,7 +179,7 @@ DataStream& DataStream::operator>>(char& c) { return *this; } -DataStream& DataStream::operator>>(unsigned char& c) { +DataStream& DataStream::operator>>(uint8_t& c) { ReadAlgorithm(c); return *this; } @@ -199,27 +199,27 @@ DataStream& DataStream::operator>>(int& d) { return *this; } -DataStream& DataStream::operator>>(unsigned int& d) { +DataStream& DataStream::operator>>(uint32_t& d) { ReadAlgorithm(d); return *this; } -DataStream& DataStream::operator>>(long long& d) { +DataStream& DataStream::operator>>(int64_t& d) { ReadAlgorithm(d); return *this; } -DataStream& DataStream::operator>>(unsigned long long& d) { +DataStream& DataStream::operator>>(uint64_t& d) { ReadAlgorithm(d); return *this; } -DataStream& DataStream::operator>>(unsigned short& d) { +DataStream& DataStream::operator>>(uint16_t& d) { ReadAlgorithm(d); return *this; } -DataStream& DataStream::operator>>(short& d) { +DataStream& DataStream::operator>>(int16_t& d) { ReadAlgorithm(d); return *this; } diff --git a/src/dis7/utils/DataStream.h b/src/dis7/utils/DataStream.h index 2215bf7f..42737cba 100644 --- a/src/dis7/utils/DataStream.h +++ b/src/dis7/utils/DataStream.h @@ -41,7 +41,7 @@ class OPENDIS7_EXPORT DataStream { /// a method for reading the stored buffer data. /// @param offset the index distance with respect to the current read point. - const char& operator[](unsigned int offset) const; + const char& operator[](uint32_t offset) const; /// take ownership of the data buffer. void SetStream(const char* buffer, size_t length, Endian order); @@ -49,28 +49,28 @@ class OPENDIS7_EXPORT DataStream { // write operations DataStream& operator<<(bool c); DataStream& operator<<(char c); - DataStream& operator<<(unsigned char c); + DataStream& operator<<(uint8_t c); DataStream& operator<<(float c); DataStream& operator<<(double c); DataStream& operator<<(int c); - DataStream& operator<<(unsigned int c); - DataStream& operator<<(long long c); - DataStream& operator<<(unsigned long long c); - DataStream& operator<<(unsigned short c); - DataStream& operator<<(short c); + DataStream& operator<<(uint32_t c); + DataStream& operator<<(int64_t c); + DataStream& operator<<(uint64_t c); + DataStream& operator<<(uint16_t c); + DataStream& operator<<(int16_t c); // read operations DataStream& operator>>(bool& c); DataStream& operator>>(char& c); - DataStream& operator>>(unsigned char& c); + DataStream& operator>>(uint8_t& c); DataStream& operator>>(float& c); DataStream& operator>>(double& c); DataStream& operator>>(int& c); - DataStream& operator>>(unsigned int& c); - DataStream& operator>>(long long& c); - DataStream& operator>>(unsigned long long& c); - DataStream& operator>>(unsigned short& c); - DataStream& operator>>(short& c); + DataStream& operator>>(uint32_t& c); + DataStream& operator>>(int64_t& c); + DataStream& operator>>(uint64_t& c); + DataStream& operator>>(uint16_t& c); + DataStream& operator>>(int16_t& c); Endian GetStreamEndian() const; Endian GetMachineEndian() const; From bc220342939aaf80fd5036fa1e38c618c87c4da3 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Fri, 12 Jan 2024 21:42:09 +0000 Subject: [PATCH 07/22] Moving stuff around to organize the code --- src/dis6/CMakeLists.txt | 11 +++ src/dis6/MinefieldPduFamily.cpp | 35 ------- src/dis6/MinefieldPduFamily.h | 31 ------- src/dis6/common/CMakeLists.txt | 0 src/dis6/{ => common}/ClockTime.cpp | 0 src/dis6/{ => common}/ClockTime.h | 0 src/dis6/{ => common}/EntityID.cpp | 0 src/dis6/{ => common}/EntityID.h | 0 src/dis6/{ => common}/EntityType.cpp | 0 src/dis6/{ => common}/EntityType.h | 0 src/dis6/{ => common}/Pdu.cpp | 0 src/dis6/{ => common}/Pdu.h | 0 src/dis6/{ => common}/SimulationAddress.cpp | 4 +- src/dis6/{ => common}/SimulationAddress.h | 0 src/dis6/{ => common}/Vector3Double.cpp | 0 src/dis6/{ => common}/Vector3Double.h | 0 src/dis6/{ => common}/Vector3Float.cpp | 0 src/dis6/{ => common}/Vector3Float.h | 0 src/dis6/distributed_emissions/CMakeLists.txt | 0 .../DesignatorPdu.cpp | 0 .../DesignatorPdu.h | 0 .../DistributedEmissionsFamilyPdu.cpp | 0 .../DistributedEmissionsFamilyPdu.h | 0 .../ElectromagneticEmissionBeamData.cpp | 0 .../ElectromagneticEmissionBeamData.h | 0 .../ElectromagneticEmissionSystemData.cpp | 0 .../ElectromagneticEmissionSystemData.h | 0 .../ElectromagneticEmissionsPdu.cpp | 0 .../ElectromagneticEmissionsPdu.h | 0 .../EmitterSystem.cpp | 0 .../EmitterSystem.h | 0 .../FundamentalParameterData.cpp | 0 .../FundamentalParameterData.h | 0 .../FundamentalParameterDataIff.cpp | 0 .../FundamentalParameterDataIff.h | 0 .../IffAtcNavAidsLayer1Pdu.cpp | 0 .../IffAtcNavAidsLayer1Pdu.h | 0 .../IffAtcNavAidsLayer2Pdu.cpp | 0 .../IffAtcNavAidsLayer2Pdu.h | 0 .../IffFundamentalData.cpp | 0 .../IffFundamentalData.h | 0 .../{ => distributed_emissions}/SeesPdu.cpp | 0 .../{ => distributed_emissions}/SeesPdu.h | 0 .../TrackJamTarget.cpp | 0 .../TrackJamTarget.h | 0 .../UnderwaterAcousticsPdu.cpp} | 93 ++++++++++++------- .../UnderwaterAcousticsPdu.h} | 9 +- src/dis6/entity_information/CMakeLists.txt | 0 .../DeadReckoningParameter.cpp | 0 .../DeadReckoningParameter.h | 0 .../EntityInformationFamilyPdu.cpp | 0 .../EntityInformationFamilyPdu.h | 0 .../EntityStatePdu.cpp | 0 .../{ => entity_information}/EntityStatePdu.h | 0 src/dis6/entity_management/CMakeLists.txt | 0 .../EntityManagementFamilyPdu.cpp | 0 .../EntityManagementFamilyPdu.h | 0 src/dis6/logistics/CMakeLists.txt | 0 .../{ => logistics}/LogisticsFamilyPdu.cpp | 0 src/dis6/{ => logistics}/LogisticsFamilyPdu.h | 0 .../{ => logistics}/RepairCompletePdu.cpp | 0 src/dis6/{ => logistics}/RepairCompletePdu.h | 0 .../{ => logistics}/RepairResponsePdu.cpp | 0 src/dis6/{ => logistics}/RepairResponsePdu.h | 0 .../{ => logistics}/ResupplyCancelPdu.cpp | 0 src/dis6/{ => logistics}/ResupplyCancelPdu.h | 0 src/dis6/{ => logistics}/ResupplyOfferPdu.cpp | 0 src/dis6/{ => logistics}/ResupplyOfferPdu.h | 0 .../{ => logistics}/ResupplyReceivedPdu.cpp | 0 .../{ => logistics}/ResupplyReceivedPdu.h | 0 src/dis6/minefield/CMakeLists.txt | 0 src/dis6/{ => minefield}/MinefieldDataPdu.cpp | 0 src/dis6/{ => minefield}/MinefieldDataPdu.h | 0 .../{ => minefield}/MinefieldFamilyPdu.cpp | 0 src/dis6/{ => minefield}/MinefieldFamilyPdu.h | 0 .../{ => minefield}/MinefieldQueryPdu.cpp | 0 src/dis6/{ => minefield}/MinefieldQueryPdu.h | 0 .../MinefieldResponseNackPdu.cpp | 0 .../MinefieldResponseNackPdu.h | 0 .../{ => minefield}/MinefieldStatePdu.cpp | 0 src/dis6/{ => minefield}/MinefieldStatePdu.h | 0 src/dis6/radio_communications/CMakeLists.txt | 0 .../IntercomCommunicationsParameters.cpp | 0 .../IntercomCommunicationsParameters.h | 0 .../IntercomControlPdu.cpp | 0 .../IntercomControlPdu.h | 0 .../IntercomSignalPdu.cpp | 0 .../IntercomSignalPdu.h | 0 .../RadioCommunicationsFamilyPdu.cpp | 0 .../RadioCommunicationsFamilyPdu.h | 0 .../RadioEntityType.cpp | 0 .../RadioEntityType.h | 0 .../ReceiverPdu.cpp | 0 .../{ => radio_communications}/ReceiverPdu.h | 0 .../{ => radio_communications}/SignalPdu.cpp | 0 .../{ => radio_communications}/SignalPdu.h | 0 .../TransmitterPdu.cpp | 0 .../TransmitterPdu.h | 0 .../AcknowledgePdu.cpp | 0 .../AcknowledgePdu.h | 1 + .../ActionRequestPdu.cpp | 0 .../ActionRequestPdu.h | 0 .../ActionResponsePdu.cpp | 0 .../ActionResponsePdu.h | 0 src/dis6/simulation_management/CMakeLists.txt | 0 .../CommentPdu.cpp | 0 .../{ => simulation_management}/CommentPdu.h | 0 .../CreateEntityPdu.cpp | 0 .../CreateEntityPdu.h | 0 .../{ => simulation_management}/DataPdu.cpp | 0 .../{ => simulation_management}/DataPdu.h | 0 .../DataQueryPdu.cpp | 0 .../DataQueryPdu.h | 0 .../EventReportPdu.cpp | 0 .../EventReportPdu.h | 0 .../RemoveEntityPdu.cpp | 0 .../RemoveEntityPdu.h | 0 .../SetDataPdu.cpp | 0 .../{ => simulation_management}/SetDataPdu.h | 0 .../SimulationManagementFamilyPdu.cpp | 0 .../SimulationManagementFamilyPdu.h | 0 .../StartResumePdu.cpp | 0 .../StartResumePdu.h | 0 .../StopFreezePdu.cpp | 0 .../StopFreezePdu.h | 0 .../AcknowledgeReliablePdu.cpp | 0 .../AcknowledgeReliablePdu.h | 0 .../ActionRequestReliablePdu.cpp | 0 .../ActionRequestReliablePdu.h | 0 .../ActionResponseReliablePdu.cpp | 0 .../ActionResponseReliablePdu.h | 0 .../CMakeLists.txt | 0 .../CommentReliablePdu.cpp | 0 .../CommentReliablePdu.h | 0 .../CreateEntityReliablePdu.cpp | 0 .../CreateEntityReliablePdu.h | 0 .../DataQueryReliablePdu.cpp | 0 .../DataQueryReliablePdu.h | 0 .../DataReliablePdu.cpp | 0 .../DataReliablePdu.h | 0 .../EventReportReliablePdu.cpp | 0 .../EventReportReliablePdu.h | 0 .../RemoveEntityReliablePdu.cpp | 0 .../RemoveEntityReliablePdu.h | 0 .../SetDataReliablePdu.cpp | 0 .../SetDataReliablePdu.h | 0 ...tionManagementWithReliabilityFamilyPdu.cpp | 0 ...lationManagementWithReliabilityFamilyPdu.h | 0 .../StartResumeReliablePdu.cpp | 0 .../StartResumeReliablePdu.h | 0 .../StopFreezeReliablePdu.cpp | 0 .../StopFreezeReliablePdu.h | 0 src/dis6/synthetic_environment/CMakeLists.txt | 0 .../SyntheticEnvironmentFamilyPdu.cpp | 0 .../SyntheticEnvironmentFamilyPdu.h | 0 src/dis6/warfare/CMakeLists.txt | 0 src/dis6/{ => warfare}/DetonationPdu.cpp | 0 src/dis6/{ => warfare}/DetonationPdu.h | 0 src/dis6/{ => warfare}/FirePdu.cpp | 0 src/dis6/{ => warfare}/FirePdu.h | 0 src/dis6/{ => warfare}/WarfareFamilyPdu.cpp | 0 src/dis6/{ => warfare}/WarfareFamilyPdu.h | 0 162 files changed, 78 insertions(+), 106 deletions(-) delete mode 100644 src/dis6/MinefieldPduFamily.cpp delete mode 100644 src/dis6/MinefieldPduFamily.h create mode 100644 src/dis6/common/CMakeLists.txt rename src/dis6/{ => common}/ClockTime.cpp (100%) rename src/dis6/{ => common}/ClockTime.h (100%) rename src/dis6/{ => common}/EntityID.cpp (100%) rename src/dis6/{ => common}/EntityID.h (100%) rename src/dis6/{ => common}/EntityType.cpp (100%) rename src/dis6/{ => common}/EntityType.h (100%) rename src/dis6/{ => common}/Pdu.cpp (100%) rename src/dis6/{ => common}/Pdu.h (100%) rename src/dis6/{ => common}/SimulationAddress.cpp (97%) rename src/dis6/{ => common}/SimulationAddress.h (100%) rename src/dis6/{ => common}/Vector3Double.cpp (100%) rename src/dis6/{ => common}/Vector3Double.h (100%) rename src/dis6/{ => common}/Vector3Float.cpp (100%) rename src/dis6/{ => common}/Vector3Float.h (100%) create mode 100644 src/dis6/distributed_emissions/CMakeLists.txt rename src/dis6/{ => distributed_emissions}/DesignatorPdu.cpp (100%) rename src/dis6/{ => distributed_emissions}/DesignatorPdu.h (100%) rename src/dis6/{ => distributed_emissions}/DistributedEmissionsFamilyPdu.cpp (100%) rename src/dis6/{ => distributed_emissions}/DistributedEmissionsFamilyPdu.h (100%) rename src/dis6/{ => distributed_emissions}/ElectromagneticEmissionBeamData.cpp (100%) rename src/dis6/{ => distributed_emissions}/ElectromagneticEmissionBeamData.h (100%) rename src/dis6/{ => distributed_emissions}/ElectromagneticEmissionSystemData.cpp (100%) rename src/dis6/{ => distributed_emissions}/ElectromagneticEmissionSystemData.h (100%) rename src/dis6/{ => distributed_emissions}/ElectromagneticEmissionsPdu.cpp (100%) rename src/dis6/{ => distributed_emissions}/ElectromagneticEmissionsPdu.h (100%) rename src/dis6/{ => distributed_emissions}/EmitterSystem.cpp (100%) rename src/dis6/{ => distributed_emissions}/EmitterSystem.h (100%) rename src/dis6/{ => distributed_emissions}/FundamentalParameterData.cpp (100%) rename src/dis6/{ => distributed_emissions}/FundamentalParameterData.h (100%) rename src/dis6/{ => distributed_emissions}/FundamentalParameterDataIff.cpp (100%) rename src/dis6/{ => distributed_emissions}/FundamentalParameterDataIff.h (100%) rename src/dis6/{ => distributed_emissions}/IffAtcNavAidsLayer1Pdu.cpp (100%) rename src/dis6/{ => distributed_emissions}/IffAtcNavAidsLayer1Pdu.h (100%) rename src/dis6/{ => distributed_emissions}/IffAtcNavAidsLayer2Pdu.cpp (100%) rename src/dis6/{ => distributed_emissions}/IffAtcNavAidsLayer2Pdu.h (100%) rename src/dis6/{ => distributed_emissions}/IffFundamentalData.cpp (100%) rename src/dis6/{ => distributed_emissions}/IffFundamentalData.h (100%) rename src/dis6/{ => distributed_emissions}/SeesPdu.cpp (100%) rename src/dis6/{ => distributed_emissions}/SeesPdu.h (100%) rename src/dis6/{ => distributed_emissions}/TrackJamTarget.cpp (100%) rename src/dis6/{ => distributed_emissions}/TrackJamTarget.h (100%) rename src/dis6/{UaPdu.cpp => distributed_emissions/UnderwaterAcousticsPdu.cpp} (71%) rename src/dis6/{UaPdu.h => distributed_emissions/UnderwaterAcousticsPdu.h} (96%) create mode 100644 src/dis6/entity_information/CMakeLists.txt rename src/dis6/{ => entity_information}/DeadReckoningParameter.cpp (100%) rename src/dis6/{ => entity_information}/DeadReckoningParameter.h (100%) rename src/dis6/{ => entity_information}/EntityInformationFamilyPdu.cpp (100%) rename src/dis6/{ => entity_information}/EntityInformationFamilyPdu.h (100%) rename src/dis6/{ => entity_information}/EntityStatePdu.cpp (100%) rename src/dis6/{ => entity_information}/EntityStatePdu.h (100%) create mode 100644 src/dis6/entity_management/CMakeLists.txt rename src/dis6/{ => entity_management}/EntityManagementFamilyPdu.cpp (100%) rename src/dis6/{ => entity_management}/EntityManagementFamilyPdu.h (100%) create mode 100644 src/dis6/logistics/CMakeLists.txt rename src/dis6/{ => logistics}/LogisticsFamilyPdu.cpp (100%) rename src/dis6/{ => logistics}/LogisticsFamilyPdu.h (100%) rename src/dis6/{ => logistics}/RepairCompletePdu.cpp (100%) rename src/dis6/{ => logistics}/RepairCompletePdu.h (100%) rename src/dis6/{ => logistics}/RepairResponsePdu.cpp (100%) rename src/dis6/{ => logistics}/RepairResponsePdu.h (100%) rename src/dis6/{ => logistics}/ResupplyCancelPdu.cpp (100%) rename src/dis6/{ => logistics}/ResupplyCancelPdu.h (100%) rename src/dis6/{ => logistics}/ResupplyOfferPdu.cpp (100%) rename src/dis6/{ => logistics}/ResupplyOfferPdu.h (100%) rename src/dis6/{ => logistics}/ResupplyReceivedPdu.cpp (100%) rename src/dis6/{ => logistics}/ResupplyReceivedPdu.h (100%) create mode 100644 src/dis6/minefield/CMakeLists.txt rename src/dis6/{ => minefield}/MinefieldDataPdu.cpp (100%) rename src/dis6/{ => minefield}/MinefieldDataPdu.h (100%) rename src/dis6/{ => minefield}/MinefieldFamilyPdu.cpp (100%) rename src/dis6/{ => minefield}/MinefieldFamilyPdu.h (100%) rename src/dis6/{ => minefield}/MinefieldQueryPdu.cpp (100%) rename src/dis6/{ => minefield}/MinefieldQueryPdu.h (100%) rename src/dis6/{ => minefield}/MinefieldResponseNackPdu.cpp (100%) rename src/dis6/{ => minefield}/MinefieldResponseNackPdu.h (100%) rename src/dis6/{ => minefield}/MinefieldStatePdu.cpp (100%) rename src/dis6/{ => minefield}/MinefieldStatePdu.h (100%) create mode 100644 src/dis6/radio_communications/CMakeLists.txt rename src/dis6/{ => radio_communications}/IntercomCommunicationsParameters.cpp (100%) rename src/dis6/{ => radio_communications}/IntercomCommunicationsParameters.h (100%) rename src/dis6/{ => radio_communications}/IntercomControlPdu.cpp (100%) rename src/dis6/{ => radio_communications}/IntercomControlPdu.h (100%) rename src/dis6/{ => radio_communications}/IntercomSignalPdu.cpp (100%) rename src/dis6/{ => radio_communications}/IntercomSignalPdu.h (100%) rename src/dis6/{ => radio_communications}/RadioCommunicationsFamilyPdu.cpp (100%) rename src/dis6/{ => radio_communications}/RadioCommunicationsFamilyPdu.h (100%) rename src/dis6/{ => radio_communications}/RadioEntityType.cpp (100%) rename src/dis6/{ => radio_communications}/RadioEntityType.h (100%) rename src/dis6/{ => radio_communications}/ReceiverPdu.cpp (100%) rename src/dis6/{ => radio_communications}/ReceiverPdu.h (100%) rename src/dis6/{ => radio_communications}/SignalPdu.cpp (100%) rename src/dis6/{ => radio_communications}/SignalPdu.h (100%) rename src/dis6/{ => radio_communications}/TransmitterPdu.cpp (100%) rename src/dis6/{ => radio_communications}/TransmitterPdu.h (100%) rename src/dis6/{ => simulation_management}/AcknowledgePdu.cpp (100%) rename src/dis6/{ => simulation_management}/AcknowledgePdu.h (99%) rename src/dis6/{ => simulation_management}/ActionRequestPdu.cpp (100%) rename src/dis6/{ => simulation_management}/ActionRequestPdu.h (100%) rename src/dis6/{ => simulation_management}/ActionResponsePdu.cpp (100%) rename src/dis6/{ => simulation_management}/ActionResponsePdu.h (100%) create mode 100644 src/dis6/simulation_management/CMakeLists.txt rename src/dis6/{ => simulation_management}/CommentPdu.cpp (100%) rename src/dis6/{ => simulation_management}/CommentPdu.h (100%) rename src/dis6/{ => simulation_management}/CreateEntityPdu.cpp (100%) rename src/dis6/{ => simulation_management}/CreateEntityPdu.h (100%) rename src/dis6/{ => simulation_management}/DataPdu.cpp (100%) rename src/dis6/{ => simulation_management}/DataPdu.h (100%) rename src/dis6/{ => simulation_management}/DataQueryPdu.cpp (100%) rename src/dis6/{ => simulation_management}/DataQueryPdu.h (100%) rename src/dis6/{ => simulation_management}/EventReportPdu.cpp (100%) rename src/dis6/{ => simulation_management}/EventReportPdu.h (100%) rename src/dis6/{ => simulation_management}/RemoveEntityPdu.cpp (100%) rename src/dis6/{ => simulation_management}/RemoveEntityPdu.h (100%) rename src/dis6/{ => simulation_management}/SetDataPdu.cpp (100%) rename src/dis6/{ => simulation_management}/SetDataPdu.h (100%) rename src/dis6/{ => simulation_management}/SimulationManagementFamilyPdu.cpp (100%) rename src/dis6/{ => simulation_management}/SimulationManagementFamilyPdu.h (100%) rename src/dis6/{ => simulation_management}/StartResumePdu.cpp (100%) rename src/dis6/{ => simulation_management}/StartResumePdu.h (100%) rename src/dis6/{ => simulation_management}/StopFreezePdu.cpp (100%) rename src/dis6/{ => simulation_management}/StopFreezePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/AcknowledgeReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/AcknowledgeReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/ActionRequestReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/ActionRequestReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/ActionResponseReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/ActionResponseReliablePdu.h (100%) create mode 100644 src/dis6/simulation_management_with_reliability/CMakeLists.txt rename src/dis6/{ => simulation_management_with_reliability}/CommentReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/CommentReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/CreateEntityReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/CreateEntityReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/DataQueryReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/DataQueryReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/DataReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/DataReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/EventReportReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/EventReportReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/RemoveEntityReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/RemoveEntityReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/SetDataReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/SetDataReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/SimulationManagementWithReliabilityFamilyPdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/SimulationManagementWithReliabilityFamilyPdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/StartResumeReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/StartResumeReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/StopFreezeReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/StopFreezeReliablePdu.h (100%) create mode 100644 src/dis6/synthetic_environment/CMakeLists.txt rename src/dis6/{ => synthetic_environment}/SyntheticEnvironmentFamilyPdu.cpp (100%) rename src/dis6/{ => synthetic_environment}/SyntheticEnvironmentFamilyPdu.h (100%) create mode 100644 src/dis6/warfare/CMakeLists.txt rename src/dis6/{ => warfare}/DetonationPdu.cpp (100%) rename src/dis6/{ => warfare}/DetonationPdu.h (100%) rename src/dis6/{ => warfare}/FirePdu.cpp (100%) rename src/dis6/{ => warfare}/FirePdu.h (100%) rename src/dis6/{ => warfare}/WarfareFamilyPdu.cpp (100%) rename src/dis6/{ => warfare}/WarfareFamilyPdu.h (100%) diff --git a/src/dis6/CMakeLists.txt b/src/dis6/CMakeLists.txt index a0e391eb..4908f533 100644 --- a/src/dis6/CMakeLists.txt +++ b/src/dis6/CMakeLists.txt @@ -1,5 +1,16 @@ add_subdirectory(utils) +add_subdirectory(distributed_emissions) +add_subdirectory(entity_information) +add_subdirectory(entity_management) +add_subdirectory(logistics) +add_subdirectory(minefield) +add_subdirectory(radio_communications) +add_subdirectory(simulation_management) +add_subdirectory(simulation_management_with_reliability) +add_subdirectory(synthetic_environment) +add_subdirectory(warfare) + # Create list of all headers set(dis6_hdr AcknowledgePdu.h diff --git a/src/dis6/MinefieldPduFamily.cpp b/src/dis6/MinefieldPduFamily.cpp deleted file mode 100644 index f10aa52c..00000000 --- a/src/dis6/MinefieldPduFamily.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "dis6/MinefieldPduFamily.h" - -using namespace DIS; - -MinefieldPduFamily::MinefieldPduFamily() - : Pdu() - -{ - setProtocolFamily(8); -} - -MinefieldPduFamily::~MinefieldPduFamily() {} - -void MinefieldPduFamily::marshal(DataStream& dataStream) const { - Pdu::marshal(dataStream); // Marshal information in superclass first -} - -void MinefieldPduFamily::unmarshal(DataStream& dataStream) { - Pdu::unmarshal(dataStream); // unmarshal information in superclass first -} - -bool MinefieldPduFamily::operator==(const MinefieldPduFamily& rhs) const { - bool ivarsEqual = true; - - ivarsEqual = Pdu::operator==(rhs); - - return ivarsEqual; -} - -int MinefieldPduFamily::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; -} diff --git a/src/dis6/MinefieldPduFamily.h b/src/dis6/MinefieldPduFamily.h deleted file mode 100644 index c59e7dd1..00000000 --- a/src/dis6/MinefieldPduFamily.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" -#include "dis6/utils/DataStream.h" - -namespace DIS { -// Section 5.3.10.1 Abstract superclass for PDUs relating to minefields - -// Copyright (c) 2007, MOVES Institute, Naval Postgraduate School. All rights -// reserved. -// -// This work is licensed under the BSD open source license, available at -// https://www.movesinstitute.org/licenses/bsd.html -// -// @author DMcG, jkg - -class OPENDIS6_EXPORT MinefieldPduFamily : public Pdu { - protected: - public: - MinefieldPduFamily(); - virtual ~MinefieldPduFamily(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - virtual int getMarshalledSize() const; - - bool operator==(const MinefieldPduFamily& rhs) const; -}; -} // namespace DIS diff --git a/src/dis6/common/CMakeLists.txt b/src/dis6/common/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/ClockTime.cpp b/src/dis6/common/ClockTime.cpp similarity index 100% rename from src/dis6/ClockTime.cpp rename to src/dis6/common/ClockTime.cpp diff --git a/src/dis6/ClockTime.h b/src/dis6/common/ClockTime.h similarity index 100% rename from src/dis6/ClockTime.h rename to src/dis6/common/ClockTime.h diff --git a/src/dis6/EntityID.cpp b/src/dis6/common/EntityID.cpp similarity index 100% rename from src/dis6/EntityID.cpp rename to src/dis6/common/EntityID.cpp diff --git a/src/dis6/EntityID.h b/src/dis6/common/EntityID.h similarity index 100% rename from src/dis6/EntityID.h rename to src/dis6/common/EntityID.h diff --git a/src/dis6/EntityType.cpp b/src/dis6/common/EntityType.cpp similarity index 100% rename from src/dis6/EntityType.cpp rename to src/dis6/common/EntityType.cpp diff --git a/src/dis6/EntityType.h b/src/dis6/common/EntityType.h similarity index 100% rename from src/dis6/EntityType.h rename to src/dis6/common/EntityType.h diff --git a/src/dis6/Pdu.cpp b/src/dis6/common/Pdu.cpp similarity index 100% rename from src/dis6/Pdu.cpp rename to src/dis6/common/Pdu.cpp diff --git a/src/dis6/Pdu.h b/src/dis6/common/Pdu.h similarity index 100% rename from src/dis6/Pdu.h rename to src/dis6/common/Pdu.h diff --git a/src/dis6/SimulationAddress.cpp b/src/dis6/common/SimulationAddress.cpp similarity index 97% rename from src/dis6/SimulationAddress.cpp rename to src/dis6/common/SimulationAddress.cpp index 83d89104..9acf8de0 100644 --- a/src/dis6/SimulationAddress.cpp +++ b/src/dis6/common/SimulationAddress.cpp @@ -10,9 +10,7 @@ uint16_t SimulationAddress::getSite() const { return _site; } void SimulationAddress::setSite(uint16_t pX) { _site = pX; } -uint16_t SimulationAddress::getApplication() const { - return _application; -} +uint16_t SimulationAddress::getApplication() const { return _application; } void SimulationAddress::setApplication(uint16_t pX) { _application = pX; } diff --git a/src/dis6/SimulationAddress.h b/src/dis6/common/SimulationAddress.h similarity index 100% rename from src/dis6/SimulationAddress.h rename to src/dis6/common/SimulationAddress.h diff --git a/src/dis6/Vector3Double.cpp b/src/dis6/common/Vector3Double.cpp similarity index 100% rename from src/dis6/Vector3Double.cpp rename to src/dis6/common/Vector3Double.cpp diff --git a/src/dis6/Vector3Double.h b/src/dis6/common/Vector3Double.h similarity index 100% rename from src/dis6/Vector3Double.h rename to src/dis6/common/Vector3Double.h diff --git a/src/dis6/Vector3Float.cpp b/src/dis6/common/Vector3Float.cpp similarity index 100% rename from src/dis6/Vector3Float.cpp rename to src/dis6/common/Vector3Float.cpp diff --git a/src/dis6/Vector3Float.h b/src/dis6/common/Vector3Float.h similarity index 100% rename from src/dis6/Vector3Float.h rename to src/dis6/common/Vector3Float.h diff --git a/src/dis6/distributed_emissions/CMakeLists.txt b/src/dis6/distributed_emissions/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/DesignatorPdu.cpp b/src/dis6/distributed_emissions/DesignatorPdu.cpp similarity index 100% rename from src/dis6/DesignatorPdu.cpp rename to src/dis6/distributed_emissions/DesignatorPdu.cpp diff --git a/src/dis6/DesignatorPdu.h b/src/dis6/distributed_emissions/DesignatorPdu.h similarity index 100% rename from src/dis6/DesignatorPdu.h rename to src/dis6/distributed_emissions/DesignatorPdu.h diff --git a/src/dis6/DistributedEmissionsFamilyPdu.cpp b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.cpp similarity index 100% rename from src/dis6/DistributedEmissionsFamilyPdu.cpp rename to src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.cpp diff --git a/src/dis6/DistributedEmissionsFamilyPdu.h b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h similarity index 100% rename from src/dis6/DistributedEmissionsFamilyPdu.h rename to src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h diff --git a/src/dis6/ElectromagneticEmissionBeamData.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp similarity index 100% rename from src/dis6/ElectromagneticEmissionBeamData.cpp rename to src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp diff --git a/src/dis6/ElectromagneticEmissionBeamData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h similarity index 100% rename from src/dis6/ElectromagneticEmissionBeamData.h rename to src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h diff --git a/src/dis6/ElectromagneticEmissionSystemData.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp similarity index 100% rename from src/dis6/ElectromagneticEmissionSystemData.cpp rename to src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp diff --git a/src/dis6/ElectromagneticEmissionSystemData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h similarity index 100% rename from src/dis6/ElectromagneticEmissionSystemData.h rename to src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h diff --git a/src/dis6/ElectromagneticEmissionsPdu.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp similarity index 100% rename from src/dis6/ElectromagneticEmissionsPdu.cpp rename to src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp diff --git a/src/dis6/ElectromagneticEmissionsPdu.h b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h similarity index 100% rename from src/dis6/ElectromagneticEmissionsPdu.h rename to src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h diff --git a/src/dis6/EmitterSystem.cpp b/src/dis6/distributed_emissions/EmitterSystem.cpp similarity index 100% rename from src/dis6/EmitterSystem.cpp rename to src/dis6/distributed_emissions/EmitterSystem.cpp diff --git a/src/dis6/EmitterSystem.h b/src/dis6/distributed_emissions/EmitterSystem.h similarity index 100% rename from src/dis6/EmitterSystem.h rename to src/dis6/distributed_emissions/EmitterSystem.h diff --git a/src/dis6/FundamentalParameterData.cpp b/src/dis6/distributed_emissions/FundamentalParameterData.cpp similarity index 100% rename from src/dis6/FundamentalParameterData.cpp rename to src/dis6/distributed_emissions/FundamentalParameterData.cpp diff --git a/src/dis6/FundamentalParameterData.h b/src/dis6/distributed_emissions/FundamentalParameterData.h similarity index 100% rename from src/dis6/FundamentalParameterData.h rename to src/dis6/distributed_emissions/FundamentalParameterData.h diff --git a/src/dis6/FundamentalParameterDataIff.cpp b/src/dis6/distributed_emissions/FundamentalParameterDataIff.cpp similarity index 100% rename from src/dis6/FundamentalParameterDataIff.cpp rename to src/dis6/distributed_emissions/FundamentalParameterDataIff.cpp diff --git a/src/dis6/FundamentalParameterDataIff.h b/src/dis6/distributed_emissions/FundamentalParameterDataIff.h similarity index 100% rename from src/dis6/FundamentalParameterDataIff.h rename to src/dis6/distributed_emissions/FundamentalParameterDataIff.h diff --git a/src/dis6/IffAtcNavAidsLayer1Pdu.cpp b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.cpp similarity index 100% rename from src/dis6/IffAtcNavAidsLayer1Pdu.cpp rename to src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.cpp diff --git a/src/dis6/IffAtcNavAidsLayer1Pdu.h b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h similarity index 100% rename from src/dis6/IffAtcNavAidsLayer1Pdu.h rename to src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h diff --git a/src/dis6/IffAtcNavAidsLayer2Pdu.cpp b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.cpp similarity index 100% rename from src/dis6/IffAtcNavAidsLayer2Pdu.cpp rename to src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.cpp diff --git a/src/dis6/IffAtcNavAidsLayer2Pdu.h b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h similarity index 100% rename from src/dis6/IffAtcNavAidsLayer2Pdu.h rename to src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h diff --git a/src/dis6/IffFundamentalData.cpp b/src/dis6/distributed_emissions/IffFundamentalData.cpp similarity index 100% rename from src/dis6/IffFundamentalData.cpp rename to src/dis6/distributed_emissions/IffFundamentalData.cpp diff --git a/src/dis6/IffFundamentalData.h b/src/dis6/distributed_emissions/IffFundamentalData.h similarity index 100% rename from src/dis6/IffFundamentalData.h rename to src/dis6/distributed_emissions/IffFundamentalData.h diff --git a/src/dis6/SeesPdu.cpp b/src/dis6/distributed_emissions/SeesPdu.cpp similarity index 100% rename from src/dis6/SeesPdu.cpp rename to src/dis6/distributed_emissions/SeesPdu.cpp diff --git a/src/dis6/SeesPdu.h b/src/dis6/distributed_emissions/SeesPdu.h similarity index 100% rename from src/dis6/SeesPdu.h rename to src/dis6/distributed_emissions/SeesPdu.h diff --git a/src/dis6/TrackJamTarget.cpp b/src/dis6/distributed_emissions/TrackJamTarget.cpp similarity index 100% rename from src/dis6/TrackJamTarget.cpp rename to src/dis6/distributed_emissions/TrackJamTarget.cpp diff --git a/src/dis6/TrackJamTarget.h b/src/dis6/distributed_emissions/TrackJamTarget.h similarity index 100% rename from src/dis6/TrackJamTarget.h rename to src/dis6/distributed_emissions/TrackJamTarget.h diff --git a/src/dis6/UaPdu.cpp b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp similarity index 71% rename from src/dis6/UaPdu.cpp rename to src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp index 7f374cfc..e38f6a68 100644 --- a/src/dis6/UaPdu.cpp +++ b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp @@ -1,8 +1,8 @@ -#include "dis6/UaPdu.h" +#include "dis6/distributed_emissions/UnderwaterAcousticsPdu.h" using namespace DIS; -UaPdu::UaPdu() +UnderwaterAcousticsPdu::UnderwaterAcousticsPdu() : DistributedEmissionsFamilyPdu(), _emittingEntityID(), _eventID(), @@ -16,82 +16,108 @@ UaPdu::UaPdu() setPduType(29); } -UaPdu::~UaPdu() { +UnderwaterAcousticsPdu::~UnderwaterAcousticsPdu() { _shaftRPMs.clear(); _apaData.clear(); _emitterSystems.clear(); } -EntityID& UaPdu::getEmittingEntityID() { return _emittingEntityID; } +EntityID& UnderwaterAcousticsPdu::getEmittingEntityID() { + return _emittingEntityID; +} -const EntityID& UaPdu::getEmittingEntityID() const { return _emittingEntityID; } +const EntityID& UnderwaterAcousticsPdu::getEmittingEntityID() const { + return _emittingEntityID; +} -void UaPdu::setEmittingEntityID(const EntityID& pX) { _emittingEntityID = pX; } +void UnderwaterAcousticsPdu::setEmittingEntityID(const EntityID& pX) { + _emittingEntityID = pX; +} -EventID& UaPdu::getEventID() { return _eventID; } +EventID& UnderwaterAcousticsPdu::getEventID() { return _eventID; } -const EventID& UaPdu::getEventID() const { return _eventID; } +const EventID& UnderwaterAcousticsPdu::getEventID() const { return _eventID; } -void UaPdu::setEventID(const EventID& pX) { _eventID = pX; } +void UnderwaterAcousticsPdu::setEventID(const EventID& pX) { _eventID = pX; } -char UaPdu::getStateChangeIndicator() const { return _stateChangeIndicator; } +char UnderwaterAcousticsPdu::getStateChangeIndicator() const { + return _stateChangeIndicator; +} -void UaPdu::setStateChangeIndicator(char pX) { _stateChangeIndicator = pX; } +void UnderwaterAcousticsPdu::setStateChangeIndicator(char pX) { + _stateChangeIndicator = pX; +} -char UaPdu::getPad() const { return _pad; } +char UnderwaterAcousticsPdu::getPad() const { return _pad; } -void UaPdu::setPad(char pX) { _pad = pX; } +void UnderwaterAcousticsPdu::setPad(char pX) { _pad = pX; } -uint16_t UaPdu::getPassiveParameterIndex() const { +uint16_t UnderwaterAcousticsPdu::getPassiveParameterIndex() const { return _passiveParameterIndex; } -void UaPdu::setPassiveParameterIndex(uint16_t pX) { +void UnderwaterAcousticsPdu::setPassiveParameterIndex(uint16_t pX) { _passiveParameterIndex = pX; } -uint8_t UaPdu::getPropulsionPlantConfiguration() const { +uint8_t UnderwaterAcousticsPdu::getPropulsionPlantConfiguration() const { return _propulsionPlantConfiguration; } -void UaPdu::setPropulsionPlantConfiguration(uint8_t pX) { +void UnderwaterAcousticsPdu::setPropulsionPlantConfiguration(uint8_t pX) { _propulsionPlantConfiguration = pX; } -uint8_t UaPdu::getNumberOfShafts() const { return _shaftRPMs.size(); } +uint8_t UnderwaterAcousticsPdu::getNumberOfShafts() const { + return _shaftRPMs.size(); +} -uint8_t UaPdu::getNumberOfAPAs() const { return _apaData.size(); } +uint8_t UnderwaterAcousticsPdu::getNumberOfAPAs() const { + return _apaData.size(); +} -uint8_t UaPdu::getNumberOfUAEmitterSystems() const { +uint8_t UnderwaterAcousticsPdu::getNumberOfUAEmitterSystems() const { return _emitterSystems.size(); } -std::vector& UaPdu::getShaftRPMs() { return _shaftRPMs; } +std::vector& UnderwaterAcousticsPdu::getShaftRPMs() { + return _shaftRPMs; +} -const std::vector& UaPdu::getShaftRPMs() const { return _shaftRPMs; } +const std::vector& UnderwaterAcousticsPdu::getShaftRPMs() const { + return _shaftRPMs; +} -void UaPdu::setShaftRPMs(const std::vector& pX) { _shaftRPMs = pX; } +void UnderwaterAcousticsPdu::setShaftRPMs(const std::vector& pX) { + _shaftRPMs = pX; +} -std::vector& UaPdu::getApaData() { return _apaData; } +std::vector& UnderwaterAcousticsPdu::getApaData() { return _apaData; } -const std::vector& UaPdu::getApaData() const { return _apaData; } +const std::vector& UnderwaterAcousticsPdu::getApaData() const { + return _apaData; +} -void UaPdu::setApaData(const std::vector& pX) { _apaData = pX; } +void UnderwaterAcousticsPdu::setApaData(const std::vector& pX) { + _apaData = pX; +} -std::vector& UaPdu::getEmitterSystems() { +std::vector& +UnderwaterAcousticsPdu::getEmitterSystems() { return _emitterSystems; } -const std::vector& UaPdu::getEmitterSystems() const { +const std::vector& +UnderwaterAcousticsPdu::getEmitterSystems() const { return _emitterSystems; } -void UaPdu::setEmitterSystems( +void UnderwaterAcousticsPdu::setEmitterSystems( const std::vector& pX) { _emitterSystems = pX; } -void UaPdu::marshal(DataStream& dataStream) const { +void UnderwaterAcousticsPdu::marshal(DataStream& dataStream) const { DistributedEmissionsFamilyPdu::marshal( dataStream); // Marshal information in superclass first _emittingEntityID.marshal(dataStream); @@ -120,7 +146,7 @@ void UaPdu::marshal(DataStream& dataStream) const { } } -void UaPdu::unmarshal(DataStream& dataStream) { +void UnderwaterAcousticsPdu::unmarshal(DataStream& dataStream) { DistributedEmissionsFamilyPdu::unmarshal( dataStream); // unmarshal information in superclass first _emittingEntityID.unmarshal(dataStream); @@ -155,7 +181,8 @@ void UaPdu::unmarshal(DataStream& dataStream) { } } -bool UaPdu::operator==(const UaPdu& rhs) const { +bool UnderwaterAcousticsPdu::operator==( + const UnderwaterAcousticsPdu& rhs) const { bool ivarsEqual = true; ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); @@ -184,7 +211,7 @@ bool UaPdu::operator==(const UaPdu& rhs) const { return ivarsEqual; } -int UaPdu::getMarshalledSize() const { +int UnderwaterAcousticsPdu::getMarshalledSize() const { int marshalSize = 0; marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); diff --git a/src/dis6/UaPdu.h b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h similarity index 96% rename from src/dis6/UaPdu.h rename to src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h index bb03ec4d..09ac29da 100644 --- a/src/dis6/UaPdu.h +++ b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h @@ -21,7 +21,8 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { +class OPENDIS6_EXPORT UnderwaterAcousticsPdu + : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity that is the source of the emission */ EntityID _emittingEntityID; @@ -69,8 +70,8 @@ class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { std::vector _emitterSystems; public: - UaPdu(); - virtual ~UaPdu(); + UnderwaterAcousticsPdu(); + virtual ~UnderwaterAcousticsPdu(); virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); @@ -115,7 +116,7 @@ class OPENDIS6_EXPORT UaPdu : public DistributedEmissionsFamilyPdu { virtual int getMarshalledSize() const; - bool operator==(const UaPdu& rhs) const; + bool operator==(const UnderwaterAcousticsPdu& rhs) const; }; } // namespace DIS diff --git a/src/dis6/entity_information/CMakeLists.txt b/src/dis6/entity_information/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/DeadReckoningParameter.cpp b/src/dis6/entity_information/DeadReckoningParameter.cpp similarity index 100% rename from src/dis6/DeadReckoningParameter.cpp rename to src/dis6/entity_information/DeadReckoningParameter.cpp diff --git a/src/dis6/DeadReckoningParameter.h b/src/dis6/entity_information/DeadReckoningParameter.h similarity index 100% rename from src/dis6/DeadReckoningParameter.h rename to src/dis6/entity_information/DeadReckoningParameter.h diff --git a/src/dis6/EntityInformationFamilyPdu.cpp b/src/dis6/entity_information/EntityInformationFamilyPdu.cpp similarity index 100% rename from src/dis6/EntityInformationFamilyPdu.cpp rename to src/dis6/entity_information/EntityInformationFamilyPdu.cpp diff --git a/src/dis6/EntityInformationFamilyPdu.h b/src/dis6/entity_information/EntityInformationFamilyPdu.h similarity index 100% rename from src/dis6/EntityInformationFamilyPdu.h rename to src/dis6/entity_information/EntityInformationFamilyPdu.h diff --git a/src/dis6/EntityStatePdu.cpp b/src/dis6/entity_information/EntityStatePdu.cpp similarity index 100% rename from src/dis6/EntityStatePdu.cpp rename to src/dis6/entity_information/EntityStatePdu.cpp diff --git a/src/dis6/EntityStatePdu.h b/src/dis6/entity_information/EntityStatePdu.h similarity index 100% rename from src/dis6/EntityStatePdu.h rename to src/dis6/entity_information/EntityStatePdu.h diff --git a/src/dis6/entity_management/CMakeLists.txt b/src/dis6/entity_management/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/EntityManagementFamilyPdu.cpp b/src/dis6/entity_management/EntityManagementFamilyPdu.cpp similarity index 100% rename from src/dis6/EntityManagementFamilyPdu.cpp rename to src/dis6/entity_management/EntityManagementFamilyPdu.cpp diff --git a/src/dis6/EntityManagementFamilyPdu.h b/src/dis6/entity_management/EntityManagementFamilyPdu.h similarity index 100% rename from src/dis6/EntityManagementFamilyPdu.h rename to src/dis6/entity_management/EntityManagementFamilyPdu.h diff --git a/src/dis6/logistics/CMakeLists.txt b/src/dis6/logistics/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/LogisticsFamilyPdu.cpp b/src/dis6/logistics/LogisticsFamilyPdu.cpp similarity index 100% rename from src/dis6/LogisticsFamilyPdu.cpp rename to src/dis6/logistics/LogisticsFamilyPdu.cpp diff --git a/src/dis6/LogisticsFamilyPdu.h b/src/dis6/logistics/LogisticsFamilyPdu.h similarity index 100% rename from src/dis6/LogisticsFamilyPdu.h rename to src/dis6/logistics/LogisticsFamilyPdu.h diff --git a/src/dis6/RepairCompletePdu.cpp b/src/dis6/logistics/RepairCompletePdu.cpp similarity index 100% rename from src/dis6/RepairCompletePdu.cpp rename to src/dis6/logistics/RepairCompletePdu.cpp diff --git a/src/dis6/RepairCompletePdu.h b/src/dis6/logistics/RepairCompletePdu.h similarity index 100% rename from src/dis6/RepairCompletePdu.h rename to src/dis6/logistics/RepairCompletePdu.h diff --git a/src/dis6/RepairResponsePdu.cpp b/src/dis6/logistics/RepairResponsePdu.cpp similarity index 100% rename from src/dis6/RepairResponsePdu.cpp rename to src/dis6/logistics/RepairResponsePdu.cpp diff --git a/src/dis6/RepairResponsePdu.h b/src/dis6/logistics/RepairResponsePdu.h similarity index 100% rename from src/dis6/RepairResponsePdu.h rename to src/dis6/logistics/RepairResponsePdu.h diff --git a/src/dis6/ResupplyCancelPdu.cpp b/src/dis6/logistics/ResupplyCancelPdu.cpp similarity index 100% rename from src/dis6/ResupplyCancelPdu.cpp rename to src/dis6/logistics/ResupplyCancelPdu.cpp diff --git a/src/dis6/ResupplyCancelPdu.h b/src/dis6/logistics/ResupplyCancelPdu.h similarity index 100% rename from src/dis6/ResupplyCancelPdu.h rename to src/dis6/logistics/ResupplyCancelPdu.h diff --git a/src/dis6/ResupplyOfferPdu.cpp b/src/dis6/logistics/ResupplyOfferPdu.cpp similarity index 100% rename from src/dis6/ResupplyOfferPdu.cpp rename to src/dis6/logistics/ResupplyOfferPdu.cpp diff --git a/src/dis6/ResupplyOfferPdu.h b/src/dis6/logistics/ResupplyOfferPdu.h similarity index 100% rename from src/dis6/ResupplyOfferPdu.h rename to src/dis6/logistics/ResupplyOfferPdu.h diff --git a/src/dis6/ResupplyReceivedPdu.cpp b/src/dis6/logistics/ResupplyReceivedPdu.cpp similarity index 100% rename from src/dis6/ResupplyReceivedPdu.cpp rename to src/dis6/logistics/ResupplyReceivedPdu.cpp diff --git a/src/dis6/ResupplyReceivedPdu.h b/src/dis6/logistics/ResupplyReceivedPdu.h similarity index 100% rename from src/dis6/ResupplyReceivedPdu.h rename to src/dis6/logistics/ResupplyReceivedPdu.h diff --git a/src/dis6/minefield/CMakeLists.txt b/src/dis6/minefield/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/MinefieldDataPdu.cpp b/src/dis6/minefield/MinefieldDataPdu.cpp similarity index 100% rename from src/dis6/MinefieldDataPdu.cpp rename to src/dis6/minefield/MinefieldDataPdu.cpp diff --git a/src/dis6/MinefieldDataPdu.h b/src/dis6/minefield/MinefieldDataPdu.h similarity index 100% rename from src/dis6/MinefieldDataPdu.h rename to src/dis6/minefield/MinefieldDataPdu.h diff --git a/src/dis6/MinefieldFamilyPdu.cpp b/src/dis6/minefield/MinefieldFamilyPdu.cpp similarity index 100% rename from src/dis6/MinefieldFamilyPdu.cpp rename to src/dis6/minefield/MinefieldFamilyPdu.cpp diff --git a/src/dis6/MinefieldFamilyPdu.h b/src/dis6/minefield/MinefieldFamilyPdu.h similarity index 100% rename from src/dis6/MinefieldFamilyPdu.h rename to src/dis6/minefield/MinefieldFamilyPdu.h diff --git a/src/dis6/MinefieldQueryPdu.cpp b/src/dis6/minefield/MinefieldQueryPdu.cpp similarity index 100% rename from src/dis6/MinefieldQueryPdu.cpp rename to src/dis6/minefield/MinefieldQueryPdu.cpp diff --git a/src/dis6/MinefieldQueryPdu.h b/src/dis6/minefield/MinefieldQueryPdu.h similarity index 100% rename from src/dis6/MinefieldQueryPdu.h rename to src/dis6/minefield/MinefieldQueryPdu.h diff --git a/src/dis6/MinefieldResponseNackPdu.cpp b/src/dis6/minefield/MinefieldResponseNackPdu.cpp similarity index 100% rename from src/dis6/MinefieldResponseNackPdu.cpp rename to src/dis6/minefield/MinefieldResponseNackPdu.cpp diff --git a/src/dis6/MinefieldResponseNackPdu.h b/src/dis6/minefield/MinefieldResponseNackPdu.h similarity index 100% rename from src/dis6/MinefieldResponseNackPdu.h rename to src/dis6/minefield/MinefieldResponseNackPdu.h diff --git a/src/dis6/MinefieldStatePdu.cpp b/src/dis6/minefield/MinefieldStatePdu.cpp similarity index 100% rename from src/dis6/MinefieldStatePdu.cpp rename to src/dis6/minefield/MinefieldStatePdu.cpp diff --git a/src/dis6/MinefieldStatePdu.h b/src/dis6/minefield/MinefieldStatePdu.h similarity index 100% rename from src/dis6/MinefieldStatePdu.h rename to src/dis6/minefield/MinefieldStatePdu.h diff --git a/src/dis6/radio_communications/CMakeLists.txt b/src/dis6/radio_communications/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/IntercomCommunicationsParameters.cpp b/src/dis6/radio_communications/IntercomCommunicationsParameters.cpp similarity index 100% rename from src/dis6/IntercomCommunicationsParameters.cpp rename to src/dis6/radio_communications/IntercomCommunicationsParameters.cpp diff --git a/src/dis6/IntercomCommunicationsParameters.h b/src/dis6/radio_communications/IntercomCommunicationsParameters.h similarity index 100% rename from src/dis6/IntercomCommunicationsParameters.h rename to src/dis6/radio_communications/IntercomCommunicationsParameters.h diff --git a/src/dis6/IntercomControlPdu.cpp b/src/dis6/radio_communications/IntercomControlPdu.cpp similarity index 100% rename from src/dis6/IntercomControlPdu.cpp rename to src/dis6/radio_communications/IntercomControlPdu.cpp diff --git a/src/dis6/IntercomControlPdu.h b/src/dis6/radio_communications/IntercomControlPdu.h similarity index 100% rename from src/dis6/IntercomControlPdu.h rename to src/dis6/radio_communications/IntercomControlPdu.h diff --git a/src/dis6/IntercomSignalPdu.cpp b/src/dis6/radio_communications/IntercomSignalPdu.cpp similarity index 100% rename from src/dis6/IntercomSignalPdu.cpp rename to src/dis6/radio_communications/IntercomSignalPdu.cpp diff --git a/src/dis6/IntercomSignalPdu.h b/src/dis6/radio_communications/IntercomSignalPdu.h similarity index 100% rename from src/dis6/IntercomSignalPdu.h rename to src/dis6/radio_communications/IntercomSignalPdu.h diff --git a/src/dis6/RadioCommunicationsFamilyPdu.cpp b/src/dis6/radio_communications/RadioCommunicationsFamilyPdu.cpp similarity index 100% rename from src/dis6/RadioCommunicationsFamilyPdu.cpp rename to src/dis6/radio_communications/RadioCommunicationsFamilyPdu.cpp diff --git a/src/dis6/RadioCommunicationsFamilyPdu.h b/src/dis6/radio_communications/RadioCommunicationsFamilyPdu.h similarity index 100% rename from src/dis6/RadioCommunicationsFamilyPdu.h rename to src/dis6/radio_communications/RadioCommunicationsFamilyPdu.h diff --git a/src/dis6/RadioEntityType.cpp b/src/dis6/radio_communications/RadioEntityType.cpp similarity index 100% rename from src/dis6/RadioEntityType.cpp rename to src/dis6/radio_communications/RadioEntityType.cpp diff --git a/src/dis6/RadioEntityType.h b/src/dis6/radio_communications/RadioEntityType.h similarity index 100% rename from src/dis6/RadioEntityType.h rename to src/dis6/radio_communications/RadioEntityType.h diff --git a/src/dis6/ReceiverPdu.cpp b/src/dis6/radio_communications/ReceiverPdu.cpp similarity index 100% rename from src/dis6/ReceiverPdu.cpp rename to src/dis6/radio_communications/ReceiverPdu.cpp diff --git a/src/dis6/ReceiverPdu.h b/src/dis6/radio_communications/ReceiverPdu.h similarity index 100% rename from src/dis6/ReceiverPdu.h rename to src/dis6/radio_communications/ReceiverPdu.h diff --git a/src/dis6/SignalPdu.cpp b/src/dis6/radio_communications/SignalPdu.cpp similarity index 100% rename from src/dis6/SignalPdu.cpp rename to src/dis6/radio_communications/SignalPdu.cpp diff --git a/src/dis6/SignalPdu.h b/src/dis6/radio_communications/SignalPdu.h similarity index 100% rename from src/dis6/SignalPdu.h rename to src/dis6/radio_communications/SignalPdu.h diff --git a/src/dis6/TransmitterPdu.cpp b/src/dis6/radio_communications/TransmitterPdu.cpp similarity index 100% rename from src/dis6/TransmitterPdu.cpp rename to src/dis6/radio_communications/TransmitterPdu.cpp diff --git a/src/dis6/TransmitterPdu.h b/src/dis6/radio_communications/TransmitterPdu.h similarity index 100% rename from src/dis6/TransmitterPdu.h rename to src/dis6/radio_communications/TransmitterPdu.h diff --git a/src/dis6/AcknowledgePdu.cpp b/src/dis6/simulation_management/AcknowledgePdu.cpp similarity index 100% rename from src/dis6/AcknowledgePdu.cpp rename to src/dis6/simulation_management/AcknowledgePdu.cpp diff --git a/src/dis6/AcknowledgePdu.h b/src/dis6/simulation_management/AcknowledgePdu.h similarity index 99% rename from src/dis6/AcknowledgePdu.h rename to src/dis6/simulation_management/AcknowledgePdu.h index 1d1a0c33..207073d2 100644 --- a/src/dis6/AcknowledgePdu.h +++ b/src/dis6/simulation_management/AcknowledgePdu.h @@ -1,5 +1,6 @@ #pragma once +#include #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/opendis6_export.h" #include "dis6/utils/DataStream.h" diff --git a/src/dis6/ActionRequestPdu.cpp b/src/dis6/simulation_management/ActionRequestPdu.cpp similarity index 100% rename from src/dis6/ActionRequestPdu.cpp rename to src/dis6/simulation_management/ActionRequestPdu.cpp diff --git a/src/dis6/ActionRequestPdu.h b/src/dis6/simulation_management/ActionRequestPdu.h similarity index 100% rename from src/dis6/ActionRequestPdu.h rename to src/dis6/simulation_management/ActionRequestPdu.h diff --git a/src/dis6/ActionResponsePdu.cpp b/src/dis6/simulation_management/ActionResponsePdu.cpp similarity index 100% rename from src/dis6/ActionResponsePdu.cpp rename to src/dis6/simulation_management/ActionResponsePdu.cpp diff --git a/src/dis6/ActionResponsePdu.h b/src/dis6/simulation_management/ActionResponsePdu.h similarity index 100% rename from src/dis6/ActionResponsePdu.h rename to src/dis6/simulation_management/ActionResponsePdu.h diff --git a/src/dis6/simulation_management/CMakeLists.txt b/src/dis6/simulation_management/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/CommentPdu.cpp b/src/dis6/simulation_management/CommentPdu.cpp similarity index 100% rename from src/dis6/CommentPdu.cpp rename to src/dis6/simulation_management/CommentPdu.cpp diff --git a/src/dis6/CommentPdu.h b/src/dis6/simulation_management/CommentPdu.h similarity index 100% rename from src/dis6/CommentPdu.h rename to src/dis6/simulation_management/CommentPdu.h diff --git a/src/dis6/CreateEntityPdu.cpp b/src/dis6/simulation_management/CreateEntityPdu.cpp similarity index 100% rename from src/dis6/CreateEntityPdu.cpp rename to src/dis6/simulation_management/CreateEntityPdu.cpp diff --git a/src/dis6/CreateEntityPdu.h b/src/dis6/simulation_management/CreateEntityPdu.h similarity index 100% rename from src/dis6/CreateEntityPdu.h rename to src/dis6/simulation_management/CreateEntityPdu.h diff --git a/src/dis6/DataPdu.cpp b/src/dis6/simulation_management/DataPdu.cpp similarity index 100% rename from src/dis6/DataPdu.cpp rename to src/dis6/simulation_management/DataPdu.cpp diff --git a/src/dis6/DataPdu.h b/src/dis6/simulation_management/DataPdu.h similarity index 100% rename from src/dis6/DataPdu.h rename to src/dis6/simulation_management/DataPdu.h diff --git a/src/dis6/DataQueryPdu.cpp b/src/dis6/simulation_management/DataQueryPdu.cpp similarity index 100% rename from src/dis6/DataQueryPdu.cpp rename to src/dis6/simulation_management/DataQueryPdu.cpp diff --git a/src/dis6/DataQueryPdu.h b/src/dis6/simulation_management/DataQueryPdu.h similarity index 100% rename from src/dis6/DataQueryPdu.h rename to src/dis6/simulation_management/DataQueryPdu.h diff --git a/src/dis6/EventReportPdu.cpp b/src/dis6/simulation_management/EventReportPdu.cpp similarity index 100% rename from src/dis6/EventReportPdu.cpp rename to src/dis6/simulation_management/EventReportPdu.cpp diff --git a/src/dis6/EventReportPdu.h b/src/dis6/simulation_management/EventReportPdu.h similarity index 100% rename from src/dis6/EventReportPdu.h rename to src/dis6/simulation_management/EventReportPdu.h diff --git a/src/dis6/RemoveEntityPdu.cpp b/src/dis6/simulation_management/RemoveEntityPdu.cpp similarity index 100% rename from src/dis6/RemoveEntityPdu.cpp rename to src/dis6/simulation_management/RemoveEntityPdu.cpp diff --git a/src/dis6/RemoveEntityPdu.h b/src/dis6/simulation_management/RemoveEntityPdu.h similarity index 100% rename from src/dis6/RemoveEntityPdu.h rename to src/dis6/simulation_management/RemoveEntityPdu.h diff --git a/src/dis6/SetDataPdu.cpp b/src/dis6/simulation_management/SetDataPdu.cpp similarity index 100% rename from src/dis6/SetDataPdu.cpp rename to src/dis6/simulation_management/SetDataPdu.cpp diff --git a/src/dis6/SetDataPdu.h b/src/dis6/simulation_management/SetDataPdu.h similarity index 100% rename from src/dis6/SetDataPdu.h rename to src/dis6/simulation_management/SetDataPdu.h diff --git a/src/dis6/SimulationManagementFamilyPdu.cpp b/src/dis6/simulation_management/SimulationManagementFamilyPdu.cpp similarity index 100% rename from src/dis6/SimulationManagementFamilyPdu.cpp rename to src/dis6/simulation_management/SimulationManagementFamilyPdu.cpp diff --git a/src/dis6/SimulationManagementFamilyPdu.h b/src/dis6/simulation_management/SimulationManagementFamilyPdu.h similarity index 100% rename from src/dis6/SimulationManagementFamilyPdu.h rename to src/dis6/simulation_management/SimulationManagementFamilyPdu.h diff --git a/src/dis6/StartResumePdu.cpp b/src/dis6/simulation_management/StartResumePdu.cpp similarity index 100% rename from src/dis6/StartResumePdu.cpp rename to src/dis6/simulation_management/StartResumePdu.cpp diff --git a/src/dis6/StartResumePdu.h b/src/dis6/simulation_management/StartResumePdu.h similarity index 100% rename from src/dis6/StartResumePdu.h rename to src/dis6/simulation_management/StartResumePdu.h diff --git a/src/dis6/StopFreezePdu.cpp b/src/dis6/simulation_management/StopFreezePdu.cpp similarity index 100% rename from src/dis6/StopFreezePdu.cpp rename to src/dis6/simulation_management/StopFreezePdu.cpp diff --git a/src/dis6/StopFreezePdu.h b/src/dis6/simulation_management/StopFreezePdu.h similarity index 100% rename from src/dis6/StopFreezePdu.h rename to src/dis6/simulation_management/StopFreezePdu.h diff --git a/src/dis6/AcknowledgeReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.cpp similarity index 100% rename from src/dis6/AcknowledgeReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.cpp diff --git a/src/dis6/AcknowledgeReliablePdu.h b/src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.h similarity index 100% rename from src/dis6/AcknowledgeReliablePdu.h rename to src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.h diff --git a/src/dis6/ActionRequestReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.cpp similarity index 100% rename from src/dis6/ActionRequestReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.cpp diff --git a/src/dis6/ActionRequestReliablePdu.h b/src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.h similarity index 100% rename from src/dis6/ActionRequestReliablePdu.h rename to src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.h diff --git a/src/dis6/ActionResponseReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.cpp similarity index 100% rename from src/dis6/ActionResponseReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.cpp diff --git a/src/dis6/ActionResponseReliablePdu.h b/src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.h similarity index 100% rename from src/dis6/ActionResponseReliablePdu.h rename to src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.h diff --git a/src/dis6/simulation_management_with_reliability/CMakeLists.txt b/src/dis6/simulation_management_with_reliability/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/CommentReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/CommentReliablePdu.cpp similarity index 100% rename from src/dis6/CommentReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/CommentReliablePdu.cpp diff --git a/src/dis6/CommentReliablePdu.h b/src/dis6/simulation_management_with_reliability/CommentReliablePdu.h similarity index 100% rename from src/dis6/CommentReliablePdu.h rename to src/dis6/simulation_management_with_reliability/CommentReliablePdu.h diff --git a/src/dis6/CreateEntityReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.cpp similarity index 100% rename from src/dis6/CreateEntityReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.cpp diff --git a/src/dis6/CreateEntityReliablePdu.h b/src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.h similarity index 100% rename from src/dis6/CreateEntityReliablePdu.h rename to src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.h diff --git a/src/dis6/DataQueryReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.cpp similarity index 100% rename from src/dis6/DataQueryReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.cpp diff --git a/src/dis6/DataQueryReliablePdu.h b/src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.h similarity index 100% rename from src/dis6/DataQueryReliablePdu.h rename to src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.h diff --git a/src/dis6/DataReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/DataReliablePdu.cpp similarity index 100% rename from src/dis6/DataReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/DataReliablePdu.cpp diff --git a/src/dis6/DataReliablePdu.h b/src/dis6/simulation_management_with_reliability/DataReliablePdu.h similarity index 100% rename from src/dis6/DataReliablePdu.h rename to src/dis6/simulation_management_with_reliability/DataReliablePdu.h diff --git a/src/dis6/EventReportReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/EventReportReliablePdu.cpp similarity index 100% rename from src/dis6/EventReportReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/EventReportReliablePdu.cpp diff --git a/src/dis6/EventReportReliablePdu.h b/src/dis6/simulation_management_with_reliability/EventReportReliablePdu.h similarity index 100% rename from src/dis6/EventReportReliablePdu.h rename to src/dis6/simulation_management_with_reliability/EventReportReliablePdu.h diff --git a/src/dis6/RemoveEntityReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.cpp similarity index 100% rename from src/dis6/RemoveEntityReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.cpp diff --git a/src/dis6/RemoveEntityReliablePdu.h b/src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.h similarity index 100% rename from src/dis6/RemoveEntityReliablePdu.h rename to src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.h diff --git a/src/dis6/SetDataReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/SetDataReliablePdu.cpp similarity index 100% rename from src/dis6/SetDataReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/SetDataReliablePdu.cpp diff --git a/src/dis6/SetDataReliablePdu.h b/src/dis6/simulation_management_with_reliability/SetDataReliablePdu.h similarity index 100% rename from src/dis6/SetDataReliablePdu.h rename to src/dis6/simulation_management_with_reliability/SetDataReliablePdu.h diff --git a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp b/src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.cpp similarity index 100% rename from src/dis6/SimulationManagementWithReliabilityFamilyPdu.cpp rename to src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.cpp diff --git a/src/dis6/SimulationManagementWithReliabilityFamilyPdu.h b/src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h similarity index 100% rename from src/dis6/SimulationManagementWithReliabilityFamilyPdu.h rename to src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h diff --git a/src/dis6/StartResumeReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.cpp similarity index 100% rename from src/dis6/StartResumeReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.cpp diff --git a/src/dis6/StartResumeReliablePdu.h b/src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.h similarity index 100% rename from src/dis6/StartResumeReliablePdu.h rename to src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.h diff --git a/src/dis6/StopFreezeReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.cpp similarity index 100% rename from src/dis6/StopFreezeReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.cpp diff --git a/src/dis6/StopFreezeReliablePdu.h b/src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.h similarity index 100% rename from src/dis6/StopFreezeReliablePdu.h rename to src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.h diff --git a/src/dis6/synthetic_environment/CMakeLists.txt b/src/dis6/synthetic_environment/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/SyntheticEnvironmentFamilyPdu.cpp b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp similarity index 100% rename from src/dis6/SyntheticEnvironmentFamilyPdu.cpp rename to src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp diff --git a/src/dis6/SyntheticEnvironmentFamilyPdu.h b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h similarity index 100% rename from src/dis6/SyntheticEnvironmentFamilyPdu.h rename to src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h diff --git a/src/dis6/warfare/CMakeLists.txt b/src/dis6/warfare/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis6/DetonationPdu.cpp b/src/dis6/warfare/DetonationPdu.cpp similarity index 100% rename from src/dis6/DetonationPdu.cpp rename to src/dis6/warfare/DetonationPdu.cpp diff --git a/src/dis6/DetonationPdu.h b/src/dis6/warfare/DetonationPdu.h similarity index 100% rename from src/dis6/DetonationPdu.h rename to src/dis6/warfare/DetonationPdu.h diff --git a/src/dis6/FirePdu.cpp b/src/dis6/warfare/FirePdu.cpp similarity index 100% rename from src/dis6/FirePdu.cpp rename to src/dis6/warfare/FirePdu.cpp diff --git a/src/dis6/FirePdu.h b/src/dis6/warfare/FirePdu.h similarity index 100% rename from src/dis6/FirePdu.h rename to src/dis6/warfare/FirePdu.h diff --git a/src/dis6/WarfareFamilyPdu.cpp b/src/dis6/warfare/WarfareFamilyPdu.cpp similarity index 100% rename from src/dis6/WarfareFamilyPdu.cpp rename to src/dis6/warfare/WarfareFamilyPdu.cpp diff --git a/src/dis6/WarfareFamilyPdu.h b/src/dis6/warfare/WarfareFamilyPdu.h similarity index 100% rename from src/dis6/WarfareFamilyPdu.h rename to src/dis6/warfare/WarfareFamilyPdu.h From 989f809dc3ce494e82818927f6259b078b892c23 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Sat, 13 Jan 2024 17:09:52 +0000 Subject: [PATCH 08/22] More restructuring --- src/dis6/CMakeLists.txt | 162 +----------------- .../RecordQueryReliablePdu.cpp | 0 .../RecordQueryReliablePdu.h | 0 .../SetRecordReliablePdu.cpp | 0 .../SetRecordReliablePdu.h | 0 src/dis7/{ => common}/ClockTime.cpp | 0 src/dis7/{ => common}/ClockTime.h | 0 src/dis7/{ => common}/EntityID.cpp | 0 src/dis7/{ => common}/EntityID.h | 0 src/dis7/{ => common}/EntityType.cpp | 0 src/dis7/{ => common}/EntityType.h | 0 src/dis7/{ => common}/Pdu.cpp | 0 src/dis7/{ => common}/Pdu.h | 0 src/dis7/{ => common}/SimulationAddress.cpp | 0 src/dis7/{ => common}/SimulationAddress.h | 0 src/dis7/{ => common}/Vector3Double.cpp | 0 src/dis7/{ => common}/Vector3Double.h | 0 src/dis7/{ => common}/Vector3Float.cpp | 0 src/dis7/{ => common}/Vector3Float.h | 0 src/dis7/{ => warfare}/DetonationPdu.cpp | 0 src/dis7/{ => warfare}/DetonationPdu.h | 0 src/dis7/{ => warfare}/FirePdu.cpp | 0 src/dis7/{ => warfare}/FirePdu.h | 0 src/dis7/{ => warfare}/WarfareFamilyPdu.cpp | 0 src/dis7/{ => warfare}/WarfareFamilyPdu.h | 0 25 files changed, 4 insertions(+), 158 deletions(-) rename src/dis6/{ => simulation_management_with_reliability}/RecordQueryReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/RecordQueryReliablePdu.h (100%) rename src/dis6/{ => simulation_management_with_reliability}/SetRecordReliablePdu.cpp (100%) rename src/dis6/{ => simulation_management_with_reliability}/SetRecordReliablePdu.h (100%) rename src/dis7/{ => common}/ClockTime.cpp (100%) rename src/dis7/{ => common}/ClockTime.h (100%) rename src/dis7/{ => common}/EntityID.cpp (100%) rename src/dis7/{ => common}/EntityID.h (100%) rename src/dis7/{ => common}/EntityType.cpp (100%) rename src/dis7/{ => common}/EntityType.h (100%) rename src/dis7/{ => common}/Pdu.cpp (100%) rename src/dis7/{ => common}/Pdu.h (100%) rename src/dis7/{ => common}/SimulationAddress.cpp (100%) rename src/dis7/{ => common}/SimulationAddress.h (100%) rename src/dis7/{ => common}/Vector3Double.cpp (100%) rename src/dis7/{ => common}/Vector3Double.h (100%) rename src/dis7/{ => common}/Vector3Float.cpp (100%) rename src/dis7/{ => common}/Vector3Float.h (100%) rename src/dis7/{ => warfare}/DetonationPdu.cpp (100%) rename src/dis7/{ => warfare}/DetonationPdu.h (100%) rename src/dis7/{ => warfare}/FirePdu.cpp (100%) rename src/dis7/{ => warfare}/FirePdu.h (100%) rename src/dis7/{ => warfare}/WarfareFamilyPdu.cpp (100%) rename src/dis7/{ => warfare}/WarfareFamilyPdu.h (100%) diff --git a/src/dis6/CMakeLists.txt b/src/dis6/CMakeLists.txt index 4908f533..37dc0a1b 100644 --- a/src/dis6/CMakeLists.txt +++ b/src/dis6/CMakeLists.txt @@ -13,17 +13,11 @@ add_subdirectory(warfare) # Create list of all headers set(dis6_hdr - AcknowledgePdu.h - AcknowledgeReliablePdu.h AcousticBeamData.h AcousticBeamFundamentalParameter.h AcousticEmitter.h - AcousticEmitterSystemData.h AcousticEmitterSystem.h - ActionRequestPdu.h - ActionRequestReliablePdu.h - ActionResponsePdu.h - ActionResponseReliablePdu.h + AcousticEmitterSystemData.h AggregateID.h AggregateMarking.h AggregateStatePdu.h @@ -36,135 +30,58 @@ set(dis6_hdr BeamAntennaPattern.h BeamData.h BurstDescriptor.h - ClockTime.h CollisionElasticPdu.h CollisionPdu.h - CommentPdu.h - CommentReliablePdu.h - CreateEntityPdu.h - CreateEntityReliablePdu.h - DataPdu.h - DataQueryPdu.h - DataQueryReliablePdu.h - DataReliablePdu.h - DeadReckoningParameter.h - DesignatorPdu.h - DetonationPdu.h - DistributedEmissionsFamilyPdu.h EightByteChunk.h - ElectromagneticEmissionBeamData.h - ElectromagneticEmissionsPdu.h - ElectromagneticEmissionSystemData.h - EmitterSystem.h - EntityID.h - EntityInformationFamilyPdu.h - EntityManagementFamilyPdu.h - EntityStatePdu.h EntityStateUpdatePdu.h - EntityType.h - EnvironmentalProcessPdu.h Environment.h + EnvironmentalProcessPdu.h EventID.h - EventReportPdu.h - EventReportReliablePdu.h FastEntityStatePdu.h - FirePdu.h FixedDatum.h FourByteChunk.h - FundamentalParameterData.h - FundamentalParameterDataIff.h GridAxisRecord.h GridAxisRecordRepresentation0.h GridAxisRecordRepresentation1.h GridAxisRecordRepresentation2.h GriddedDataPdu.h - IffAtcNavAidsLayer1Pdu.h - IffAtcNavAidsLayer2Pdu.h - IffFundamentalData.h - IntercomCommunicationsParameters.h - IntercomControlPdu.h - IntercomSignalPdu.h IsGroupOfPdu.h IsPartOfPdu.h LayerHeader.h LinearObjectStatePdu.h LinearSegmentParameter.h - LogisticsFamilyPdu.h LogisticsPdu.h Marking.h - MinefieldDataPdu.h - MinefieldFamilyPdu.h - MinefieldPduFamily.h - MinefieldQueryPdu.h - MinefieldResponseNackPdu.h - MinefieldStatePdu.h ModulationType.h NamedLocation.h ObjectType.h Orientation.h PduContainer.h - Pdu.h Point.h PointObjectStatePdu.h PropulsionSystemData.h - RadioCommunicationsFamilyPdu.h - RadioEntityType.h - ReceiverPdu.h - RecordQueryReliablePdu.h RecordSet.h Relationship.h - RemoveEntityPdu.h - RemoveEntityReliablePdu.h - RepairCompletePdu.h - RepairResponsePdu.h - ResupplyCancelPdu.h - ResupplyOfferPdu.h - ResupplyReceivedPdu.h - SeesPdu.h ServiceRequestPdu.h - SetDataPdu.h - SetDataReliablePdu.h - SetRecordReliablePdu.h ShaftRPMs.h - SignalPdu.h - SimulationAddress.h - SimulationManagementFamilyPdu.h - SimulationManagementWithReliabilityFamilyPdu.h SixByteChunk.h SphericalHarmonicAntennaPattern.h - StartResumePdu.h - StartResumeReliablePdu.h - StopFreezePdu.h - StopFreezeReliablePdu.h SupplyQuantity.h symbolic_names.h - SyntheticEnvironmentFamilyPdu.h SystemID.h - TrackJamTarget.h TransferControlRequestPdu.h - TransmitterPdu.h TwoByteChunk.h - UaPdu.h VariableDatum.h - Vector3Double.h - Vector3Float.h VectoringNozzleSystemData.h - WarfareFamilyPdu.h ) # Create list of all source files set(dis6_src - AcknowledgePdu.cpp - AcknowledgeReliablePdu.cpp AcousticBeamData.cpp AcousticBeamFundamentalParameter.cpp AcousticEmitter.cpp AcousticEmitterSystem.cpp AcousticEmitterSystemData.cpp - ActionRequestPdu.cpp - ActionRequestReliablePdu.cpp - ActionResponsePdu.cpp - ActionResponseReliablePdu.cpp AggregateID.cpp AggregateMarking.cpp AggregateStatePdu.cpp @@ -177,119 +94,48 @@ set(dis6_src BeamAntennaPattern.cpp BeamData.cpp BurstDescriptor.cpp - ClockTime.cpp CollisionElasticPdu.cpp CollisionPdu.cpp - CommentPdu.cpp - CommentReliablePdu.cpp - CreateEntityPdu.cpp - CreateEntityReliablePdu.cpp - DataPdu.cpp - DataQueryPdu.cpp - DataQueryReliablePdu.cpp - DataReliablePdu.cpp - DeadReckoningParameter.cpp - DesignatorPdu.cpp - DetonationPdu.cpp - DistributedEmissionsFamilyPdu.cpp EightByteChunk.cpp - ElectromagneticEmissionBeamData.cpp - ElectromagneticEmissionsPdu.cpp - ElectromagneticEmissionSystemData.cpp - EmitterSystem.cpp - EntityID.cpp - EntityInformationFamilyPdu.cpp - EntityManagementFamilyPdu.cpp - EntityStatePdu.cpp EntityStateUpdatePdu.cpp - EntityType.cpp - EnvironmentalProcessPdu.cpp Environment.cpp + EnvironmentalProcessPdu.cpp EventID.cpp - EventReportPdu.cpp - EventReportReliablePdu.cpp FastEntityStatePdu.cpp - FirePdu.cpp FixedDatum.cpp FourByteChunk.cpp - FundamentalParameterData.cpp - FundamentalParameterDataIff.cpp GridAxisRecord.cpp GridAxisRecordRepresentation0.cpp GridAxisRecordRepresentation1.cpp GridAxisRecordRepresentation2.cpp GriddedDataPdu.cpp - IffAtcNavAidsLayer1Pdu.cpp - IffAtcNavAidsLayer2Pdu.cpp - IffFundamentalData.cpp - IntercomCommunicationsParameters.cpp - IntercomControlPdu.cpp - IntercomSignalPdu.cpp IsGroupOfPdu.cpp IsPartOfPdu.cpp LayerHeader.cpp LinearObjectStatePdu.cpp LinearSegmentParameter.cpp - LogisticsFamilyPdu.cpp LogisticsPdu.cpp Marking.cpp - MinefieldDataPdu.cpp - MinefieldFamilyPdu.cpp - MinefieldPduFamily.cpp - MinefieldQueryPdu.cpp - MinefieldResponseNackPdu.cpp - MinefieldStatePdu.cpp ModulationType.cpp NamedLocation.cpp ObjectType.cpp Orientation.cpp PduContainer.cpp - Pdu.cpp Point.cpp PointObjectStatePdu.cpp PropulsionSystemData.cpp - RadioCommunicationsFamilyPdu.cpp - RadioEntityType.cpp - ReceiverPdu.cpp - RecordQueryReliablePdu.cpp RecordSet.cpp Relationship.cpp - RemoveEntityPdu.cpp - RemoveEntityReliablePdu.cpp - RepairCompletePdu.cpp - RepairResponsePdu.cpp - ResupplyCancelPdu.cpp - ResupplyOfferPdu.cpp - ResupplyReceivedPdu.cpp - SeesPdu.cpp ServiceRequestPdu.cpp - SetDataPdu.cpp - SetDataReliablePdu.cpp - SetRecordReliablePdu.cpp ShaftRPMs.cpp - SignalPdu.cpp - SimulationAddress.cpp - SimulationManagementFamilyPdu.cpp - SimulationManagementWithReliabilityFamilyPdu.cpp SixByteChunk.cpp SphericalHarmonicAntennaPattern.cpp - StartResumePdu.cpp - StartResumeReliablePdu.cpp - StopFreezePdu.cpp - StopFreezeReliablePdu.cpp SupplyQuantity.cpp - SyntheticEnvironmentFamilyPdu.cpp SystemID.cpp - TrackJamTarget.cpp TransferControlRequestPdu.cpp - TransmitterPdu.cpp TwoByteChunk.cpp - UaPdu.cpp VariableDatum.cpp - Vector3Double.cpp - Vector3Float.cpp VectoringNozzleSystemData.cpp - WarfareFamilyPdu.cpp ) # CMake < 3.16 requires target_sources to be specified as @@ -305,4 +151,4 @@ list(APPEND dis6_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") target_sources(OpenDIS6 PRIVATE ${dis6_src}) install(FILES ${dis6_hdr} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6) diff --git a/src/dis6/RecordQueryReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.cpp similarity index 100% rename from src/dis6/RecordQueryReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.cpp diff --git a/src/dis6/RecordQueryReliablePdu.h b/src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.h similarity index 100% rename from src/dis6/RecordQueryReliablePdu.h rename to src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.h diff --git a/src/dis6/SetRecordReliablePdu.cpp b/src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.cpp similarity index 100% rename from src/dis6/SetRecordReliablePdu.cpp rename to src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.cpp diff --git a/src/dis6/SetRecordReliablePdu.h b/src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.h similarity index 100% rename from src/dis6/SetRecordReliablePdu.h rename to src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.h diff --git a/src/dis7/ClockTime.cpp b/src/dis7/common/ClockTime.cpp similarity index 100% rename from src/dis7/ClockTime.cpp rename to src/dis7/common/ClockTime.cpp diff --git a/src/dis7/ClockTime.h b/src/dis7/common/ClockTime.h similarity index 100% rename from src/dis7/ClockTime.h rename to src/dis7/common/ClockTime.h diff --git a/src/dis7/EntityID.cpp b/src/dis7/common/EntityID.cpp similarity index 100% rename from src/dis7/EntityID.cpp rename to src/dis7/common/EntityID.cpp diff --git a/src/dis7/EntityID.h b/src/dis7/common/EntityID.h similarity index 100% rename from src/dis7/EntityID.h rename to src/dis7/common/EntityID.h diff --git a/src/dis7/EntityType.cpp b/src/dis7/common/EntityType.cpp similarity index 100% rename from src/dis7/EntityType.cpp rename to src/dis7/common/EntityType.cpp diff --git a/src/dis7/EntityType.h b/src/dis7/common/EntityType.h similarity index 100% rename from src/dis7/EntityType.h rename to src/dis7/common/EntityType.h diff --git a/src/dis7/Pdu.cpp b/src/dis7/common/Pdu.cpp similarity index 100% rename from src/dis7/Pdu.cpp rename to src/dis7/common/Pdu.cpp diff --git a/src/dis7/Pdu.h b/src/dis7/common/Pdu.h similarity index 100% rename from src/dis7/Pdu.h rename to src/dis7/common/Pdu.h diff --git a/src/dis7/SimulationAddress.cpp b/src/dis7/common/SimulationAddress.cpp similarity index 100% rename from src/dis7/SimulationAddress.cpp rename to src/dis7/common/SimulationAddress.cpp diff --git a/src/dis7/SimulationAddress.h b/src/dis7/common/SimulationAddress.h similarity index 100% rename from src/dis7/SimulationAddress.h rename to src/dis7/common/SimulationAddress.h diff --git a/src/dis7/Vector3Double.cpp b/src/dis7/common/Vector3Double.cpp similarity index 100% rename from src/dis7/Vector3Double.cpp rename to src/dis7/common/Vector3Double.cpp diff --git a/src/dis7/Vector3Double.h b/src/dis7/common/Vector3Double.h similarity index 100% rename from src/dis7/Vector3Double.h rename to src/dis7/common/Vector3Double.h diff --git a/src/dis7/Vector3Float.cpp b/src/dis7/common/Vector3Float.cpp similarity index 100% rename from src/dis7/Vector3Float.cpp rename to src/dis7/common/Vector3Float.cpp diff --git a/src/dis7/Vector3Float.h b/src/dis7/common/Vector3Float.h similarity index 100% rename from src/dis7/Vector3Float.h rename to src/dis7/common/Vector3Float.h diff --git a/src/dis7/DetonationPdu.cpp b/src/dis7/warfare/DetonationPdu.cpp similarity index 100% rename from src/dis7/DetonationPdu.cpp rename to src/dis7/warfare/DetonationPdu.cpp diff --git a/src/dis7/DetonationPdu.h b/src/dis7/warfare/DetonationPdu.h similarity index 100% rename from src/dis7/DetonationPdu.h rename to src/dis7/warfare/DetonationPdu.h diff --git a/src/dis7/FirePdu.cpp b/src/dis7/warfare/FirePdu.cpp similarity index 100% rename from src/dis7/FirePdu.cpp rename to src/dis7/warfare/FirePdu.cpp diff --git a/src/dis7/FirePdu.h b/src/dis7/warfare/FirePdu.h similarity index 100% rename from src/dis7/FirePdu.h rename to src/dis7/warfare/FirePdu.h diff --git a/src/dis7/WarfareFamilyPdu.cpp b/src/dis7/warfare/WarfareFamilyPdu.cpp similarity index 100% rename from src/dis7/WarfareFamilyPdu.cpp rename to src/dis7/warfare/WarfareFamilyPdu.cpp diff --git a/src/dis7/WarfareFamilyPdu.h b/src/dis7/warfare/WarfareFamilyPdu.h similarity index 100% rename from src/dis7/WarfareFamilyPdu.h rename to src/dis7/warfare/WarfareFamilyPdu.h From dd051ecab68299dac7f295a40083a73b8444dad5 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Sat, 13 Jan 2024 17:55:29 +0000 Subject: [PATCH 09/22] Moved all DIS6 PDUs into appropriate subdirectories, removed PDU files that shouldn't exist --- src/dis6/CMakeLists.txt | 31 - src/dis6/FastEntityStatePdu.cpp | 549 ------------------ src/dis6/FastEntityStatePdu.h | 304 ---------- src/dis6/LogisticsPdu.cpp | 35 -- src/dis6/LogisticsPdu.h | 31 - .../CollisionElasticPdu.cpp | 0 .../CollisionElasticPdu.h | 0 .../{ => entity_information}/CollisionPdu.cpp | 0 .../{ => entity_information}/CollisionPdu.h | 0 .../EntityStateUpdatePdu.cpp | 0 .../EntityStateUpdatePdu.h | 0 .../AggregateStatePdu.cpp | 0 .../AggregateStatePdu.h | 0 .../{ => entity_management}/IsGroupOfPdu.cpp | 0 .../{ => entity_management}/IsGroupOfPdu.h | 0 .../{ => entity_management}/IsPartOfPdu.cpp | 0 .../{ => entity_management}/IsPartOfPdu.h | 0 .../TransferControlRequestPdu.cpp | 0 .../TransferControlRequestPdu.h | 0 .../{ => logistics}/ServiceRequestPdu.cpp | 0 src/dis6/{ => logistics}/ServiceRequestPdu.h | 0 src/dis6/symbolic_names.h | 96 --- .../ArealObjectStatePdu.cpp | 0 .../ArealObjectStatePdu.h | 0 .../EnvironmentalProcessPdu.cpp | 0 .../EnvironmentalProcessPdu.h | 0 .../GriddedDataPdu.cpp | 0 .../GriddedDataPdu.h | 0 .../LinearObjectStatePdu.cpp | 0 .../LinearObjectStatePdu.h | 0 .../PointObjectStatePdu.cpp | 0 .../PointObjectStatePdu.h | 0 32 files changed, 1046 deletions(-) delete mode 100644 src/dis6/FastEntityStatePdu.cpp delete mode 100644 src/dis6/FastEntityStatePdu.h delete mode 100644 src/dis6/LogisticsPdu.cpp delete mode 100644 src/dis6/LogisticsPdu.h rename src/dis6/{ => entity_information}/CollisionElasticPdu.cpp (100%) rename src/dis6/{ => entity_information}/CollisionElasticPdu.h (100%) rename src/dis6/{ => entity_information}/CollisionPdu.cpp (100%) rename src/dis6/{ => entity_information}/CollisionPdu.h (100%) rename src/dis6/{ => entity_information}/EntityStateUpdatePdu.cpp (100%) rename src/dis6/{ => entity_information}/EntityStateUpdatePdu.h (100%) rename src/dis6/{ => entity_management}/AggregateStatePdu.cpp (100%) rename src/dis6/{ => entity_management}/AggregateStatePdu.h (100%) rename src/dis6/{ => entity_management}/IsGroupOfPdu.cpp (100%) rename src/dis6/{ => entity_management}/IsGroupOfPdu.h (100%) rename src/dis6/{ => entity_management}/IsPartOfPdu.cpp (100%) rename src/dis6/{ => entity_management}/IsPartOfPdu.h (100%) rename src/dis6/{ => entity_management}/TransferControlRequestPdu.cpp (100%) rename src/dis6/{ => entity_management}/TransferControlRequestPdu.h (100%) rename src/dis6/{ => logistics}/ServiceRequestPdu.cpp (100%) rename src/dis6/{ => logistics}/ServiceRequestPdu.h (100%) delete mode 100644 src/dis6/symbolic_names.h rename src/dis6/{ => synthetic_environment}/ArealObjectStatePdu.cpp (100%) rename src/dis6/{ => synthetic_environment}/ArealObjectStatePdu.h (100%) rename src/dis6/{ => synthetic_environment}/EnvironmentalProcessPdu.cpp (100%) rename src/dis6/{ => synthetic_environment}/EnvironmentalProcessPdu.h (100%) rename src/dis6/{ => synthetic_environment}/GriddedDataPdu.cpp (100%) rename src/dis6/{ => synthetic_environment}/GriddedDataPdu.h (100%) rename src/dis6/{ => synthetic_environment}/LinearObjectStatePdu.cpp (100%) rename src/dis6/{ => synthetic_environment}/LinearObjectStatePdu.h (100%) rename src/dis6/{ => synthetic_environment}/PointObjectStatePdu.cpp (100%) rename src/dis6/{ => synthetic_environment}/PointObjectStatePdu.h (100%) diff --git a/src/dis6/CMakeLists.txt b/src/dis6/CMakeLists.txt index 37dc0a1b..74628b58 100644 --- a/src/dis6/CMakeLists.txt +++ b/src/dis6/CMakeLists.txt @@ -20,37 +20,25 @@ set(dis6_hdr AcousticEmitterSystemData.h AggregateID.h AggregateMarking.h - AggregateStatePdu.h AggregateType.h AngularVelocityVector.h AntennaLocation.h ApaData.h - ArealObjectStatePdu.h ArticulationParameter.h BeamAntennaPattern.h BeamData.h BurstDescriptor.h - CollisionElasticPdu.h - CollisionPdu.h EightByteChunk.h - EntityStateUpdatePdu.h Environment.h - EnvironmentalProcessPdu.h EventID.h - FastEntityStatePdu.h FixedDatum.h FourByteChunk.h GridAxisRecord.h GridAxisRecordRepresentation0.h GridAxisRecordRepresentation1.h GridAxisRecordRepresentation2.h - GriddedDataPdu.h - IsGroupOfPdu.h - IsPartOfPdu.h LayerHeader.h - LinearObjectStatePdu.h LinearSegmentParameter.h - LogisticsPdu.h Marking.h ModulationType.h NamedLocation.h @@ -58,18 +46,14 @@ set(dis6_hdr Orientation.h PduContainer.h Point.h - PointObjectStatePdu.h PropulsionSystemData.h RecordSet.h Relationship.h - ServiceRequestPdu.h ShaftRPMs.h SixByteChunk.h SphericalHarmonicAntennaPattern.h SupplyQuantity.h - symbolic_names.h SystemID.h - TransferControlRequestPdu.h TwoByteChunk.h VariableDatum.h VectoringNozzleSystemData.h @@ -84,37 +68,25 @@ set(dis6_src AcousticEmitterSystemData.cpp AggregateID.cpp AggregateMarking.cpp - AggregateStatePdu.cpp AggregateType.cpp AngularVelocityVector.cpp AntennaLocation.cpp ApaData.cpp - ArealObjectStatePdu.cpp ArticulationParameter.cpp BeamAntennaPattern.cpp BeamData.cpp BurstDescriptor.cpp - CollisionElasticPdu.cpp - CollisionPdu.cpp EightByteChunk.cpp - EntityStateUpdatePdu.cpp Environment.cpp - EnvironmentalProcessPdu.cpp EventID.cpp - FastEntityStatePdu.cpp FixedDatum.cpp FourByteChunk.cpp GridAxisRecord.cpp GridAxisRecordRepresentation0.cpp GridAxisRecordRepresentation1.cpp GridAxisRecordRepresentation2.cpp - GriddedDataPdu.cpp - IsGroupOfPdu.cpp - IsPartOfPdu.cpp LayerHeader.cpp - LinearObjectStatePdu.cpp LinearSegmentParameter.cpp - LogisticsPdu.cpp Marking.cpp ModulationType.cpp NamedLocation.cpp @@ -122,17 +94,14 @@ set(dis6_src Orientation.cpp PduContainer.cpp Point.cpp - PointObjectStatePdu.cpp PropulsionSystemData.cpp RecordSet.cpp Relationship.cpp - ServiceRequestPdu.cpp ShaftRPMs.cpp SixByteChunk.cpp SphericalHarmonicAntennaPattern.cpp SupplyQuantity.cpp SystemID.cpp - TransferControlRequestPdu.cpp TwoByteChunk.cpp VariableDatum.cpp VectoringNozzleSystemData.cpp diff --git a/src/dis6/FastEntityStatePdu.cpp b/src/dis6/FastEntityStatePdu.cpp deleted file mode 100644 index db955d6d..00000000 --- a/src/dis6/FastEntityStatePdu.cpp +++ /dev/null @@ -1,549 +0,0 @@ -#include - -#include "dis6/FastEntityStatePdu.h" - -using namespace DIS; - -FastEntityStatePdu::FastEntityStatePdu() - : EntityInformationFamilyPdu(), - _site(0), - _application(0), - _entity(0), - _forceId(0), - _numberOfArticulationParameters(0), - _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0), - _altEntityKind(0), - _altDomain(0), - _altCountry(0), - _altCategory(0), - _altSubcategory(0), - _altSpecific(0), - _altExtra(0), - _xVelocity(0.0), - _yVelocity(0.0), - _zVelocity(0.0), - _xLocation(0.0), - _yLocation(0.0), - _zLocation(0.0), - _psi(0.0), - _theta(0.0), - _phi(0.0), - _entityAppearance(0), - _deadReckoningAlgorithm(0), - _xAcceleration(0.0), - _yAcceleration(0.0), - _zAcceleration(0.0), - _xAngularVelocity(0.0), - _yAngularVelocity(0.0), - _zAngularVelocity(0.0), - _capabilities(0) { - setPduType(1); - // Initialize fixed length array - for (int lengthotherParameters = 0; lengthotherParameters < 15; - lengthotherParameters++) { - _otherParameters[lengthotherParameters] = 0; - } - - // Initialize fixed length array - for (int lengthmarking = 0; lengthmarking < 12; lengthmarking++) { - _marking[lengthmarking] = 0; - } -} - -FastEntityStatePdu::~FastEntityStatePdu() { _articulationParameters.clear(); } - -uint16_t FastEntityStatePdu::getSite() const { return _site; } - -void FastEntityStatePdu::setSite(uint16_t pX) { _site = pX; } - -uint16_t FastEntityStatePdu::getApplication() const { - return _application; -} - -void FastEntityStatePdu::setApplication(uint16_t pX) { - _application = pX; -} - -uint16_t FastEntityStatePdu::getEntity() const { return _entity; } - -void FastEntityStatePdu::setEntity(uint16_t pX) { _entity = pX; } - -uint8_t FastEntityStatePdu::getForceId() const { return _forceId; } - -void FastEntityStatePdu::setForceId(uint8_t pX) { _forceId = pX; } - -uint8_t FastEntityStatePdu::getNumberOfArticulationParameters() const { - return _articulationParameters.size(); -} - -uint8_t FastEntityStatePdu::getEntityKind() const { return _entityKind; } - -void FastEntityStatePdu::setEntityKind(uint8_t pX) { _entityKind = pX; } - -uint8_t FastEntityStatePdu::getDomain() const { return _domain; } - -void FastEntityStatePdu::setDomain(uint8_t pX) { _domain = pX; } - -uint16_t FastEntityStatePdu::getCountry() const { return _country; } - -void FastEntityStatePdu::setCountry(uint16_t pX) { _country = pX; } - -uint8_t FastEntityStatePdu::getCategory() const { return _category; } - -void FastEntityStatePdu::setCategory(uint8_t pX) { _category = pX; } - -uint8_t FastEntityStatePdu::getSubcategory() const { - return _subcategory; -} - -void FastEntityStatePdu::setSubcategory(uint8_t pX) { _subcategory = pX; } - -uint8_t FastEntityStatePdu::getSpecific() const { return _specific; } - -void FastEntityStatePdu::setSpecific(uint8_t pX) { _specific = pX; } - -uint8_t FastEntityStatePdu::getExtra() const { return _extra; } - -void FastEntityStatePdu::setExtra(uint8_t pX) { _extra = pX; } - -uint8_t FastEntityStatePdu::getAltEntityKind() const { - return _altEntityKind; -} - -void FastEntityStatePdu::setAltEntityKind(uint8_t pX) { - _altEntityKind = pX; -} - -uint8_t FastEntityStatePdu::getAltDomain() const { return _altDomain; } - -void FastEntityStatePdu::setAltDomain(uint8_t pX) { _altDomain = pX; } - -uint16_t FastEntityStatePdu::getAltCountry() const { return _altCountry; } - -void FastEntityStatePdu::setAltCountry(uint16_t pX) { _altCountry = pX; } - -uint8_t FastEntityStatePdu::getAltCategory() const { - return _altCategory; -} - -void FastEntityStatePdu::setAltCategory(uint8_t pX) { _altCategory = pX; } - -uint8_t FastEntityStatePdu::getAltSubcategory() const { - return _altSubcategory; -} - -void FastEntityStatePdu::setAltSubcategory(uint8_t pX) { - _altSubcategory = pX; -} - -uint8_t FastEntityStatePdu::getAltSpecific() const { - return _altSpecific; -} - -void FastEntityStatePdu::setAltSpecific(uint8_t pX) { _altSpecific = pX; } - -uint8_t FastEntityStatePdu::getAltExtra() const { return _altExtra; } - -void FastEntityStatePdu::setAltExtra(uint8_t pX) { _altExtra = pX; } - -float FastEntityStatePdu::getXVelocity() const { return _xVelocity; } - -void FastEntityStatePdu::setXVelocity(float pX) { _xVelocity = pX; } - -float FastEntityStatePdu::getYVelocity() const { return _yVelocity; } - -void FastEntityStatePdu::setYVelocity(float pX) { _yVelocity = pX; } - -float FastEntityStatePdu::getZVelocity() const { return _zVelocity; } - -void FastEntityStatePdu::setZVelocity(float pX) { _zVelocity = pX; } - -double FastEntityStatePdu::getXLocation() const { return _xLocation; } - -void FastEntityStatePdu::setXLocation(double pX) { _xLocation = pX; } - -double FastEntityStatePdu::getYLocation() const { return _yLocation; } - -void FastEntityStatePdu::setYLocation(double pX) { _yLocation = pX; } - -double FastEntityStatePdu::getZLocation() const { return _zLocation; } - -void FastEntityStatePdu::setZLocation(double pX) { _zLocation = pX; } - -float FastEntityStatePdu::getPsi() const { return _psi; } - -void FastEntityStatePdu::setPsi(float pX) { _psi = pX; } - -float FastEntityStatePdu::getTheta() const { return _theta; } - -void FastEntityStatePdu::setTheta(float pX) { _theta = pX; } - -float FastEntityStatePdu::getPhi() const { return _phi; } - -void FastEntityStatePdu::setPhi(float pX) { _phi = pX; } - -int FastEntityStatePdu::getEntityAppearance() const { - return _entityAppearance; -} - -void FastEntityStatePdu::setEntityAppearance(int pX) { _entityAppearance = pX; } - -uint8_t FastEntityStatePdu::getDeadReckoningAlgorithm() const { - return _deadReckoningAlgorithm; -} - -void FastEntityStatePdu::setDeadReckoningAlgorithm(uint8_t pX) { - _deadReckoningAlgorithm = pX; -} - -char* FastEntityStatePdu::getOtherParameters() { return _otherParameters; } - -const char* FastEntityStatePdu::getOtherParameters() const { - return _otherParameters; -} - -void FastEntityStatePdu::setOtherParameters(const char* x) { - for (int i = 0; i < 15; i++) { - _otherParameters[i] = x[i]; - } -} - -float FastEntityStatePdu::getXAcceleration() const { return _xAcceleration; } - -void FastEntityStatePdu::setXAcceleration(float pX) { _xAcceleration = pX; } - -float FastEntityStatePdu::getYAcceleration() const { return _yAcceleration; } - -void FastEntityStatePdu::setYAcceleration(float pX) { _yAcceleration = pX; } - -float FastEntityStatePdu::getZAcceleration() const { return _zAcceleration; } - -void FastEntityStatePdu::setZAcceleration(float pX) { _zAcceleration = pX; } - -float FastEntityStatePdu::getXAngularVelocity() const { - return _xAngularVelocity; -} - -void FastEntityStatePdu::setXAngularVelocity(float pX) { - _xAngularVelocity = pX; -} - -float FastEntityStatePdu::getYAngularVelocity() const { - return _yAngularVelocity; -} - -void FastEntityStatePdu::setYAngularVelocity(float pX) { - _yAngularVelocity = pX; -} - -float FastEntityStatePdu::getZAngularVelocity() const { - return _zAngularVelocity; -} - -void FastEntityStatePdu::setZAngularVelocity(float pX) { - _zAngularVelocity = pX; -} - -char* FastEntityStatePdu::getMarking() { return _marking; } - -const char* FastEntityStatePdu::getMarking() const { return _marking; } - -void FastEntityStatePdu::setMarking(const char* x) { - for (int i = 0; i < 12; i++) { - _marking[i] = x[i]; - } -} - -// An alternate method to set the value if this could be a string. This is not -// strictly comnpliant with the DIS standard. -void FastEntityStatePdu::setByStringMarking(const char* x) { - std::strncpy(_marking, x, 12 - 1); - _marking[12 - 1] = '\0'; -} - -int FastEntityStatePdu::getCapabilities() const { return _capabilities; } - -void FastEntityStatePdu::setCapabilities(int pX) { _capabilities = pX; } - -std::vector& -FastEntityStatePdu::getArticulationParameters() { - return _articulationParameters; -} - -const std::vector& -FastEntityStatePdu::getArticulationParameters() const { - return _articulationParameters; -} - -void FastEntityStatePdu::setArticulationParameters( - const std::vector& pX) { - _articulationParameters = pX; -} - -void FastEntityStatePdu::marshal(DataStream& dataStream) const { - EntityInformationFamilyPdu::marshal( - dataStream); // Marshal information in superclass first - dataStream << _site; - dataStream << _application; - dataStream << _entity; - dataStream << _forceId; - dataStream << (char)_articulationParameters.size(); - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; - dataStream << _altEntityKind; - dataStream << _altDomain; - dataStream << _altCountry; - dataStream << _altCategory; - dataStream << _altSubcategory; - dataStream << _altSpecific; - dataStream << _altExtra; - dataStream << _xVelocity; - dataStream << _yVelocity; - dataStream << _zVelocity; - dataStream << _xLocation; - dataStream << _yLocation; - dataStream << _zLocation; - dataStream << _psi; - dataStream << _theta; - dataStream << _phi; - dataStream << _entityAppearance; - dataStream << _deadReckoningAlgorithm; - - for (size_t idx = 0; idx < 15; idx++) { - dataStream << _otherParameters[idx]; - } - - dataStream << _xAcceleration; - dataStream << _yAcceleration; - dataStream << _zAcceleration; - dataStream << _xAngularVelocity; - dataStream << _yAngularVelocity; - dataStream << _zAngularVelocity; - - for (size_t idx = 0; idx < 12; idx++) { - dataStream << _marking[idx]; - } - - dataStream << _capabilities; - - for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { - ArticulationParameter x = _articulationParameters[idx]; - x.marshal(dataStream); - } -} - -void FastEntityStatePdu::unmarshal(DataStream& dataStream) { - EntityInformationFamilyPdu::unmarshal( - dataStream); // unmarshal information in superclass first - dataStream >> _site; - dataStream >> _application; - dataStream >> _entity; - dataStream >> _forceId; - dataStream >> _numberOfArticulationParameters; - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; - dataStream >> _altEntityKind; - dataStream >> _altDomain; - dataStream >> _altCountry; - dataStream >> _altCategory; - dataStream >> _altSubcategory; - dataStream >> _altSpecific; - dataStream >> _altExtra; - dataStream >> _xVelocity; - dataStream >> _yVelocity; - dataStream >> _zVelocity; - dataStream >> _xLocation; - dataStream >> _yLocation; - dataStream >> _zLocation; - dataStream >> _psi; - dataStream >> _theta; - dataStream >> _phi; - dataStream >> _entityAppearance; - dataStream >> _deadReckoningAlgorithm; - - for (size_t idx = 0; idx < 15; idx++) { - dataStream >> _otherParameters[idx]; - } - - dataStream >> _xAcceleration; - dataStream >> _yAcceleration; - dataStream >> _zAcceleration; - dataStream >> _xAngularVelocity; - dataStream >> _yAngularVelocity; - dataStream >> _zAngularVelocity; - - for (size_t idx = 0; idx < 12; idx++) { - dataStream >> _marking[idx]; - } - - dataStream >> _capabilities; - - _articulationParameters.clear(); - for (uint8_t idx = 0; idx < _numberOfArticulationParameters; idx++) { - ArticulationParameter x; - x.unmarshal(dataStream); - _articulationParameters.push_back(x); - } -} - -bool FastEntityStatePdu::operator==(const FastEntityStatePdu& rhs) const { - bool ivarsEqual = true; - - ivarsEqual = EntityInformationFamilyPdu::operator==(rhs); - - if (!(_site == rhs._site)) ivarsEqual = false; - if (!(_application == rhs._application)) ivarsEqual = false; - if (!(_entity == rhs._entity)) ivarsEqual = false; - if (!(_forceId == rhs._forceId)) ivarsEqual = false; - if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; - if (!(_domain == rhs._domain)) ivarsEqual = false; - if (!(_country == rhs._country)) ivarsEqual = false; - if (!(_category == rhs._category)) ivarsEqual = false; - if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; - if (!(_specific == rhs._specific)) ivarsEqual = false; - if (!(_extra == rhs._extra)) ivarsEqual = false; - if (!(_altEntityKind == rhs._altEntityKind)) ivarsEqual = false; - if (!(_altDomain == rhs._altDomain)) ivarsEqual = false; - if (!(_altCountry == rhs._altCountry)) ivarsEqual = false; - if (!(_altCategory == rhs._altCategory)) ivarsEqual = false; - if (!(_altSubcategory == rhs._altSubcategory)) ivarsEqual = false; - if (!(_altSpecific == rhs._altSpecific)) ivarsEqual = false; - if (!(_altExtra == rhs._altExtra)) ivarsEqual = false; - if (!(_xVelocity == rhs._xVelocity)) ivarsEqual = false; - if (!(_yVelocity == rhs._yVelocity)) ivarsEqual = false; - if (!(_zVelocity == rhs._zVelocity)) ivarsEqual = false; - if (!(_xLocation == rhs._xLocation)) ivarsEqual = false; - if (!(_yLocation == rhs._yLocation)) ivarsEqual = false; - if (!(_zLocation == rhs._zLocation)) ivarsEqual = false; - if (!(_psi == rhs._psi)) ivarsEqual = false; - if (!(_theta == rhs._theta)) ivarsEqual = false; - if (!(_phi == rhs._phi)) ivarsEqual = false; - if (!(_entityAppearance == rhs._entityAppearance)) ivarsEqual = false; - if (!(_deadReckoningAlgorithm == rhs._deadReckoningAlgorithm)) - ivarsEqual = false; - - for (uint8_t idx = 0; idx < 15; idx++) { - if (!(_otherParameters[idx] == rhs._otherParameters[idx])) - ivarsEqual = false; - } - - if (!(_xAcceleration == rhs._xAcceleration)) ivarsEqual = false; - if (!(_yAcceleration == rhs._yAcceleration)) ivarsEqual = false; - if (!(_zAcceleration == rhs._zAcceleration)) ivarsEqual = false; - if (!(_xAngularVelocity == rhs._xAngularVelocity)) ivarsEqual = false; - if (!(_yAngularVelocity == rhs._yAngularVelocity)) ivarsEqual = false; - if (!(_zAngularVelocity == rhs._zAngularVelocity)) ivarsEqual = false; - - for (uint8_t idx = 0; idx < 12; idx++) { - if (!(_marking[idx] == rhs._marking[idx])) ivarsEqual = false; - } - - if (!(_capabilities == rhs._capabilities)) ivarsEqual = false; - - for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { - if (!(_articulationParameters[idx] == rhs._articulationParameters[idx])) - ivarsEqual = false; - } - - return ivarsEqual; -} - -int FastEntityStatePdu::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = EntityInformationFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _entity - marshalSize = marshalSize + 1; // _forceId - marshalSize = marshalSize + 1; // _numberOfArticulationParameters - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - marshalSize = marshalSize + 1; // _altEntityKind - marshalSize = marshalSize + 1; // _altDomain - marshalSize = marshalSize + 2; // _altCountry - marshalSize = marshalSize + 1; // _altCategory - marshalSize = marshalSize + 1; // _altSubcategory - marshalSize = marshalSize + 1; // _altSpecific - marshalSize = marshalSize + 1; // _altExtra - marshalSize = marshalSize + 4; // _xVelocity - marshalSize = marshalSize + 4; // _yVelocity - marshalSize = marshalSize + 4; // _zVelocity - marshalSize = marshalSize + 8; // _xLocation - marshalSize = marshalSize + 8; // _yLocation - marshalSize = marshalSize + 8; // _zLocation - marshalSize = marshalSize + 4; // _psi - marshalSize = marshalSize + 4; // _theta - marshalSize = marshalSize + 4; // _phi - marshalSize = marshalSize + 4; // _entityAppearance - marshalSize = marshalSize + 1; // _deadReckoningAlgorithm - marshalSize = marshalSize + 15 * 1; // _otherParameters - marshalSize = marshalSize + 4; // _xAcceleration - marshalSize = marshalSize + 4; // _yAcceleration - marshalSize = marshalSize + 4; // _zAcceleration - marshalSize = marshalSize + 4; // _xAngularVelocity - marshalSize = marshalSize + 4; // _yAngularVelocity - marshalSize = marshalSize + 4; // _zAngularVelocity - marshalSize = marshalSize + 12 * 1; // _marking - marshalSize = marshalSize + 4; // _capabilities - - for (uint64_t idx = 0; idx < _articulationParameters.size(); - idx++) { - ArticulationParameter listElement = _articulationParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; -} - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/FastEntityStatePdu.h b/src/dis6/FastEntityStatePdu.h deleted file mode 100644 index f8e68556..00000000 --- a/src/dis6/FastEntityStatePdu.h +++ /dev/null @@ -1,304 +0,0 @@ -#pragma once - -#include - -#include "dis6/ArticulationParameter.h" -#include "dis6/EntityInformationFamilyPdu.h" -#include "dis6/opendis6_export.h" -#include "dis6/utils/DataStream.h" - -namespace DIS { -// Section 5.3.3.1. Represents the postion and state of one entity in the world. -// This is identical in function to entity state pdu, but generates less garbage -// to collect in the Java world. COMPLETE - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All -// rights reserved. -// -// @author DMcG, jkg - -class OPENDIS6_EXPORT FastEntityStatePdu : public EntityInformationFamilyPdu { - protected: - /** The site ID */ - uint16_t _site; - - /** The application ID */ - uint16_t _application; - - /** the entity ID */ - uint16_t _entity; - - /** what force this entity is affiliated with, eg red, blue, neutral, etc */ - uint8_t _forceId; - - /** How many articulation parameters are in the variable length list */ - uint8_t _numberOfArticulationParameters; - - /** Kind of entity */ - uint8_t _entityKind; - - /** Domain of entity (air, surface, subsurface, space, etc) */ - uint8_t _domain; - - /** country to which the design of the entity is attributed */ - uint16_t _country; - - /** category of entity */ - uint8_t _category; - - /** subcategory of entity */ - uint8_t _subcategory; - - /** specific info based on subcategory field */ - uint8_t _specific; - - uint8_t _extra; - - /** Kind of entity */ - uint8_t _altEntityKind; - - /** Domain of entity (air, surface, subsurface, space, etc) */ - uint8_t _altDomain; - - /** country to which the design of the entity is attributed */ - uint16_t _altCountry; - - /** category of entity */ - uint8_t _altCategory; - - /** subcategory of entity */ - uint8_t _altSubcategory; - - /** specific info based on subcategory field */ - uint8_t _altSpecific; - - uint8_t _altExtra; - - /** X velo */ - float _xVelocity; - - /** y Value */ - float _yVelocity; - - /** Z value */ - float _zVelocity; - - /** X value */ - double _xLocation; - - /** y Value */ - double _yLocation; - - /** Z value */ - double _zLocation; - - float _psi; - - float _theta; - - float _phi; - - /** a series of bit flags that are used to help draw the entity, such as - * smoking, on fire, etc. */ - int _entityAppearance; - - /** enumeration of what dead reckoning algorighm to use */ - uint8_t _deadReckoningAlgorithm; - - /** other parameters to use in the dead reckoning algorithm */ - char _otherParameters[15]; - - /** X value */ - float _xAcceleration; - - /** y Value */ - float _yAcceleration; - - /** Z value */ - float _zAcceleration; - - /** X value */ - float _xAngularVelocity; - - /** y Value */ - float _yAngularVelocity; - - /** Z value */ - float _zAngularVelocity; - - /** characters that can be used for debugging, or to draw unique strings on - * the side of entities in the world */ - char _marking[12]; - - /** a series of bit flags */ - int _capabilities; - - /** variable length list of articulation parameters */ - std::vector _articulationParameters; - - public: - FastEntityStatePdu(); - virtual ~FastEntityStatePdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - uint16_t getSite() const; - void setSite(uint16_t pX); - - uint16_t getApplication() const; - void setApplication(uint16_t pX); - - uint16_t getEntity() const; - void setEntity(uint16_t pX); - - uint8_t getForceId() const; - void setForceId(uint8_t pX); - - uint8_t getNumberOfArticulationParameters() const; - - uint8_t getEntityKind() const; - void setEntityKind(uint8_t pX); - - uint8_t getDomain() const; - void setDomain(uint8_t pX); - - uint16_t getCountry() const; - void setCountry(uint16_t pX); - - uint8_t getCategory() const; - void setCategory(uint8_t pX); - - uint8_t getSubcategory() const; - void setSubcategory(uint8_t pX); - - uint8_t getSpecific() const; - void setSpecific(uint8_t pX); - - uint8_t getExtra() const; - void setExtra(uint8_t pX); - - uint8_t getAltEntityKind() const; - void setAltEntityKind(uint8_t pX); - - uint8_t getAltDomain() const; - void setAltDomain(uint8_t pX); - - uint16_t getAltCountry() const; - void setAltCountry(uint16_t pX); - - uint8_t getAltCategory() const; - void setAltCategory(uint8_t pX); - - uint8_t getAltSubcategory() const; - void setAltSubcategory(uint8_t pX); - - uint8_t getAltSpecific() const; - void setAltSpecific(uint8_t pX); - - uint8_t getAltExtra() const; - void setAltExtra(uint8_t pX); - - float getXVelocity() const; - void setXVelocity(float pX); - - float getYVelocity() const; - void setYVelocity(float pX); - - float getZVelocity() const; - void setZVelocity(float pX); - - double getXLocation() const; - void setXLocation(double pX); - - double getYLocation() const; - void setYLocation(double pX); - - double getZLocation() const; - void setZLocation(double pX); - - float getPsi() const; - void setPsi(float pX); - - float getTheta() const; - void setTheta(float pX); - - float getPhi() const; - void setPhi(float pX); - - int getEntityAppearance() const; - void setEntityAppearance(int pX); - - uint8_t getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(uint8_t pX); - - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters(const char* pX); - - float getXAcceleration() const; - void setXAcceleration(float pX); - - float getYAcceleration() const; - void setYAcceleration(float pX); - - float getZAcceleration() const; - void setZAcceleration(float pX); - - float getXAngularVelocity() const; - void setXAngularVelocity(float pX); - - float getYAngularVelocity() const; - void setYAngularVelocity(float pX); - - float getZAngularVelocity() const; - void setZAngularVelocity(float pX); - - char* getMarking(); - const char* getMarking() const; - void setMarking(const char* pX); - void setByStringMarking(const char* pX); - - int getCapabilities() const; - void setCapabilities(int pX); - - std::vector& getArticulationParameters(); - const std::vector& getArticulationParameters() const; - void setArticulationParameters(const std::vector& pX); - - virtual int getMarshalledSize() const; - - bool operator==(const FastEntityStatePdu& rhs) const; -}; -} // namespace DIS - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/LogisticsPdu.cpp b/src/dis6/LogisticsPdu.cpp deleted file mode 100644 index ce727f85..00000000 --- a/src/dis6/LogisticsPdu.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "dis6/LogisticsPdu.h" - -using namespace DIS; - -LogisticsPdu::LogisticsPdu() - : Pdu() - -{ - setProtocolFamily(3); -} - -LogisticsPdu::~LogisticsPdu() {} - -void LogisticsPdu::marshal(DataStream& dataStream) const { - Pdu::marshal(dataStream); // Marshal information in superclass first -} - -void LogisticsPdu::unmarshal(DataStream& dataStream) { - Pdu::unmarshal(dataStream); // unmarshal information in superclass first -} - -bool LogisticsPdu::operator==(const LogisticsPdu& rhs) const { - bool ivarsEqual = true; - - ivarsEqual = Pdu::operator==(rhs); - - return ivarsEqual; -} - -int LogisticsPdu::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; -} diff --git a/src/dis6/LogisticsPdu.h b/src/dis6/LogisticsPdu.h deleted file mode 100644 index 18061a08..00000000 --- a/src/dis6/LogisticsPdu.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" -#include "dis6/utils/DataStream.h" - -namespace DIS { -// Section 5.3.5. Abstract superclass for logistics PDUs. COMPLETE - -// Copyright (c) 2007, MOVES Institute, Naval Postgraduate School. All rights -// reserved. -// -// This work is licensed under the BSD open source license, available at -// https://www.movesinstitute.org/licenses/bsd.html -// -// @author DMcG, jkg - -class OPENDIS6_EXPORT LogisticsPdu : public Pdu { - protected: - public: - LogisticsPdu(); - virtual ~LogisticsPdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - virtual int getMarshalledSize() const; - - bool operator==(const LogisticsPdu& rhs) const; -}; -} // namespace DIS diff --git a/src/dis6/CollisionElasticPdu.cpp b/src/dis6/entity_information/CollisionElasticPdu.cpp similarity index 100% rename from src/dis6/CollisionElasticPdu.cpp rename to src/dis6/entity_information/CollisionElasticPdu.cpp diff --git a/src/dis6/CollisionElasticPdu.h b/src/dis6/entity_information/CollisionElasticPdu.h similarity index 100% rename from src/dis6/CollisionElasticPdu.h rename to src/dis6/entity_information/CollisionElasticPdu.h diff --git a/src/dis6/CollisionPdu.cpp b/src/dis6/entity_information/CollisionPdu.cpp similarity index 100% rename from src/dis6/CollisionPdu.cpp rename to src/dis6/entity_information/CollisionPdu.cpp diff --git a/src/dis6/CollisionPdu.h b/src/dis6/entity_information/CollisionPdu.h similarity index 100% rename from src/dis6/CollisionPdu.h rename to src/dis6/entity_information/CollisionPdu.h diff --git a/src/dis6/EntityStateUpdatePdu.cpp b/src/dis6/entity_information/EntityStateUpdatePdu.cpp similarity index 100% rename from src/dis6/EntityStateUpdatePdu.cpp rename to src/dis6/entity_information/EntityStateUpdatePdu.cpp diff --git a/src/dis6/EntityStateUpdatePdu.h b/src/dis6/entity_information/EntityStateUpdatePdu.h similarity index 100% rename from src/dis6/EntityStateUpdatePdu.h rename to src/dis6/entity_information/EntityStateUpdatePdu.h diff --git a/src/dis6/AggregateStatePdu.cpp b/src/dis6/entity_management/AggregateStatePdu.cpp similarity index 100% rename from src/dis6/AggregateStatePdu.cpp rename to src/dis6/entity_management/AggregateStatePdu.cpp diff --git a/src/dis6/AggregateStatePdu.h b/src/dis6/entity_management/AggregateStatePdu.h similarity index 100% rename from src/dis6/AggregateStatePdu.h rename to src/dis6/entity_management/AggregateStatePdu.h diff --git a/src/dis6/IsGroupOfPdu.cpp b/src/dis6/entity_management/IsGroupOfPdu.cpp similarity index 100% rename from src/dis6/IsGroupOfPdu.cpp rename to src/dis6/entity_management/IsGroupOfPdu.cpp diff --git a/src/dis6/IsGroupOfPdu.h b/src/dis6/entity_management/IsGroupOfPdu.h similarity index 100% rename from src/dis6/IsGroupOfPdu.h rename to src/dis6/entity_management/IsGroupOfPdu.h diff --git a/src/dis6/IsPartOfPdu.cpp b/src/dis6/entity_management/IsPartOfPdu.cpp similarity index 100% rename from src/dis6/IsPartOfPdu.cpp rename to src/dis6/entity_management/IsPartOfPdu.cpp diff --git a/src/dis6/IsPartOfPdu.h b/src/dis6/entity_management/IsPartOfPdu.h similarity index 100% rename from src/dis6/IsPartOfPdu.h rename to src/dis6/entity_management/IsPartOfPdu.h diff --git a/src/dis6/TransferControlRequestPdu.cpp b/src/dis6/entity_management/TransferControlRequestPdu.cpp similarity index 100% rename from src/dis6/TransferControlRequestPdu.cpp rename to src/dis6/entity_management/TransferControlRequestPdu.cpp diff --git a/src/dis6/TransferControlRequestPdu.h b/src/dis6/entity_management/TransferControlRequestPdu.h similarity index 100% rename from src/dis6/TransferControlRequestPdu.h rename to src/dis6/entity_management/TransferControlRequestPdu.h diff --git a/src/dis6/ServiceRequestPdu.cpp b/src/dis6/logistics/ServiceRequestPdu.cpp similarity index 100% rename from src/dis6/ServiceRequestPdu.cpp rename to src/dis6/logistics/ServiceRequestPdu.cpp diff --git a/src/dis6/ServiceRequestPdu.h b/src/dis6/logistics/ServiceRequestPdu.h similarity index 100% rename from src/dis6/ServiceRequestPdu.h rename to src/dis6/logistics/ServiceRequestPdu.h diff --git a/src/dis6/symbolic_names.h b/src/dis6/symbolic_names.h deleted file mode 100644 index 0a17b2de..00000000 --- a/src/dis6/symbolic_names.h +++ /dev/null @@ -1,96 +0,0 @@ -#pragma once - -#include "dis6/EntityID.h" - -/** - * Symbolic names as defined in 5.1.4 - */ -namespace DIS { -const uint32_t AGG_HRT_BEAT_TIMER = 30U; // s -const uint32_t AGG_RESPONSE_DFLT = 10U; // s -const uint16_t ALL_AGGS = 0xFFFFU; -const uint16_t ALL_APPLIC = 0xFFFFU; -const uint16_t ALL_ENTITIES = 0xFFFFU; -const uint16_t ALL_OBJECTS = 0xFFFFU; -const uint16_t ALL_SITES = 0xFFFFU; -const uint32_t APPEAR_HRT_BEAT_TIMER = 60U; // se -const uint32_t COLLISION_ELASTIC_TO = 5U; // s -const uint32_t COLLISION_THRSH_DFLT = 1U; // m/s - -const uint32_t DRA_ORIENT_THRSH_DFLT = 3U; // degrees -const uint32_t DRA_POS_THRSH_DFLT = 1U; // m -const uint32_t EE_AZ_THRSH_DFLT = 1U; // degrees -const uint32_t EE_EL_THRSH_DFLT = 1U; // degrees - -const uint32_t EP_DIMENSION_THRSH_DFLT = 1U; // m -const uint16_t EP_NO_SEQUENCE = 0xFFFFU; -const uint32_t EP_POS_THRSH_DFLT = 1U; // m shift -const uint32_t EP_STATE_THRSH_DFLT = 10U; //% -const uint32_t GD_HRT_BEAT_TIMER = 15U; // min -const uint32_t HRT_BEAT_MOVE_TIMER = 2U; // s -const float HRT_BEAT_MPLIER = 2.4f; -const uint32_t HRT_BEAT_TIMER = 5U; // s -const uint32_t IFF_ATC_NAVAIDS_DFLT = 10U; // s -const uint32_t IFF_ATC_NAVAIDS_CLAT = 2U; // s -const uint32_t LE_HRT_BEAT_TIMER = 30; // s -// MINEFIELD_CHANGE_DFLT between 0 and MINEFIELD_DATA_DFLT -const uint32_t MINEFIELD_DATA_DFLT = 5U; // s -const uint32_t MINEFIELD_DATA_TIMEOUT_DLFT = 5U; // s -const uint32_t MINEFIELD_DFLT = 5U; // s -const uint32_t MINEFIELD_RESPONSE_DFLT = 1U; // s - -const uint16_t NO_AGG = 0U; -const uint16_t NO_APPLIC = 0U; -const uint16_t NO_ENTITY = 0U; - -const uint32_t NO_FIRE_MISSION = 0U; - -const uint16_t NO_OBJECT = 0U; -const uint16_t NO_SITE = 0U; - -const uint32_t REPAR_REC_T1_DFLT = 5U; // s -const uint32_t REPAR_SUP_T1_DFLT = 12U; // s -const uint32_t REPAR_SUP_T2_DFLT = 12U; // s -const uint32_t RESUP_REC_T1_DFLT = 5U; // s -const uint32_t RESUP_REC_T2_DFLT = 55U; // s -const uint32_t RESUP_SUP_T1_DFLT = 1U; // min -const uint16_t RQST_ASSIGN_ID = 0xFFFEU; -const uint32_t SEES_NDA_THRSH_DFLT = - 2U; // degrees in the axis of deflection -const uint32_t SEES_PS_THRSH_DFLT = - 10U; //% of the maximum value of the Power Setting -const uint32_t SEES_RPM_DELTA_THRSH_DFLT = - 5U; //% of the maximum engine speed in RPM -const uint32_t SEES_STATE_UPDATE_DFLT = 3U; // min -const uint32_t SM_REL_RETRY_CNT_DFLT = 3U; -const uint32_t SM_REL_RETRY_DELAY_DFLT = 2U; // s - -const uint32_t TARGETS_IN_TJ_FIELD_DFLT = 10U; -const uint32_t TI_TIMER1_DFLT = 2U; // s -const uint32_t TI_TIMER2_DFLT = 12U; // s -const uint32_t TR_TIMER1_DFLT = 5U; // s -const uint32_t TR_TIMER2_DFLT = 60U; // s -const uint32_t TRANS_ORIENT_THRSH_DFLT = 180U; // degrees -const uint32_t TRANS_POS_THRSH_DFLT = 500U; // m -const uint32_t UA_LOCATION_CHANGE_DELTA = 10U; // m -const uint32_t UA_ORIENTATION_CHANGE_DELTA = 2U; // degrees -const uint32_t UA_SRPM_CHANGE_DELTA = 5U; //% of maximum shaft speed in RPM -const uint32_t UA_SRPM_ROC_CHANGE_DELTA = - 10U; //% of maximum rate of change -const uint32_t UA_STATE_UPDATE_HRT_BEAT_TIMER = 3U; // min - -/** If you want to have the EntityID constants below, you - * need to add the constructor EntityID(uint16_t,uint16_t,unsigned - * int16_t) and recompile open-dis - * - */ -/* -const DIS::EntityID D_SPOT_NO_ENTITY(NO_SITE, NO_APPLIC, NO_ENTITY); -const DIS::EntityID ENTITY_ID_UNKNOWN(NO_SITE, NO_APPLIC, NO_ENTITY); -const DIS::EntityID MUNITION_NOT_TRACKED(NO_SITE, NO_APPLIC, NO_ENTITY); -const DIS::EntityID NO_ENTITY_IMPACTED(NO_SITE, NO_APPLIC, NO_ENTITY); -const DIS::EntityID NO_LOCATION(NO_SITE, NO_APPLIC, NO_ENTITY); -const DIS::EntityID NO_SPECIFIC_ENTITY(NO_SITE, NO_APPLIC, NO_ENTITY); -const DIS::EntityID TARGET_ID_UNKNOWN(NO_SITE, NO_APPLIC, NO_ENTITY); -*/ -} // namespace DIS diff --git a/src/dis6/ArealObjectStatePdu.cpp b/src/dis6/synthetic_environment/ArealObjectStatePdu.cpp similarity index 100% rename from src/dis6/ArealObjectStatePdu.cpp rename to src/dis6/synthetic_environment/ArealObjectStatePdu.cpp diff --git a/src/dis6/ArealObjectStatePdu.h b/src/dis6/synthetic_environment/ArealObjectStatePdu.h similarity index 100% rename from src/dis6/ArealObjectStatePdu.h rename to src/dis6/synthetic_environment/ArealObjectStatePdu.h diff --git a/src/dis6/EnvironmentalProcessPdu.cpp b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.cpp similarity index 100% rename from src/dis6/EnvironmentalProcessPdu.cpp rename to src/dis6/synthetic_environment/EnvironmentalProcessPdu.cpp diff --git a/src/dis6/EnvironmentalProcessPdu.h b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h similarity index 100% rename from src/dis6/EnvironmentalProcessPdu.h rename to src/dis6/synthetic_environment/EnvironmentalProcessPdu.h diff --git a/src/dis6/GriddedDataPdu.cpp b/src/dis6/synthetic_environment/GriddedDataPdu.cpp similarity index 100% rename from src/dis6/GriddedDataPdu.cpp rename to src/dis6/synthetic_environment/GriddedDataPdu.cpp diff --git a/src/dis6/GriddedDataPdu.h b/src/dis6/synthetic_environment/GriddedDataPdu.h similarity index 100% rename from src/dis6/GriddedDataPdu.h rename to src/dis6/synthetic_environment/GriddedDataPdu.h diff --git a/src/dis6/LinearObjectStatePdu.cpp b/src/dis6/synthetic_environment/LinearObjectStatePdu.cpp similarity index 100% rename from src/dis6/LinearObjectStatePdu.cpp rename to src/dis6/synthetic_environment/LinearObjectStatePdu.cpp diff --git a/src/dis6/LinearObjectStatePdu.h b/src/dis6/synthetic_environment/LinearObjectStatePdu.h similarity index 100% rename from src/dis6/LinearObjectStatePdu.h rename to src/dis6/synthetic_environment/LinearObjectStatePdu.h diff --git a/src/dis6/PointObjectStatePdu.cpp b/src/dis6/synthetic_environment/PointObjectStatePdu.cpp similarity index 100% rename from src/dis6/PointObjectStatePdu.cpp rename to src/dis6/synthetic_environment/PointObjectStatePdu.cpp diff --git a/src/dis6/PointObjectStatePdu.h b/src/dis6/synthetic_environment/PointObjectStatePdu.h similarity index 100% rename from src/dis6/PointObjectStatePdu.h rename to src/dis6/synthetic_environment/PointObjectStatePdu.h From 9e6f396cf7095063832fa15e2580a8b820de0a90 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Sat, 13 Jan 2024 18:00:58 +0000 Subject: [PATCH 10/22] Distributed emissions CMake --- src/dis6/distributed_emissions/CMakeLists.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/dis6/distributed_emissions/CMakeLists.txt b/src/dis6/distributed_emissions/CMakeLists.txt index e69de29b..91371173 100644 --- a/src/dis6/distributed_emissions/CMakeLists.txt +++ b/src/dis6/distributed_emissions/CMakeLists.txt @@ -0,0 +1,45 @@ +set(distributed_emissions_hdr + DesignatorPdu.h + DistributedEmissionsFamilyPdu.h + ElectromagneticEmissionBeamData.h + ElectromagneticEmissionsPdu.h + ElectromagneticEmissionSystemData.h + EmitterSystem.h + FundamentalParameterData.h + FundamentalParameterDataIff.h + IffAtcNavAidsLayer1Pdu.h + IffAtcNavAidsLayer2Pdu.h + IffFundamentalData.h + SeesPdu.h + TrackJamTarget.h + UnderwaterAcousticsPdu.h +) + +set(distributed_emissions_src + DesignatorPdu.cpp + DistributedEmissionsFamilyPdu.cpp + ElectromagneticEmissionBeamData.cpp + ElectromagneticEmissionsPdu.cpp + ElectromagneticEmissionSystemData.cpp + EmitterSystem.cpp + FundamentalParameterData.cpp + FundamentalParameterDataIff.cpp + IffAtcNavAidsLayer1Pdu.cpp + IffAtcNavAidsLayer2Pdu.cpp + IffFundamentalData.cpp + SeesPdu.cpp + TrackJamTarget.cpp + UnderwaterAcousticsPdu.cpp +) + +list(TRANSFORM distributed_emissions_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND distributed_emissions_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${distributed_emissions_src}) + +install(FILES ${distributed_emissions_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/distributed_emissions +) From ceac0d19383a410b655a4927564ada2018a0947d Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Mon, 15 Jan 2024 21:06:16 +0000 Subject: [PATCH 11/22] CMake for synthetic environment --- src/dis6/synthetic_environment/CMakeLists.txt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/dis6/synthetic_environment/CMakeLists.txt b/src/dis6/synthetic_environment/CMakeLists.txt index e69de29b..f08f9d27 100644 --- a/src/dis6/synthetic_environment/CMakeLists.txt +++ b/src/dis6/synthetic_environment/CMakeLists.txt @@ -0,0 +1,29 @@ +set(synthetic_environment_hdr + ArealObjectStatePdu.h + EnvironmentalProcessPdu.h + GriddedDataPdu.h + LinearObjectStatePdu.h + PointObjectStatePdu.h + SyntheticEnvironmentFamilyPdu.h +) + +set(synthetic_environment_src + ArealObjectStatePdu.cpp + EnvironmentalProcessPdu.cpp + GriddedDataPdu.cpp + LinearObjectStatePdu.cpp + PointObjectStatePdu.cpp + SyntheticEnvironmentFamilyPdu.cpp +) + +list(TRANSFORM synthetic_environment_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND synthetic_environment_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${synthetic_environment_src}) + +install(FILES ${synthetic_environment_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/synthetic_environment +) From 907e801441b3d4d2a0f094468c582fbf55da6f6a Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Mon, 15 Jan 2024 22:03:31 +0000 Subject: [PATCH 12/22] Moved all source files within DIS6 into appropriate subdirectories --- src/dis6/AngularVelocityVector.cpp | 81 ---------- src/dis6/AngularVelocityVector.h | 77 ---------- src/dis6/BeamAntennaPattern.cpp | 142 ------------------ src/dis6/BeamAntennaPattern.h | 111 -------------- src/dis6/CMakeLists.txt | 112 -------------- src/dis6/PduContainer.cpp | 89 ----------- src/dis6/PduContainer.h | 73 --------- src/dis6/SphericalHarmonicAntennaPattern.cpp | 67 --------- src/dis6/SphericalHarmonicAntennaPattern.h | 66 -------- .../{ => common}/ArticulationParameter.cpp | 0 src/dis6/{ => common}/ArticulationParameter.h | 0 src/dis6/{ => common}/EightByteChunk.cpp | 0 src/dis6/{ => common}/EightByteChunk.h | 0 src/dis6/{ => common}/EventID.cpp | 0 src/dis6/{ => common}/EventID.h | 0 src/dis6/{ => common}/FixedDatum.cpp | 0 src/dis6/{ => common}/FixedDatum.h | 0 src/dis6/{ => common}/FourByteChunk.cpp | 0 src/dis6/{ => common}/FourByteChunk.h | 0 src/dis6/{ => common}/Orientation.cpp | 0 src/dis6/{ => common}/Orientation.h | 0 src/dis6/{ => common}/RecordSet.cpp | 0 src/dis6/{ => common}/RecordSet.h | 0 src/dis6/{ => common}/SixByteChunk.cpp | 0 src/dis6/{ => common}/SixByteChunk.h | 0 src/dis6/{ => common}/TwoByteChunk.cpp | 0 src/dis6/{ => common}/TwoByteChunk.h | 0 src/dis6/{ => common}/VariableDatum.cpp | 0 src/dis6/{ => common}/VariableDatum.h | 0 .../AcousticBeamData.cpp | 0 .../AcousticBeamData.h | 0 .../AcousticBeamFundamentalParameter.cpp | 0 .../AcousticBeamFundamentalParameter.h | 0 .../AcousticEmitter.cpp | 0 .../AcousticEmitter.h | 0 .../AcousticEmitterSystem.cpp | 0 .../AcousticEmitterSystem.h | 0 .../AcousticEmitterSystemData.cpp | 0 .../AcousticEmitterSystemData.h | 0 .../{ => distributed_emissions}/ApaData.cpp | 0 .../{ => distributed_emissions}/ApaData.h | 0 .../{ => distributed_emissions}/BeamData.cpp | 0 .../{ => distributed_emissions}/BeamData.h | 0 .../distributed_emissions/DesignatorPdu.cpp | 10 +- .../distributed_emissions/DesignatorPdu.h | 4 +- .../LayerHeader.cpp | 0 .../{ => distributed_emissions}/LayerHeader.h | 0 .../PropulsionSystemData.cpp | 0 .../PropulsionSystemData.h | 0 .../{ => distributed_emissions}/ShaftRPMs.cpp | 0 .../{ => distributed_emissions}/ShaftRPMs.h | 0 .../{ => distributed_emissions}/SystemID.cpp | 0 .../{ => distributed_emissions}/SystemID.h | 0 .../VectoringNozzleSystemData.cpp | 0 .../VectoringNozzleSystemData.h | 0 src/dis6/entity_information/CMakeLists.txt | 29 ++++ .../{ => entity_management}/AggregateID.cpp | 0 .../{ => entity_management}/AggregateID.h | 0 .../AggregateMarking.cpp | 0 .../AggregateMarking.h | 0 .../{ => entity_management}/AggregateType.cpp | 0 .../{ => entity_management}/AggregateType.h | 0 src/dis6/entity_management/CMakeLists.txt | 39 +++++ src/dis6/{ => entity_management}/Marking.cpp | 0 src/dis6/{ => entity_management}/Marking.h | 0 .../{ => entity_management}/NamedLocation.cpp | 0 .../{ => entity_management}/NamedLocation.h | 0 .../{ => entity_management}/Relationship.cpp | 0 .../{ => entity_management}/Relationship.h | 0 src/dis6/logistics/CMakeLists.txt | 33 ++++ src/dis6/{ => logistics}/SupplyQuantity.cpp | 0 src/dis6/{ => logistics}/SupplyQuantity.h | 0 src/dis6/{ => minefield}/Point.cpp | 0 src/dis6/{ => minefield}/Point.h | 0 .../AntennaLocation.cpp | 0 .../AntennaLocation.h | 0 .../ModulationType.cpp | 0 .../ModulationType.h | 0 .../Environment.cpp | 0 .../{ => synthetic_environment}/Environment.h | 0 .../GridAxisRecord.cpp | 0 .../GridAxisRecord.h | 0 .../GridAxisRecordRepresentation0.cpp | 0 .../GridAxisRecordRepresentation0.h | 0 .../GridAxisRecordRepresentation1.cpp | 0 .../GridAxisRecordRepresentation1.h | 0 .../GridAxisRecordRepresentation2.cpp | 0 .../GridAxisRecordRepresentation2.h | 0 .../LinearSegmentParameter.cpp | 0 .../LinearSegmentParameter.h | 0 .../ObjectType.cpp | 0 .../{ => synthetic_environment}/ObjectType.h | 0 src/dis6/utils/PDUBank.cpp | 65 ++++---- src/dis6/utils/PDUBank.h | 6 +- src/dis6/{ => warfare}/BurstDescriptor.cpp | 0 src/dis6/{ => warfare}/BurstDescriptor.h | 0 96 files changed, 142 insertions(+), 862 deletions(-) delete mode 100644 src/dis6/AngularVelocityVector.cpp delete mode 100644 src/dis6/AngularVelocityVector.h delete mode 100644 src/dis6/BeamAntennaPattern.cpp delete mode 100644 src/dis6/BeamAntennaPattern.h delete mode 100644 src/dis6/PduContainer.cpp delete mode 100644 src/dis6/PduContainer.h delete mode 100644 src/dis6/SphericalHarmonicAntennaPattern.cpp delete mode 100644 src/dis6/SphericalHarmonicAntennaPattern.h rename src/dis6/{ => common}/ArticulationParameter.cpp (100%) rename src/dis6/{ => common}/ArticulationParameter.h (100%) rename src/dis6/{ => common}/EightByteChunk.cpp (100%) rename src/dis6/{ => common}/EightByteChunk.h (100%) rename src/dis6/{ => common}/EventID.cpp (100%) rename src/dis6/{ => common}/EventID.h (100%) rename src/dis6/{ => common}/FixedDatum.cpp (100%) rename src/dis6/{ => common}/FixedDatum.h (100%) rename src/dis6/{ => common}/FourByteChunk.cpp (100%) rename src/dis6/{ => common}/FourByteChunk.h (100%) rename src/dis6/{ => common}/Orientation.cpp (100%) rename src/dis6/{ => common}/Orientation.h (100%) rename src/dis6/{ => common}/RecordSet.cpp (100%) rename src/dis6/{ => common}/RecordSet.h (100%) rename src/dis6/{ => common}/SixByteChunk.cpp (100%) rename src/dis6/{ => common}/SixByteChunk.h (100%) rename src/dis6/{ => common}/TwoByteChunk.cpp (100%) rename src/dis6/{ => common}/TwoByteChunk.h (100%) rename src/dis6/{ => common}/VariableDatum.cpp (100%) rename src/dis6/{ => common}/VariableDatum.h (100%) rename src/dis6/{ => distributed_emissions}/AcousticBeamData.cpp (100%) rename src/dis6/{ => distributed_emissions}/AcousticBeamData.h (100%) rename src/dis6/{ => distributed_emissions}/AcousticBeamFundamentalParameter.cpp (100%) rename src/dis6/{ => distributed_emissions}/AcousticBeamFundamentalParameter.h (100%) rename src/dis6/{ => distributed_emissions}/AcousticEmitter.cpp (100%) rename src/dis6/{ => distributed_emissions}/AcousticEmitter.h (100%) rename src/dis6/{ => distributed_emissions}/AcousticEmitterSystem.cpp (100%) rename src/dis6/{ => distributed_emissions}/AcousticEmitterSystem.h (100%) rename src/dis6/{ => distributed_emissions}/AcousticEmitterSystemData.cpp (100%) rename src/dis6/{ => distributed_emissions}/AcousticEmitterSystemData.h (100%) rename src/dis6/{ => distributed_emissions}/ApaData.cpp (100%) rename src/dis6/{ => distributed_emissions}/ApaData.h (100%) rename src/dis6/{ => distributed_emissions}/BeamData.cpp (100%) rename src/dis6/{ => distributed_emissions}/BeamData.h (100%) rename src/dis6/{ => distributed_emissions}/LayerHeader.cpp (100%) rename src/dis6/{ => distributed_emissions}/LayerHeader.h (100%) rename src/dis6/{ => distributed_emissions}/PropulsionSystemData.cpp (100%) rename src/dis6/{ => distributed_emissions}/PropulsionSystemData.h (100%) rename src/dis6/{ => distributed_emissions}/ShaftRPMs.cpp (100%) rename src/dis6/{ => distributed_emissions}/ShaftRPMs.h (100%) rename src/dis6/{ => distributed_emissions}/SystemID.cpp (100%) rename src/dis6/{ => distributed_emissions}/SystemID.h (100%) rename src/dis6/{ => distributed_emissions}/VectoringNozzleSystemData.cpp (100%) rename src/dis6/{ => distributed_emissions}/VectoringNozzleSystemData.h (100%) rename src/dis6/{ => entity_management}/AggregateID.cpp (100%) rename src/dis6/{ => entity_management}/AggregateID.h (100%) rename src/dis6/{ => entity_management}/AggregateMarking.cpp (100%) rename src/dis6/{ => entity_management}/AggregateMarking.h (100%) rename src/dis6/{ => entity_management}/AggregateType.cpp (100%) rename src/dis6/{ => entity_management}/AggregateType.h (100%) rename src/dis6/{ => entity_management}/Marking.cpp (100%) rename src/dis6/{ => entity_management}/Marking.h (100%) rename src/dis6/{ => entity_management}/NamedLocation.cpp (100%) rename src/dis6/{ => entity_management}/NamedLocation.h (100%) rename src/dis6/{ => entity_management}/Relationship.cpp (100%) rename src/dis6/{ => entity_management}/Relationship.h (100%) rename src/dis6/{ => logistics}/SupplyQuantity.cpp (100%) rename src/dis6/{ => logistics}/SupplyQuantity.h (100%) rename src/dis6/{ => minefield}/Point.cpp (100%) rename src/dis6/{ => minefield}/Point.h (100%) rename src/dis6/{ => radio_communications}/AntennaLocation.cpp (100%) rename src/dis6/{ => radio_communications}/AntennaLocation.h (100%) rename src/dis6/{ => radio_communications}/ModulationType.cpp (100%) rename src/dis6/{ => radio_communications}/ModulationType.h (100%) rename src/dis6/{ => synthetic_environment}/Environment.cpp (100%) rename src/dis6/{ => synthetic_environment}/Environment.h (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecord.cpp (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecord.h (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecordRepresentation0.cpp (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecordRepresentation0.h (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecordRepresentation1.cpp (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecordRepresentation1.h (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecordRepresentation2.cpp (100%) rename src/dis6/{ => synthetic_environment}/GridAxisRecordRepresentation2.h (100%) rename src/dis6/{ => synthetic_environment}/LinearSegmentParameter.cpp (100%) rename src/dis6/{ => synthetic_environment}/LinearSegmentParameter.h (100%) rename src/dis6/{ => synthetic_environment}/ObjectType.cpp (100%) rename src/dis6/{ => synthetic_environment}/ObjectType.h (100%) rename src/dis6/{ => warfare}/BurstDescriptor.cpp (100%) rename src/dis6/{ => warfare}/BurstDescriptor.h (100%) diff --git a/src/dis6/AngularVelocityVector.cpp b/src/dis6/AngularVelocityVector.cpp deleted file mode 100644 index b3df544c..00000000 --- a/src/dis6/AngularVelocityVector.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include "dis6/AngularVelocityVector.h" - -using namespace DIS; - -AngularVelocityVector::AngularVelocityVector() : _x(0), _y(0), _z(0) {} - -AngularVelocityVector::~AngularVelocityVector() {} - -float AngularVelocityVector::getX() const { return _x; } - -void AngularVelocityVector::setX(float pX) { _x = pX; } - -float AngularVelocityVector::getY() const { return _y; } - -void AngularVelocityVector::setY(float pX) { _y = pX; } - -float AngularVelocityVector::getZ() const { return _z; } - -void AngularVelocityVector::setZ(float pX) { _z = pX; } - -void AngularVelocityVector::marshal(DataStream& dataStream) const { - dataStream << _x; - dataStream << _y; - dataStream << _z; -} - -void AngularVelocityVector::unmarshal(DataStream& dataStream) { - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; -} - -bool AngularVelocityVector::operator==(const AngularVelocityVector& rhs) const { - bool ivarsEqual = true; - - if (!(_x == rhs._x)) ivarsEqual = false; - if (!(_y == rhs._y)) ivarsEqual = false; - if (!(_z == rhs._z)) ivarsEqual = false; - - return ivarsEqual; -} - -int AngularVelocityVector::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - marshalSize = marshalSize + 4; // _z - return marshalSize; -} - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/AngularVelocityVector.h b/src/dis6/AngularVelocityVector.h deleted file mode 100644 index 03090f2a..00000000 --- a/src/dis6/AngularVelocityVector.h +++ /dev/null @@ -1,77 +0,0 @@ -#pragma once - -#include "dis6/opendis6_export.h" -#include "dis6/utils/DataStream.h" - -namespace DIS { -// 5.2.2: angular velocity measured in radians per second out each of the -// entity's own coordinate axes. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All -// rights reserved. -// -// @author DMcG, jkg - -class OPENDIS6_EXPORT AngularVelocityVector { - protected: - /** velocity about the x axis */ - float _x; - - /** velocity about the y axis */ - float _y; - - /** velocity about the zaxis */ - float _z; - - public: - AngularVelocityVector(); - virtual ~AngularVelocityVector(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - float getX() const; - void setX(float pX); - - float getY() const; - void setY(float pX); - - float getZ() const; - void setZ(float pX); - - virtual int getMarshalledSize() const; - - bool operator==(const AngularVelocityVector& rhs) const; -}; -} // namespace DIS - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/BeamAntennaPattern.cpp b/src/dis6/BeamAntennaPattern.cpp deleted file mode 100644 index a8247145..00000000 --- a/src/dis6/BeamAntennaPattern.cpp +++ /dev/null @@ -1,142 +0,0 @@ -#include "dis6/BeamAntennaPattern.h" - -using namespace DIS; - -BeamAntennaPattern::BeamAntennaPattern() - : _beamDirection(), - _azimuthBeamwidth(0), - _referenceSystem(0), - _padding1(0), - _padding2(0), - _ez(0.0), - _ex(0.0), - _phase(0.0) {} - -BeamAntennaPattern::~BeamAntennaPattern() {} - -Orientation& BeamAntennaPattern::getBeamDirection() { return _beamDirection; } - -const Orientation& BeamAntennaPattern::getBeamDirection() const { - return _beamDirection; -} - -void BeamAntennaPattern::setBeamDirection(const Orientation& pX) { - _beamDirection = pX; -} - -float BeamAntennaPattern::getAzimuthBeamwidth() const { - return _azimuthBeamwidth; -} - -void BeamAntennaPattern::setAzimuthBeamwidth(float pX) { - _azimuthBeamwidth = pX; -} - -float BeamAntennaPattern::getReferenceSystem() const { - return _referenceSystem; -} - -void BeamAntennaPattern::setReferenceSystem(float pX) { _referenceSystem = pX; } - -int16_t BeamAntennaPattern::getPadding1() const { return _padding1; } - -void BeamAntennaPattern::setPadding1(int16_t pX) { _padding1 = pX; } - -char BeamAntennaPattern::getPadding2() const { return _padding2; } - -void BeamAntennaPattern::setPadding2(char pX) { _padding2 = pX; } - -float BeamAntennaPattern::getEz() const { return _ez; } - -void BeamAntennaPattern::setEz(float pX) { _ez = pX; } - -float BeamAntennaPattern::getEx() const { return _ex; } - -void BeamAntennaPattern::setEx(float pX) { _ex = pX; } - -float BeamAntennaPattern::getPhase() const { return _phase; } - -void BeamAntennaPattern::setPhase(float pX) { _phase = pX; } - -void BeamAntennaPattern::marshal(DataStream& dataStream) const { - _beamDirection.marshal(dataStream); - dataStream << _azimuthBeamwidth; - dataStream << _referenceSystem; - dataStream << _padding1; - dataStream << _padding2; - dataStream << _ez; - dataStream << _ex; - dataStream << _phase; -} - -void BeamAntennaPattern::unmarshal(DataStream& dataStream) { - _beamDirection.unmarshal(dataStream); - dataStream >> _azimuthBeamwidth; - dataStream >> _referenceSystem; - dataStream >> _padding1; - dataStream >> _padding2; - dataStream >> _ez; - dataStream >> _ex; - dataStream >> _phase; -} - -bool BeamAntennaPattern::operator==(const BeamAntennaPattern& rhs) const { - bool ivarsEqual = true; - - if (!(_beamDirection == rhs._beamDirection)) ivarsEqual = false; - if (!(_azimuthBeamwidth == rhs._azimuthBeamwidth)) ivarsEqual = false; - if (!(_referenceSystem == rhs._referenceSystem)) ivarsEqual = false; - if (!(_padding1 == rhs._padding1)) ivarsEqual = false; - if (!(_padding2 == rhs._padding2)) ivarsEqual = false; - if (!(_ez == rhs._ez)) ivarsEqual = false; - if (!(_ex == rhs._ex)) ivarsEqual = false; - if (!(_phase == rhs._phase)) ivarsEqual = false; - - return ivarsEqual; -} - -int BeamAntennaPattern::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = - marshalSize + _beamDirection.getMarshalledSize(); // _beamDirection - marshalSize = marshalSize + 4; // _azimuthBeamwidth - marshalSize = marshalSize + 4; // _referenceSystem - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - marshalSize = marshalSize + 4; // _ez - marshalSize = marshalSize + 4; // _ex - marshalSize = marshalSize + 4; // _phase - return marshalSize; -} - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/BeamAntennaPattern.h b/src/dis6/BeamAntennaPattern.h deleted file mode 100644 index 46dd877b..00000000 --- a/src/dis6/BeamAntennaPattern.h +++ /dev/null @@ -1,111 +0,0 @@ -#pragma once - -#include "dis6/Orientation.h" -#include "dis6/opendis6_export.h" -#include "dis6/utils/DataStream.h" - -namespace DIS { -// Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. -// Specifies the direction, patter, and polarization of radiation from -// an antenna. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All -// rights reserved. -// -// @author DMcG, jkg - -class OPENDIS6_EXPORT BeamAntennaPattern { - protected: - /** The rotation that transformst he reference coordinate sytem into the - * beam coordinate system. Either world coordinates or entity coordinates may - * be used as the reference coordinate system, as specified by teh - * reference system field of the antenna pattern record. */ - Orientation _beamDirection; - - float _azimuthBeamwidth; - - float _referenceSystem; - - int16_t _padding1; - - char _padding2; - - /** Magnigute of the z-component in beam coordinates at some arbitrary single - * point in the mainbeam and in the far field of the antenna. */ - float _ez; - - /** Magnigute of the x-component in beam coordinates at some arbitrary single - * point in the mainbeam and in the far field of the antenna. */ - float _ex; - - /** THe phase angle between Ez and Ex in radians. */ - float _phase; - - public: - BeamAntennaPattern(); - virtual ~BeamAntennaPattern(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - Orientation& getBeamDirection(); - const Orientation& getBeamDirection() const; - void setBeamDirection(const Orientation& pX); - - float getAzimuthBeamwidth() const; - void setAzimuthBeamwidth(float pX); - - float getReferenceSystem() const; - void setReferenceSystem(float pX); - - int16_t getPadding1() const; - void setPadding1(int16_t pX); - - char getPadding2() const; - void setPadding2(char pX); - - float getEz() const; - void setEz(float pX); - - float getEx() const; - void setEx(float pX); - - float getPhase() const; - void setPhase(float pX); - - virtual int getMarshalledSize() const; - - bool operator==(const BeamAntennaPattern& rhs) const; -}; -} // namespace DIS - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/CMakeLists.txt b/src/dis6/CMakeLists.txt index 74628b58..2fc0a8f1 100644 --- a/src/dis6/CMakeLists.txt +++ b/src/dis6/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory(utils) - add_subdirectory(distributed_emissions) add_subdirectory(entity_information) add_subdirectory(entity_management) @@ -10,114 +9,3 @@ add_subdirectory(simulation_management) add_subdirectory(simulation_management_with_reliability) add_subdirectory(synthetic_environment) add_subdirectory(warfare) - -# Create list of all headers -set(dis6_hdr - AcousticBeamData.h - AcousticBeamFundamentalParameter.h - AcousticEmitter.h - AcousticEmitterSystem.h - AcousticEmitterSystemData.h - AggregateID.h - AggregateMarking.h - AggregateType.h - AngularVelocityVector.h - AntennaLocation.h - ApaData.h - ArticulationParameter.h - BeamAntennaPattern.h - BeamData.h - BurstDescriptor.h - EightByteChunk.h - Environment.h - EventID.h - FixedDatum.h - FourByteChunk.h - GridAxisRecord.h - GridAxisRecordRepresentation0.h - GridAxisRecordRepresentation1.h - GridAxisRecordRepresentation2.h - LayerHeader.h - LinearSegmentParameter.h - Marking.h - ModulationType.h - NamedLocation.h - ObjectType.h - Orientation.h - PduContainer.h - Point.h - PropulsionSystemData.h - RecordSet.h - Relationship.h - ShaftRPMs.h - SixByteChunk.h - SphericalHarmonicAntennaPattern.h - SupplyQuantity.h - SystemID.h - TwoByteChunk.h - VariableDatum.h - VectoringNozzleSystemData.h -) - -# Create list of all source files -set(dis6_src - AcousticBeamData.cpp - AcousticBeamFundamentalParameter.cpp - AcousticEmitter.cpp - AcousticEmitterSystem.cpp - AcousticEmitterSystemData.cpp - AggregateID.cpp - AggregateMarking.cpp - AggregateType.cpp - AngularVelocityVector.cpp - AntennaLocation.cpp - ApaData.cpp - ArticulationParameter.cpp - BeamAntennaPattern.cpp - BeamData.cpp - BurstDescriptor.cpp - EightByteChunk.cpp - Environment.cpp - EventID.cpp - FixedDatum.cpp - FourByteChunk.cpp - GridAxisRecord.cpp - GridAxisRecordRepresentation0.cpp - GridAxisRecordRepresentation1.cpp - GridAxisRecordRepresentation2.cpp - LayerHeader.cpp - LinearSegmentParameter.cpp - Marking.cpp - ModulationType.cpp - NamedLocation.cpp - ObjectType.cpp - Orientation.cpp - PduContainer.cpp - Point.cpp - PropulsionSystemData.cpp - RecordSet.cpp - Relationship.cpp - ShaftRPMs.cpp - SixByteChunk.cpp - SphericalHarmonicAntennaPattern.cpp - SupplyQuantity.cpp - SystemID.cpp - TwoByteChunk.cpp - VariableDatum.cpp - VectoringNozzleSystemData.cpp -) - -# CMake < 3.16 requires target_sources to be specified as -# absolute paths if not in the same directory as the target -# definition. If cmake_minimum_required is ever changed to -# be >= 16, this line can be removed. -list(TRANSFORM dis6_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") - -include(GenerateExportHeader) -generate_export_header(OpenDIS6) -list(APPEND dis6_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") - -target_sources(OpenDIS6 PRIVATE ${dis6_src}) - -install(FILES ${dis6_hdr} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6) diff --git a/src/dis6/PduContainer.cpp b/src/dis6/PduContainer.cpp deleted file mode 100644 index 3f47edbd..00000000 --- a/src/dis6/PduContainer.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#include "dis6/PduContainer.h" - -using namespace DIS; - -PduContainer::PduContainer() : _numberOfPdus(0) {} - -PduContainer::~PduContainer() { _pdus.clear(); } - -int PduContainer::getNumberOfPdus() const { return _pdus.size(); } - -std::vector& PduContainer::getPdus() { return _pdus; } - -const std::vector& PduContainer::getPdus() const { return _pdus; } - -void PduContainer::setPdus(const std::vector& pX) { _pdus = pX; } - -void PduContainer::marshal(DataStream& dataStream) const { - dataStream << (int)_pdus.size(); - - for (size_t idx = 0; idx < _pdus.size(); idx++) { - Pdu x = _pdus[idx]; - x.marshal(dataStream); - } -} - -void PduContainer::unmarshal(DataStream& dataStream) { - dataStream >> _numberOfPdus; - - _pdus.clear(); - for (int idx = 0; idx < _numberOfPdus; idx++) { - Pdu x; - x.unmarshal(dataStream); - _pdus.push_back(x); - } -} - -bool PduContainer::operator==(const PduContainer& rhs) const { - bool ivarsEqual = true; - - for (size_t idx = 0; idx < _pdus.size(); idx++) { - if (!(_pdus[idx] == rhs._pdus[idx])) ivarsEqual = false; - } - - return ivarsEqual; -} - -int PduContainer::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _numberOfPdus - - for (uint64_t idx = 0; idx < _pdus.size(); idx++) { - Pdu listElement = _pdus[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); - } - - return marshalSize; -} - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/PduContainer.h b/src/dis6/PduContainer.h deleted file mode 100644 index ef85cd2b..00000000 --- a/src/dis6/PduContainer.h +++ /dev/null @@ -1,73 +0,0 @@ -#pragma once - -#include - -#include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" -#include "dis6/utils/DataStream.h" - -namespace DIS { -// Used for XML compatability. A container that holds PDUs - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All -// rights reserved. -// -// @author DMcG, jkg - -class OPENDIS6_EXPORT PduContainer { - protected: - /** Number of PDUs in the container list */ - int _numberOfPdus; - - /** record sets */ - std::vector _pdus; - - public: - PduContainer(); - virtual ~PduContainer(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - int getNumberOfPdus() const; - - std::vector& getPdus(); - const std::vector& getPdus() const; - void setPdus(const std::vector& pX); - - virtual int getMarshalledSize() const; - - bool operator==(const PduContainer& rhs) const; -}; -} // namespace DIS - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/SphericalHarmonicAntennaPattern.cpp b/src/dis6/SphericalHarmonicAntennaPattern.cpp deleted file mode 100644 index c2281971..00000000 --- a/src/dis6/SphericalHarmonicAntennaPattern.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "dis6/SphericalHarmonicAntennaPattern.h" - -using namespace DIS; - -SphericalHarmonicAntennaPattern::SphericalHarmonicAntennaPattern() - : _order(0) {} - -SphericalHarmonicAntennaPattern::~SphericalHarmonicAntennaPattern() {} - -char SphericalHarmonicAntennaPattern::getOrder() const { return _order; } - -void SphericalHarmonicAntennaPattern::setOrder(char pX) { _order = pX; } - -void SphericalHarmonicAntennaPattern::marshal(DataStream& dataStream) const { - dataStream << _order; -} - -void SphericalHarmonicAntennaPattern::unmarshal(DataStream& dataStream) { - dataStream >> _order; -} - -bool SphericalHarmonicAntennaPattern::operator==( - const SphericalHarmonicAntennaPattern& rhs) const { - bool ivarsEqual = true; - - if (!(_order == rhs._order)) ivarsEqual = false; - - return ivarsEqual; -} - -int SphericalHarmonicAntennaPattern::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _order - return marshalSize; -} - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/SphericalHarmonicAntennaPattern.h b/src/dis6/SphericalHarmonicAntennaPattern.h deleted file mode 100644 index 39544270..00000000 --- a/src/dis6/SphericalHarmonicAntennaPattern.h +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include "dis6/opendis6_export.h" -#include "dis6/utils/DataStream.h" - -namespace DIS { -// Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is -// of value 2. Specified the direction and radiation pattern from a -// radio transmitter's antenna. NOTE: this class must be hand-coded to -// clean up some implementation details. - -// Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All -// rights reserved. -// -// @author DMcG, jkg - -class OPENDIS6_EXPORT SphericalHarmonicAntennaPattern { - protected: - char _order; - - public: - SphericalHarmonicAntennaPattern(); - virtual ~SphericalHarmonicAntennaPattern(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); - - char getOrder() const; - void setOrder(char pX); - - virtual int getMarshalledSize() const; - - bool operator==(const SphericalHarmonicAntennaPattern& rhs) const; -}; -} // namespace DIS - -// Copyright (c) 1995-2009 held by the author(s). All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the names of the Naval Postgraduate School (NPS) -// Modeling Virtual Environments and Simulation (MOVES) Institute -// (http://www.nps.edu and http://www.MovesInstitute.org) -// nor the names of its contributors may be used to endorse or -// promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. diff --git a/src/dis6/ArticulationParameter.cpp b/src/dis6/common/ArticulationParameter.cpp similarity index 100% rename from src/dis6/ArticulationParameter.cpp rename to src/dis6/common/ArticulationParameter.cpp diff --git a/src/dis6/ArticulationParameter.h b/src/dis6/common/ArticulationParameter.h similarity index 100% rename from src/dis6/ArticulationParameter.h rename to src/dis6/common/ArticulationParameter.h diff --git a/src/dis6/EightByteChunk.cpp b/src/dis6/common/EightByteChunk.cpp similarity index 100% rename from src/dis6/EightByteChunk.cpp rename to src/dis6/common/EightByteChunk.cpp diff --git a/src/dis6/EightByteChunk.h b/src/dis6/common/EightByteChunk.h similarity index 100% rename from src/dis6/EightByteChunk.h rename to src/dis6/common/EightByteChunk.h diff --git a/src/dis6/EventID.cpp b/src/dis6/common/EventID.cpp similarity index 100% rename from src/dis6/EventID.cpp rename to src/dis6/common/EventID.cpp diff --git a/src/dis6/EventID.h b/src/dis6/common/EventID.h similarity index 100% rename from src/dis6/EventID.h rename to src/dis6/common/EventID.h diff --git a/src/dis6/FixedDatum.cpp b/src/dis6/common/FixedDatum.cpp similarity index 100% rename from src/dis6/FixedDatum.cpp rename to src/dis6/common/FixedDatum.cpp diff --git a/src/dis6/FixedDatum.h b/src/dis6/common/FixedDatum.h similarity index 100% rename from src/dis6/FixedDatum.h rename to src/dis6/common/FixedDatum.h diff --git a/src/dis6/FourByteChunk.cpp b/src/dis6/common/FourByteChunk.cpp similarity index 100% rename from src/dis6/FourByteChunk.cpp rename to src/dis6/common/FourByteChunk.cpp diff --git a/src/dis6/FourByteChunk.h b/src/dis6/common/FourByteChunk.h similarity index 100% rename from src/dis6/FourByteChunk.h rename to src/dis6/common/FourByteChunk.h diff --git a/src/dis6/Orientation.cpp b/src/dis6/common/Orientation.cpp similarity index 100% rename from src/dis6/Orientation.cpp rename to src/dis6/common/Orientation.cpp diff --git a/src/dis6/Orientation.h b/src/dis6/common/Orientation.h similarity index 100% rename from src/dis6/Orientation.h rename to src/dis6/common/Orientation.h diff --git a/src/dis6/RecordSet.cpp b/src/dis6/common/RecordSet.cpp similarity index 100% rename from src/dis6/RecordSet.cpp rename to src/dis6/common/RecordSet.cpp diff --git a/src/dis6/RecordSet.h b/src/dis6/common/RecordSet.h similarity index 100% rename from src/dis6/RecordSet.h rename to src/dis6/common/RecordSet.h diff --git a/src/dis6/SixByteChunk.cpp b/src/dis6/common/SixByteChunk.cpp similarity index 100% rename from src/dis6/SixByteChunk.cpp rename to src/dis6/common/SixByteChunk.cpp diff --git a/src/dis6/SixByteChunk.h b/src/dis6/common/SixByteChunk.h similarity index 100% rename from src/dis6/SixByteChunk.h rename to src/dis6/common/SixByteChunk.h diff --git a/src/dis6/TwoByteChunk.cpp b/src/dis6/common/TwoByteChunk.cpp similarity index 100% rename from src/dis6/TwoByteChunk.cpp rename to src/dis6/common/TwoByteChunk.cpp diff --git a/src/dis6/TwoByteChunk.h b/src/dis6/common/TwoByteChunk.h similarity index 100% rename from src/dis6/TwoByteChunk.h rename to src/dis6/common/TwoByteChunk.h diff --git a/src/dis6/VariableDatum.cpp b/src/dis6/common/VariableDatum.cpp similarity index 100% rename from src/dis6/VariableDatum.cpp rename to src/dis6/common/VariableDatum.cpp diff --git a/src/dis6/VariableDatum.h b/src/dis6/common/VariableDatum.h similarity index 100% rename from src/dis6/VariableDatum.h rename to src/dis6/common/VariableDatum.h diff --git a/src/dis6/AcousticBeamData.cpp b/src/dis6/distributed_emissions/AcousticBeamData.cpp similarity index 100% rename from src/dis6/AcousticBeamData.cpp rename to src/dis6/distributed_emissions/AcousticBeamData.cpp diff --git a/src/dis6/AcousticBeamData.h b/src/dis6/distributed_emissions/AcousticBeamData.h similarity index 100% rename from src/dis6/AcousticBeamData.h rename to src/dis6/distributed_emissions/AcousticBeamData.h diff --git a/src/dis6/AcousticBeamFundamentalParameter.cpp b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp similarity index 100% rename from src/dis6/AcousticBeamFundamentalParameter.cpp rename to src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp diff --git a/src/dis6/AcousticBeamFundamentalParameter.h b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h similarity index 100% rename from src/dis6/AcousticBeamFundamentalParameter.h rename to src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h diff --git a/src/dis6/AcousticEmitter.cpp b/src/dis6/distributed_emissions/AcousticEmitter.cpp similarity index 100% rename from src/dis6/AcousticEmitter.cpp rename to src/dis6/distributed_emissions/AcousticEmitter.cpp diff --git a/src/dis6/AcousticEmitter.h b/src/dis6/distributed_emissions/AcousticEmitter.h similarity index 100% rename from src/dis6/AcousticEmitter.h rename to src/dis6/distributed_emissions/AcousticEmitter.h diff --git a/src/dis6/AcousticEmitterSystem.cpp b/src/dis6/distributed_emissions/AcousticEmitterSystem.cpp similarity index 100% rename from src/dis6/AcousticEmitterSystem.cpp rename to src/dis6/distributed_emissions/AcousticEmitterSystem.cpp diff --git a/src/dis6/AcousticEmitterSystem.h b/src/dis6/distributed_emissions/AcousticEmitterSystem.h similarity index 100% rename from src/dis6/AcousticEmitterSystem.h rename to src/dis6/distributed_emissions/AcousticEmitterSystem.h diff --git a/src/dis6/AcousticEmitterSystemData.cpp b/src/dis6/distributed_emissions/AcousticEmitterSystemData.cpp similarity index 100% rename from src/dis6/AcousticEmitterSystemData.cpp rename to src/dis6/distributed_emissions/AcousticEmitterSystemData.cpp diff --git a/src/dis6/AcousticEmitterSystemData.h b/src/dis6/distributed_emissions/AcousticEmitterSystemData.h similarity index 100% rename from src/dis6/AcousticEmitterSystemData.h rename to src/dis6/distributed_emissions/AcousticEmitterSystemData.h diff --git a/src/dis6/ApaData.cpp b/src/dis6/distributed_emissions/ApaData.cpp similarity index 100% rename from src/dis6/ApaData.cpp rename to src/dis6/distributed_emissions/ApaData.cpp diff --git a/src/dis6/ApaData.h b/src/dis6/distributed_emissions/ApaData.h similarity index 100% rename from src/dis6/ApaData.h rename to src/dis6/distributed_emissions/ApaData.h diff --git a/src/dis6/BeamData.cpp b/src/dis6/distributed_emissions/BeamData.cpp similarity index 100% rename from src/dis6/BeamData.cpp rename to src/dis6/distributed_emissions/BeamData.cpp diff --git a/src/dis6/BeamData.h b/src/dis6/distributed_emissions/BeamData.h similarity index 100% rename from src/dis6/BeamData.h rename to src/dis6/distributed_emissions/BeamData.h diff --git a/src/dis6/distributed_emissions/DesignatorPdu.cpp b/src/dis6/distributed_emissions/DesignatorPdu.cpp index 8452922e..1f56570e 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.cpp +++ b/src/dis6/distributed_emissions/DesignatorPdu.cpp @@ -1,4 +1,4 @@ -#include "dis6/DesignatorPdu.h" +#include "dis6/distributed_emissions/DesignatorPdu.h" using namespace DIS; @@ -47,13 +47,9 @@ void DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { _designatedEntityID = pX; } -uint16_t DesignatorPdu::getDesignatorCode() const { - return _designatorCode; -} +uint16_t DesignatorPdu::getDesignatorCode() const { return _designatorCode; } -void DesignatorPdu::setDesignatorCode(uint16_t pX) { - _designatorCode = pX; -} +void DesignatorPdu::setDesignatorCode(uint16_t pX) { _designatorCode = pX; } float DesignatorPdu::getDesignatorPower() const { return _designatorPower; } diff --git a/src/dis6/distributed_emissions/DesignatorPdu.h b/src/dis6/distributed_emissions/DesignatorPdu.h index f08dced4..f72b27aa 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.h +++ b/src/dis6/distributed_emissions/DesignatorPdu.h @@ -1,10 +1,10 @@ #pragma once -#include "dis6/DistributedEmissionsFamilyPdu.h" #include "dis6/EntityID.h" #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" +#include "dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h" +#include "dis6/distributed_emissions/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/LayerHeader.cpp b/src/dis6/distributed_emissions/LayerHeader.cpp similarity index 100% rename from src/dis6/LayerHeader.cpp rename to src/dis6/distributed_emissions/LayerHeader.cpp diff --git a/src/dis6/LayerHeader.h b/src/dis6/distributed_emissions/LayerHeader.h similarity index 100% rename from src/dis6/LayerHeader.h rename to src/dis6/distributed_emissions/LayerHeader.h diff --git a/src/dis6/PropulsionSystemData.cpp b/src/dis6/distributed_emissions/PropulsionSystemData.cpp similarity index 100% rename from src/dis6/PropulsionSystemData.cpp rename to src/dis6/distributed_emissions/PropulsionSystemData.cpp diff --git a/src/dis6/PropulsionSystemData.h b/src/dis6/distributed_emissions/PropulsionSystemData.h similarity index 100% rename from src/dis6/PropulsionSystemData.h rename to src/dis6/distributed_emissions/PropulsionSystemData.h diff --git a/src/dis6/ShaftRPMs.cpp b/src/dis6/distributed_emissions/ShaftRPMs.cpp similarity index 100% rename from src/dis6/ShaftRPMs.cpp rename to src/dis6/distributed_emissions/ShaftRPMs.cpp diff --git a/src/dis6/ShaftRPMs.h b/src/dis6/distributed_emissions/ShaftRPMs.h similarity index 100% rename from src/dis6/ShaftRPMs.h rename to src/dis6/distributed_emissions/ShaftRPMs.h diff --git a/src/dis6/SystemID.cpp b/src/dis6/distributed_emissions/SystemID.cpp similarity index 100% rename from src/dis6/SystemID.cpp rename to src/dis6/distributed_emissions/SystemID.cpp diff --git a/src/dis6/SystemID.h b/src/dis6/distributed_emissions/SystemID.h similarity index 100% rename from src/dis6/SystemID.h rename to src/dis6/distributed_emissions/SystemID.h diff --git a/src/dis6/VectoringNozzleSystemData.cpp b/src/dis6/distributed_emissions/VectoringNozzleSystemData.cpp similarity index 100% rename from src/dis6/VectoringNozzleSystemData.cpp rename to src/dis6/distributed_emissions/VectoringNozzleSystemData.cpp diff --git a/src/dis6/VectoringNozzleSystemData.h b/src/dis6/distributed_emissions/VectoringNozzleSystemData.h similarity index 100% rename from src/dis6/VectoringNozzleSystemData.h rename to src/dis6/distributed_emissions/VectoringNozzleSystemData.h diff --git a/src/dis6/entity_information/CMakeLists.txt b/src/dis6/entity_information/CMakeLists.txt index e69de29b..29cf3c29 100644 --- a/src/dis6/entity_information/CMakeLists.txt +++ b/src/dis6/entity_information/CMakeLists.txt @@ -0,0 +1,29 @@ +set(entity_information_hdr + CollisionElasticPdu.h + CollisionPdu.h + DeadReckoningParameter.h + EntityInformationFamilyPdu.h + EntityStatePdu.h + EntityStateUpdatePdu.h +) + +set(entity_information_src + CollisionElasticPdu.cpp + CollisionPdu.cpp + DeadReckoningParameter.cpp + EntityInformationFamilyPdu.cpp + EntityStatePdu.cpp + EntityStateUpdatePdu.cpp +) + +list(TRANSFORM entity_information_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND entity_information_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${entity_information_src}) + +install(FILES ${entity_information_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/entity_information +) diff --git a/src/dis6/AggregateID.cpp b/src/dis6/entity_management/AggregateID.cpp similarity index 100% rename from src/dis6/AggregateID.cpp rename to src/dis6/entity_management/AggregateID.cpp diff --git a/src/dis6/AggregateID.h b/src/dis6/entity_management/AggregateID.h similarity index 100% rename from src/dis6/AggregateID.h rename to src/dis6/entity_management/AggregateID.h diff --git a/src/dis6/AggregateMarking.cpp b/src/dis6/entity_management/AggregateMarking.cpp similarity index 100% rename from src/dis6/AggregateMarking.cpp rename to src/dis6/entity_management/AggregateMarking.cpp diff --git a/src/dis6/AggregateMarking.h b/src/dis6/entity_management/AggregateMarking.h similarity index 100% rename from src/dis6/AggregateMarking.h rename to src/dis6/entity_management/AggregateMarking.h diff --git a/src/dis6/AggregateType.cpp b/src/dis6/entity_management/AggregateType.cpp similarity index 100% rename from src/dis6/AggregateType.cpp rename to src/dis6/entity_management/AggregateType.cpp diff --git a/src/dis6/AggregateType.h b/src/dis6/entity_management/AggregateType.h similarity index 100% rename from src/dis6/AggregateType.h rename to src/dis6/entity_management/AggregateType.h diff --git a/src/dis6/entity_management/CMakeLists.txt b/src/dis6/entity_management/CMakeLists.txt index e69de29b..49955cf3 100644 --- a/src/dis6/entity_management/CMakeLists.txt +++ b/src/dis6/entity_management/CMakeLists.txt @@ -0,0 +1,39 @@ +set(entity_management_hdr + AggregateID.cpp + AggregateMarking.cpp + AggregateStatePdu.cpp + AggregateType.cpp + EntityManagementFamilyPdu.cpp + IsGroupOfPdu.cpp + IsPartOfPdu.cpp + Marking.cpp + NamedLocation.cpp + Relationship.cpp + TransferControlRequestPdu.cpp +) + +set(entity_management_src + AggregateID.h + AggregateMarking.h + AggregateStatePdu.h + AggregateType.h + EntityManagementFamilyPdu.h + IsGroupOfPdu.h + IsPartOfPdu.h + Marking.h + NamedLocation.h + Relationship.h + TransferControlRequestPdu.h +) + +list(TRANSFORM entity_management_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND entity_management_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${entity_management_src}) + +install(FILES ${entity_management_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/entity_management +) diff --git a/src/dis6/Marking.cpp b/src/dis6/entity_management/Marking.cpp similarity index 100% rename from src/dis6/Marking.cpp rename to src/dis6/entity_management/Marking.cpp diff --git a/src/dis6/Marking.h b/src/dis6/entity_management/Marking.h similarity index 100% rename from src/dis6/Marking.h rename to src/dis6/entity_management/Marking.h diff --git a/src/dis6/NamedLocation.cpp b/src/dis6/entity_management/NamedLocation.cpp similarity index 100% rename from src/dis6/NamedLocation.cpp rename to src/dis6/entity_management/NamedLocation.cpp diff --git a/src/dis6/NamedLocation.h b/src/dis6/entity_management/NamedLocation.h similarity index 100% rename from src/dis6/NamedLocation.h rename to src/dis6/entity_management/NamedLocation.h diff --git a/src/dis6/Relationship.cpp b/src/dis6/entity_management/Relationship.cpp similarity index 100% rename from src/dis6/Relationship.cpp rename to src/dis6/entity_management/Relationship.cpp diff --git a/src/dis6/Relationship.h b/src/dis6/entity_management/Relationship.h similarity index 100% rename from src/dis6/Relationship.h rename to src/dis6/entity_management/Relationship.h diff --git a/src/dis6/logistics/CMakeLists.txt b/src/dis6/logistics/CMakeLists.txt index e69de29b..e8afa19f 100644 --- a/src/dis6/logistics/CMakeLists.txt +++ b/src/dis6/logistics/CMakeLists.txt @@ -0,0 +1,33 @@ +set(logistics_hdr + LogisticsFamilyPdu.h + RepairCompletePdu.h + RepairResponsePdu.h + ResupplyCancelPdu.h + ResupplyOfferPdu.h + ResupplyReceivedPdu.h + ServiceRequestPdu.h + SupplyQuantity.h +) + +set(logistics_src + LogisticsFamilyPdu.cpp + RepairCompletePdu.cpp + RepairResponsePdu.cpp + ResupplyCancelPdu.cpp + ResupplyOfferPdu.cpp + ResupplyReceivedPdu.cpp + ServiceRequestPdu.cpp + SupplyQuantity.cpp +) + +list(TRANSFORM logistics_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND logistics_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${logistics_src}) + +install(FILES ${logistics_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/logistics +) diff --git a/src/dis6/SupplyQuantity.cpp b/src/dis6/logistics/SupplyQuantity.cpp similarity index 100% rename from src/dis6/SupplyQuantity.cpp rename to src/dis6/logistics/SupplyQuantity.cpp diff --git a/src/dis6/SupplyQuantity.h b/src/dis6/logistics/SupplyQuantity.h similarity index 100% rename from src/dis6/SupplyQuantity.h rename to src/dis6/logistics/SupplyQuantity.h diff --git a/src/dis6/Point.cpp b/src/dis6/minefield/Point.cpp similarity index 100% rename from src/dis6/Point.cpp rename to src/dis6/minefield/Point.cpp diff --git a/src/dis6/Point.h b/src/dis6/minefield/Point.h similarity index 100% rename from src/dis6/Point.h rename to src/dis6/minefield/Point.h diff --git a/src/dis6/AntennaLocation.cpp b/src/dis6/radio_communications/AntennaLocation.cpp similarity index 100% rename from src/dis6/AntennaLocation.cpp rename to src/dis6/radio_communications/AntennaLocation.cpp diff --git a/src/dis6/AntennaLocation.h b/src/dis6/radio_communications/AntennaLocation.h similarity index 100% rename from src/dis6/AntennaLocation.h rename to src/dis6/radio_communications/AntennaLocation.h diff --git a/src/dis6/ModulationType.cpp b/src/dis6/radio_communications/ModulationType.cpp similarity index 100% rename from src/dis6/ModulationType.cpp rename to src/dis6/radio_communications/ModulationType.cpp diff --git a/src/dis6/ModulationType.h b/src/dis6/radio_communications/ModulationType.h similarity index 100% rename from src/dis6/ModulationType.h rename to src/dis6/radio_communications/ModulationType.h diff --git a/src/dis6/Environment.cpp b/src/dis6/synthetic_environment/Environment.cpp similarity index 100% rename from src/dis6/Environment.cpp rename to src/dis6/synthetic_environment/Environment.cpp diff --git a/src/dis6/Environment.h b/src/dis6/synthetic_environment/Environment.h similarity index 100% rename from src/dis6/Environment.h rename to src/dis6/synthetic_environment/Environment.h diff --git a/src/dis6/GridAxisRecord.cpp b/src/dis6/synthetic_environment/GridAxisRecord.cpp similarity index 100% rename from src/dis6/GridAxisRecord.cpp rename to src/dis6/synthetic_environment/GridAxisRecord.cpp diff --git a/src/dis6/GridAxisRecord.h b/src/dis6/synthetic_environment/GridAxisRecord.h similarity index 100% rename from src/dis6/GridAxisRecord.h rename to src/dis6/synthetic_environment/GridAxisRecord.h diff --git a/src/dis6/GridAxisRecordRepresentation0.cpp b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.cpp similarity index 100% rename from src/dis6/GridAxisRecordRepresentation0.cpp rename to src/dis6/synthetic_environment/GridAxisRecordRepresentation0.cpp diff --git a/src/dis6/GridAxisRecordRepresentation0.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h similarity index 100% rename from src/dis6/GridAxisRecordRepresentation0.h rename to src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h diff --git a/src/dis6/GridAxisRecordRepresentation1.cpp b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.cpp similarity index 100% rename from src/dis6/GridAxisRecordRepresentation1.cpp rename to src/dis6/synthetic_environment/GridAxisRecordRepresentation1.cpp diff --git a/src/dis6/GridAxisRecordRepresentation1.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h similarity index 100% rename from src/dis6/GridAxisRecordRepresentation1.h rename to src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h diff --git a/src/dis6/GridAxisRecordRepresentation2.cpp b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.cpp similarity index 100% rename from src/dis6/GridAxisRecordRepresentation2.cpp rename to src/dis6/synthetic_environment/GridAxisRecordRepresentation2.cpp diff --git a/src/dis6/GridAxisRecordRepresentation2.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h similarity index 100% rename from src/dis6/GridAxisRecordRepresentation2.h rename to src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h diff --git a/src/dis6/LinearSegmentParameter.cpp b/src/dis6/synthetic_environment/LinearSegmentParameter.cpp similarity index 100% rename from src/dis6/LinearSegmentParameter.cpp rename to src/dis6/synthetic_environment/LinearSegmentParameter.cpp diff --git a/src/dis6/LinearSegmentParameter.h b/src/dis6/synthetic_environment/LinearSegmentParameter.h similarity index 100% rename from src/dis6/LinearSegmentParameter.h rename to src/dis6/synthetic_environment/LinearSegmentParameter.h diff --git a/src/dis6/ObjectType.cpp b/src/dis6/synthetic_environment/ObjectType.cpp similarity index 100% rename from src/dis6/ObjectType.cpp rename to src/dis6/synthetic_environment/ObjectType.cpp diff --git a/src/dis6/ObjectType.h b/src/dis6/synthetic_environment/ObjectType.h similarity index 100% rename from src/dis6/ObjectType.h rename to src/dis6/synthetic_environment/ObjectType.h diff --git a/src/dis6/utils/PDUBank.cpp b/src/dis6/utils/PDUBank.cpp index 7af9e25d..4a2811e3 100644 --- a/src/dis6/utils/PDUBank.cpp +++ b/src/dis6/utils/PDUBank.cpp @@ -1,35 +1,36 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dis6/utils/PDUBank.h" + +#include "dis6/AcknowledgePdu.h" +#include "dis6/ActionRequestPdu.h" +#include "dis6/ActionResponsePdu.h" +#include "dis6/AggregateStatePdu.h" +#include "dis6/CollisionPdu.h" +#include "dis6/CommentPdu.h" +#include "dis6/CreateEntityPdu.h" +#include "dis6/DataQueryPdu.h" +#include "dis6/DesignatorPdu.h" +#include "dis6/DetonationPdu.h" +#include "dis6/ElectromagneticEmissionsPdu.h" +#include "dis6/EntityStatePdu.h" +#include "dis6/EventReportPdu.h" +#include "dis6/FirePdu.h" +#include "dis6/IntercomControlPdu.h" +#include "dis6/IntercomSignalPdu.h" +#include "dis6/IsGroupOfPdu.h" +#include "dis6/ReceiverPdu.h" +#include "dis6/RemoveEntityPdu.h" +#include "dis6/RepairCompletePdu.h" +#include "dis6/RepairResponsePdu.h" +#include "dis6/ResupplyCancelPdu.h" +#include "dis6/ResupplyOfferPdu.h" +#include "dis6/ResupplyReceivedPdu.h" +#include "dis6/ServiceRequestPdu.h" +#include "dis6/SetDataPdu.h" +#include "dis6/SignalPdu.h" +#include "dis6/StartResumePdu.h" +#include "dis6/StopFreezePdu.h" +#include "dis6/TransferControlRequestPdu.h" +#include "dis6/TransmitterPdu.h" using namespace DIS; diff --git a/src/dis6/utils/PDUBank.h b/src/dis6/utils/PDUBank.h index 04c8f919..84dedc11 100644 --- a/src/dis6/utils/PDUBank.h +++ b/src/dis6/utils/PDUBank.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "dis6/Pdu.h" +#include "dis6/utils/PDUType.h" namespace DIS { /// houses instances for the set of known PDU classes to be returned @@ -12,7 +12,7 @@ class OPENDIS6_EXPORT PduBank { /// @param pdu_type the 8-bit PDU type identifier /// @return NULL when the pdu_type is unknown. ///\todo make this parameter just 'uint8_t' since that will be easier to - ///generate. + /// generate. static Pdu* GetStaticPDU(DIS::PDUType pdu_type); }; } // namespace DIS diff --git a/src/dis6/BurstDescriptor.cpp b/src/dis6/warfare/BurstDescriptor.cpp similarity index 100% rename from src/dis6/BurstDescriptor.cpp rename to src/dis6/warfare/BurstDescriptor.cpp diff --git a/src/dis6/BurstDescriptor.h b/src/dis6/warfare/BurstDescriptor.h similarity index 100% rename from src/dis6/BurstDescriptor.h rename to src/dis6/warfare/BurstDescriptor.h From b70ea0ef27ff94263d64270d839f2eb3f9cc9cc3 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Wed, 17 Jan 2024 14:42:37 -0600 Subject: [PATCH 13/22] Populated all DIS6 CMake files, reworked relative paths in common dir --- src/dis6/common/ArticulationParameter.cpp | 2 +- src/dis6/common/ArticulationParameter.h | 2 +- src/dis6/common/CMakeLists.txt | 51 +++++++++++++++++++ src/dis6/common/ClockTime.cpp | 2 +- src/dis6/common/ClockTime.h | 2 +- src/dis6/common/EightByteChunk.cpp | 2 +- src/dis6/common/EightByteChunk.h | 2 +- src/dis6/common/EntityID.cpp | 2 +- src/dis6/common/EntityID.h | 2 +- src/dis6/common/EntityType.cpp | 2 +- src/dis6/common/EntityType.h | 2 +- src/dis6/common/EventID.cpp | 2 +- src/dis6/common/EventID.h | 2 +- src/dis6/common/FixedDatum.cpp | 2 +- src/dis6/common/FixedDatum.h | 2 +- src/dis6/common/FourByteChunk.cpp | 2 +- src/dis6/common/FourByteChunk.h | 2 +- src/dis6/common/Orientation.cpp | 2 +- src/dis6/common/Orientation.h | 2 +- src/dis6/common/Pdu.cpp | 2 +- src/dis6/common/Pdu.h | 2 +- src/dis6/common/RecordSet.cpp | 2 +- src/dis6/common/RecordSet.h | 2 +- src/dis6/common/SimulationAddress.cpp | 2 +- src/dis6/common/SimulationAddress.h | 2 +- src/dis6/common/SixByteChunk.cpp | 2 +- src/dis6/common/SixByteChunk.h | 2 +- src/dis6/common/TwoByteChunk.cpp | 2 +- src/dis6/common/TwoByteChunk.h | 2 +- src/dis6/common/VariableDatum.cpp | 22 ++------ src/dis6/common/VariableDatum.h | 2 +- src/dis6/common/Vector3Double.cpp | 2 +- src/dis6/common/Vector3Double.h | 2 +- src/dis6/common/Vector3Float.cpp | 2 +- src/dis6/common/Vector3Float.h | 2 +- src/dis6/minefield/CMakeLists.txt | 29 +++++++++++ src/dis6/radio_communications/CMakeLists.txt | 37 ++++++++++++++ src/dis6/simulation_management/CMakeLists.txt | 43 ++++++++++++++++ .../CMakeLists.txt | 47 +++++++++++++++++ src/dis6/warfare/CMakeLists.txt | 25 +++++++++ 40 files changed, 269 insertions(+), 51 deletions(-) diff --git a/src/dis6/common/ArticulationParameter.cpp b/src/dis6/common/ArticulationParameter.cpp index 157446c2..ac950733 100644 --- a/src/dis6/common/ArticulationParameter.cpp +++ b/src/dis6/common/ArticulationParameter.cpp @@ -1,4 +1,4 @@ -#include "dis6/ArticulationParameter.h" +#include "dis6/common/ArticulationParameter.h" using namespace DIS; diff --git a/src/dis6/common/ArticulationParameter.h b/src/dis6/common/ArticulationParameter.h index 180f74fa..4cdc568d 100644 --- a/src/dis6/common/ArticulationParameter.h +++ b/src/dis6/common/ArticulationParameter.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/CMakeLists.txt b/src/dis6/common/CMakeLists.txt index e69de29b..72009da4 100644 --- a/src/dis6/common/CMakeLists.txt +++ b/src/dis6/common/CMakeLists.txt @@ -0,0 +1,51 @@ +set(common_src + ArticulationParameter.cpp + ClockTime.cpp + EightByteChunk.cpp + EntityID.cpp + EntityType.cpp + EventID.cpp + FixedDatum.cpp + FourByteChunk.cpp + Orientation.cpp + Pdu.cpp + RecordSet.cpp + SimulationAddress.cpp + SixByteChunk.cpp + TwoByteChunk.cpp + VariableDatum.cpp + Vector3Double.cpp + Vector3Float.cpp +) + +set(common_hdr + ArticulationParameter.h + ClockTime.h + EightByteChunk.h + EntityID.h + EntityType.h + EventID.h + FixedDatum.h + FourByteChunk.h + Orientation.h + Pdu.h + RecordSet.h + SimulationAddress.h + SixByteChunk.h + TwoByteChunk.h + VariableDatum.h + Vector3Double.h + Vector3Float.h +) + +list(TRANSFORM common_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND common_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${common_src}) + +install(FILES ${common_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/common +) diff --git a/src/dis6/common/ClockTime.cpp b/src/dis6/common/ClockTime.cpp index 6a3f5b5a..4c008bf9 100644 --- a/src/dis6/common/ClockTime.cpp +++ b/src/dis6/common/ClockTime.cpp @@ -1,4 +1,4 @@ -#include "dis6/ClockTime.h" +#include "dis6/common/ClockTime.h" using namespace DIS; diff --git a/src/dis6/common/ClockTime.h b/src/dis6/common/ClockTime.h index a376431a..7c8d0527 100644 --- a/src/dis6/common/ClockTime.h +++ b/src/dis6/common/ClockTime.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/EightByteChunk.cpp b/src/dis6/common/EightByteChunk.cpp index ebf634f7..08efea27 100644 --- a/src/dis6/common/EightByteChunk.cpp +++ b/src/dis6/common/EightByteChunk.cpp @@ -1,4 +1,4 @@ -#include "dis6/EightByteChunk.h" +#include "dis6/common/EightByteChunk.h" using namespace DIS; diff --git a/src/dis6/common/EightByteChunk.h b/src/dis6/common/EightByteChunk.h index 91673091..a192899c 100644 --- a/src/dis6/common/EightByteChunk.h +++ b/src/dis6/common/EightByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/EntityID.cpp b/src/dis6/common/EntityID.cpp index ad59e297..0cbaeed9 100644 --- a/src/dis6/common/EntityID.cpp +++ b/src/dis6/common/EntityID.cpp @@ -1,4 +1,4 @@ -#include "dis6/EntityID.h" +#include "dis6/common/EntityID.h" using namespace DIS; diff --git a/src/dis6/common/EntityID.h b/src/dis6/common/EntityID.h index 9b08abc8..e6f31916 100644 --- a/src/dis6/common/EntityID.h +++ b/src/dis6/common/EntityID.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/EntityType.cpp b/src/dis6/common/EntityType.cpp index 9fd67152..5c4f438a 100644 --- a/src/dis6/common/EntityType.cpp +++ b/src/dis6/common/EntityType.cpp @@ -1,4 +1,4 @@ -#include "dis6/EntityType.h" +#include "dis6/common/EntityType.h" using namespace DIS; diff --git a/src/dis6/common/EntityType.h b/src/dis6/common/EntityType.h index 1db7bd20..4a888449 100644 --- a/src/dis6/common/EntityType.h +++ b/src/dis6/common/EntityType.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/EventID.cpp b/src/dis6/common/EventID.cpp index 54a6123b..d2b08926 100644 --- a/src/dis6/common/EventID.cpp +++ b/src/dis6/common/EventID.cpp @@ -1,4 +1,4 @@ -#include "dis6/EventID.h" +#include "dis6/common/EventID.h" using namespace DIS; diff --git a/src/dis6/common/EventID.h b/src/dis6/common/EventID.h index e61d920b..bd14bd79 100644 --- a/src/dis6/common/EventID.h +++ b/src/dis6/common/EventID.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/FixedDatum.cpp b/src/dis6/common/FixedDatum.cpp index 9b7b7945..7cf9e05a 100644 --- a/src/dis6/common/FixedDatum.cpp +++ b/src/dis6/common/FixedDatum.cpp @@ -1,4 +1,4 @@ -#include "dis6/FixedDatum.h" +#include "dis6/common/FixedDatum.h" using namespace DIS; diff --git a/src/dis6/common/FixedDatum.h b/src/dis6/common/FixedDatum.h index 813e4e05..5515cbda 100644 --- a/src/dis6/common/FixedDatum.h +++ b/src/dis6/common/FixedDatum.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/FourByteChunk.cpp b/src/dis6/common/FourByteChunk.cpp index 933b1ee4..be7428a8 100644 --- a/src/dis6/common/FourByteChunk.cpp +++ b/src/dis6/common/FourByteChunk.cpp @@ -1,4 +1,4 @@ -#include "dis6/FourByteChunk.h" +#include "dis6/common/FourByteChunk.h" using namespace DIS; diff --git a/src/dis6/common/FourByteChunk.h b/src/dis6/common/FourByteChunk.h index 24463529..5273a2ed 100644 --- a/src/dis6/common/FourByteChunk.h +++ b/src/dis6/common/FourByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/Orientation.cpp b/src/dis6/common/Orientation.cpp index 9e876a4f..7966c48e 100644 --- a/src/dis6/common/Orientation.cpp +++ b/src/dis6/common/Orientation.cpp @@ -1,4 +1,4 @@ -#include "dis6/Orientation.h" +#include "dis6/common/Orientation.h" using namespace DIS; diff --git a/src/dis6/common/Orientation.h b/src/dis6/common/Orientation.h index be233b8c..d6edabf1 100644 --- a/src/dis6/common/Orientation.h +++ b/src/dis6/common/Orientation.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/Pdu.cpp b/src/dis6/common/Pdu.cpp index c22ead58..5c8476f0 100644 --- a/src/dis6/common/Pdu.cpp +++ b/src/dis6/common/Pdu.cpp @@ -1,4 +1,4 @@ -#include "dis6/Pdu.h" +#include "dis6/common/Pdu.h" using namespace DIS; diff --git a/src/dis6/common/Pdu.h b/src/dis6/common/Pdu.h index b9177989..8a65a08f 100644 --- a/src/dis6/common/Pdu.h +++ b/src/dis6/common/Pdu.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/RecordSet.cpp b/src/dis6/common/RecordSet.cpp index 7c769bf8..526f1df2 100644 --- a/src/dis6/common/RecordSet.cpp +++ b/src/dis6/common/RecordSet.cpp @@ -1,4 +1,4 @@ -#include "dis6/RecordSet.h" +#include "dis6/common/RecordSet.h" using namespace DIS; diff --git a/src/dis6/common/RecordSet.h b/src/dis6/common/RecordSet.h index d36eff16..4b1a1d53 100644 --- a/src/dis6/common/RecordSet.h +++ b/src/dis6/common/RecordSet.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/SimulationAddress.cpp b/src/dis6/common/SimulationAddress.cpp index 9acf8de0..29fd6431 100644 --- a/src/dis6/common/SimulationAddress.cpp +++ b/src/dis6/common/SimulationAddress.cpp @@ -1,4 +1,4 @@ -#include "dis6/SimulationAddress.h" +#include "dis6/common/SimulationAddress.h" using namespace DIS; diff --git a/src/dis6/common/SimulationAddress.h b/src/dis6/common/SimulationAddress.h index 596a4be2..1322a5f1 100644 --- a/src/dis6/common/SimulationAddress.h +++ b/src/dis6/common/SimulationAddress.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/SixByteChunk.cpp b/src/dis6/common/SixByteChunk.cpp index 76ef8403..3ad0d925 100644 --- a/src/dis6/common/SixByteChunk.cpp +++ b/src/dis6/common/SixByteChunk.cpp @@ -1,4 +1,4 @@ -#include "dis6/SixByteChunk.h" +#include "dis6/common/SixByteChunk.h" using namespace DIS; diff --git a/src/dis6/common/SixByteChunk.h b/src/dis6/common/SixByteChunk.h index 52ebc10f..7aef43ae 100644 --- a/src/dis6/common/SixByteChunk.h +++ b/src/dis6/common/SixByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/TwoByteChunk.cpp b/src/dis6/common/TwoByteChunk.cpp index aec852fe..592f9ead 100644 --- a/src/dis6/common/TwoByteChunk.cpp +++ b/src/dis6/common/TwoByteChunk.cpp @@ -1,4 +1,4 @@ -#include "dis6/TwoByteChunk.h" +#include "dis6/common/TwoByteChunk.h" using namespace DIS; diff --git a/src/dis6/common/TwoByteChunk.h b/src/dis6/common/TwoByteChunk.h index f82c7be4..74fab719 100644 --- a/src/dis6/common/TwoByteChunk.h +++ b/src/dis6/common/TwoByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/VariableDatum.cpp b/src/dis6/common/VariableDatum.cpp index 1c105f53..ec1ae1f1 100644 --- a/src/dis6/common/VariableDatum.cpp +++ b/src/dis6/common/VariableDatum.cpp @@ -1,6 +1,4 @@ -#include - -#include "dis6/VariableDatum.h" +#include "dis6/common/VariableDatum.h" using namespace DIS; @@ -15,13 +13,9 @@ VariableDatum::~VariableDatum() { // delete [] _variableDatums; } -uint32_t VariableDatum::getVariableDatumID() const { - return _variableDatumID; -} +uint32_t VariableDatum::getVariableDatumID() const { return _variableDatumID; } -void VariableDatum::setVariableDatumID(uint32_t pX) { - _variableDatumID = pX; -} +void VariableDatum::setVariableDatumID(uint32_t pX) { _variableDatumID = pX; } uint32_t VariableDatum::getVariableDatumLength() const { return _variableDatumLength; @@ -41,8 +35,7 @@ const char* VariableDatum::getVariableDatums() const { return _variableDatums.data(); } -void VariableDatum::setVariableDatums(const char* x, - const uint32_t length) { +void VariableDatum::setVariableDatums(const char* x, const uint32_t length) { // convert and store length as bits _variableDatumLength = length * 8; @@ -82,9 +75,6 @@ void VariableDatum::unmarshal(DataStream& dataStream) { if (byteLength % 8 > 0) chunks++; _arrayLength = chunks * 8; - // std::cout << "Variable datum #" << (int)_variableDatumID << " arrayLength=" - // << (int)_arrayLength << " "; - // .resize() might (theoretically) throw. want to catch? : what to do? zombie // datum? if (_variableDatums.size() < _arrayLength) @@ -92,14 +82,10 @@ void VariableDatum::unmarshal(DataStream& dataStream) { for (uint32_t idx = 0; idx < _arrayLength; idx++) { dataStream >> _variableDatums[idx]; - // std::cout << (int)_variableDatums[idx] << " "; } - // std::cout << std::endl; for (uint64_t idx = _arrayLength; idx < _variableDatums.size(); idx++) { _variableDatums[idx] = 0; } - // std::cout << " Created and copied data to new _variableDatums array" << - // std::endl; } bool VariableDatum::operator==(const VariableDatum& rhs) const { diff --git a/src/dis6/common/VariableDatum.h b/src/dis6/common/VariableDatum.h index b9fd5a0f..605ed490 100644 --- a/src/dis6/common/VariableDatum.h +++ b/src/dis6/common/VariableDatum.h @@ -2,7 +2,7 @@ #include -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" // length in bytes for the variable data. This should be a dynamically allocated diff --git a/src/dis6/common/Vector3Double.cpp b/src/dis6/common/Vector3Double.cpp index 7787a7cc..9838d548 100644 --- a/src/dis6/common/Vector3Double.cpp +++ b/src/dis6/common/Vector3Double.cpp @@ -1,4 +1,4 @@ -#include "dis6/Vector3Double.h" +#include "dis6/common/Vector3Double.h" using namespace DIS; diff --git a/src/dis6/common/Vector3Double.h b/src/dis6/common/Vector3Double.h index eefa5a8f..f02ccc75 100644 --- a/src/dis6/common/Vector3Double.h +++ b/src/dis6/common/Vector3Double.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/common/Vector3Float.cpp b/src/dis6/common/Vector3Float.cpp index a8abc0a9..1d7d7fd0 100644 --- a/src/dis6/common/Vector3Float.cpp +++ b/src/dis6/common/Vector3Float.cpp @@ -1,4 +1,4 @@ -#include "dis6/Vector3Float.h" +#include "dis6/common/Vector3Float.h" using namespace DIS; diff --git a/src/dis6/common/Vector3Float.h b/src/dis6/common/Vector3Float.h index c2fcb857..7629e446 100644 --- a/src/dis6/common/Vector3Float.h +++ b/src/dis6/common/Vector3Float.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/common/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/minefield/CMakeLists.txt b/src/dis6/minefield/CMakeLists.txt index e69de29b..b1524dd6 100644 --- a/src/dis6/minefield/CMakeLists.txt +++ b/src/dis6/minefield/CMakeLists.txt @@ -0,0 +1,29 @@ +set(minefield_src + MinefieldDataPdu.cpp + MinefieldFamilyPdu.cpp + MinefieldQueryPdu.cpp + MinefieldResponseNackPdu.cpp + MinefieldStatePdu.cpp + Point.cpp +) + +set(minefield_hdr + MinefieldDataPdu.h + MinefieldFamilyPdu.h + MinefieldQueryPdu.h + MinefieldResponseNackPdu.h + MinefieldStatePdu.h + Point.h +) + +list(TRANSFORM minefield_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND minefield_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${minefield_src}) + +install(FILES ${minefield_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/minefield +) diff --git a/src/dis6/radio_communications/CMakeLists.txt b/src/dis6/radio_communications/CMakeLists.txt index e69de29b..2ed89f0e 100644 --- a/src/dis6/radio_communications/CMakeLists.txt +++ b/src/dis6/radio_communications/CMakeLists.txt @@ -0,0 +1,37 @@ +set(radio_communications_src + AntennaLocation.cpp + IntercomCommunicationsParameters.cpp + IntercomControlPdu.cpp + IntercomSignalPdu.cpp + ModulationType.cpp + RadioCommunicationsFamilyPdu.cpp + RadioEntityType.cpp + ReceiverPdu.cpp + SignalPdu.cpp + TransmitterPdu.cpp +) + +set(radio_communications_hdr + AntennaLocation.h + IntercomCommunicationsParameters.h + IntercomControlPdu.h + IntercomSignalPdu.h + ModulationType.h + RadioCommunicationsFamilyPdu.h + RadioEntityType.h + ReceiverPdu.h + SignalPdu.h + TransmitterPdu.h +) + +list(TRANSFORM radio_communications_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND radio_communications_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${radio_communications_src}) + +install(FILES ${radio_communications_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/radio_communications +) diff --git a/src/dis6/simulation_management/CMakeLists.txt b/src/dis6/simulation_management/CMakeLists.txt index e69de29b..404bbbb5 100644 --- a/src/dis6/simulation_management/CMakeLists.txt +++ b/src/dis6/simulation_management/CMakeLists.txt @@ -0,0 +1,43 @@ +set(simulation_management_hdr + AcknowledgePdu.h + ActionRequestPdu.h + ActionResponsePdu.h + CommentPdu.h + CreateEntityPdu.h + DataPdu.h + DataQueryPdu.h + EventReportPdu.h + RemoveEntityPdu.h + SetDataPdu.h + SimulationManagementFamilyPdu.h + StartResumePdu.h + StopFreezePdu.h +) + +set(simulation_management_src + AcknowledgePdu.cpp + ActionRequestPdu.cpp + ActionResponsePdu.cpp + CommentPdu.cpp + CreateEntityPdu.cpp + DataPdu.cpp + DataQueryPdu.cpp + EventReportPdu.cpp + RemoveEntityPdu.cpp + SetDataPdu.cpp + SimulationManagementFamilyPdu.cpp + StartResumePdu.cpp + StopFreezePdu.cpp +) + +list(TRANSFORM simulation_management_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND simulation_management_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${simulation_management_src}) + +install(FILES ${simulation_management_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/simulation_management +) diff --git a/src/dis6/simulation_management_with_reliability/CMakeLists.txt b/src/dis6/simulation_management_with_reliability/CMakeLists.txt index e69de29b..5ee28a05 100644 --- a/src/dis6/simulation_management_with_reliability/CMakeLists.txt +++ b/src/dis6/simulation_management_with_reliability/CMakeLists.txt @@ -0,0 +1,47 @@ +set(simulation_management_with_reliability_hdr + AcknowledgeReliablePdu.h + ActionRequestReliablePdu.h + ActionResponseReliablePdu.h + CommentReliablePdu.h + CreateEntityReliablePdu.h + DataQueryReliablePdu.h + DataReliablePdu.h + EventReportReliablePdu.h + RecordQueryReliablePdu.h + RemoveEntityReliablePdu.h + SetDataReliablePdu.h + SetRecordReliablePdu.h + SimulationManagementWithReliabilityFamilyPdu.h + StartResumeReliablePdu.h + StopFreezeReliablePdu.h +) + +set(simulation_management_with_reliability_src + AcknowledgeReliablePdu.cpp + ActionRequestReliablePdu.cpp + ActionResponseReliablePdu.cpp + CommentReliablePdu.cpp + CreateEntityReliablePdu.cpp + DataQueryReliablePdu.cpp + DataReliablePdu.cpp + EventReportReliablePdu.cpp + RecordQueryReliablePdu.cpp + RemoveEntityReliablePdu.cpp + SetDataReliablePdu.cpp + SetRecordReliablePdu.cpp + SimulationManagementWithReliabilityFamilyPdu.cpp + StartResumeReliablePdu.cpp + StopFreezeReliablePdu.cpp +) + +list(TRANSFORM simulation_management_with_reliability_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND simulation_management_with_reliability_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${simulation_management_with_reliability_src}) + +install(FILES ${simulation_management_with_reliability_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/simulation_management_with_reliability +) diff --git a/src/dis6/warfare/CMakeLists.txt b/src/dis6/warfare/CMakeLists.txt index e69de29b..1347b9cf 100644 --- a/src/dis6/warfare/CMakeLists.txt +++ b/src/dis6/warfare/CMakeLists.txt @@ -0,0 +1,25 @@ +set(warfare_hdr + BurstDescriptor.h + DetonationPdu.h + FirePdu.h + WarfareFamilyPdu.h +) + +set(warfare_src + BurstDescriptor.cpp + DetonationPdu.cpp + FirePdu.cpp + WarfareFamilyPdu.cpp +) + +list(TRANSFORM warfare_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") + +include(GenerateExportHeader) +generate_export_header(OpenDIS6) +list(APPEND warfare_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") + +target_sources(OpenDIS6 PRIVATE ${warfare_src}) + +install(FILES ${warfare_hdr} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/warfare +) From 300eb4c8828fad710f79b820c217a40e7a4e85b2 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Thu, 18 Jan 2024 16:42:15 -0600 Subject: [PATCH 14/22] [WIP] DIS7 reorganization --- CMakeLists.txt | 4 +- src/dis7/CMakeLists.txt | 383 +----------------- src/dis7/{ => common}/AcousticEmitter.cpp | 0 src/dis7/{ => common}/AcousticEmitter.h | 0 src/dis7/{ => common}/AggregateIdentifier.cpp | 0 src/dis7/{ => common}/AggregateIdentifier.h | 0 src/dis7/{ => common}/AggregateMarking.cpp | 0 src/dis7/{ => common}/AggregateMarking.h | 0 src/dis7/{ => common}/AggregateType.cpp | 0 src/dis7/{ => common}/AggregateType.h | 0 src/dis7/{ => common}/AngleDeception.cpp | 0 src/dis7/{ => common}/AngleDeception.h | 0 .../{ => common}/AngularVelocityVector.cpp | 0 src/dis7/{ => common}/AngularVelocityVector.h | 0 src/dis7/{ => common}/AntennaLocation.cpp | 0 src/dis7/{ => common}/AntennaLocation.h | 0 src/dis7/common/CMakeLists.txt | 0 .../DataQueryDatumSpecification.cpp | 0 .../DataQueryDatumSpecification.h | 0 src/dis7/{ => common}/EightByteChunk.cpp | 0 src/dis7/{ => common}/EightByteChunk.h | 0 src/dis7/{ => common}/FixedDatum.cpp | 0 src/dis7/{ => common}/FixedDatum.h | 0 src/dis7/{ => common}/FourByteChunk.cpp | 0 src/dis7/{ => common}/FourByteChunk.h | 0 src/dis7/{ => common}/TwoByteChunk.cpp | 0 src/dis7/{ => common}/TwoByteChunk.h | 0 src/dis7/{ => common}/UnsignedDISInteger.cpp | 0 src/dis7/{ => common}/UnsignedDISInteger.h | 0 src/dis7/{ => common}/VariableDatum.cpp | 0 src/dis7/{ => common}/VariableDatum.h | 0 src/dis7/{ => common}/VariableParameter.cpp | 0 src/dis7/{ => common}/VariableParameter.h | 0 .../VariableTransmitterParameters.cpp | 0 .../VariableTransmitterParameters.h | 0 src/dis7/distributed_emissions/CMakeLists.txt | 0 .../DesignatorPdu.cpp | 0 .../DesignatorPdu.h | 0 .../DistributedEmissionsFamilyPdu.cpp | 0 .../DistributedEmissionsFamilyPdu.h | 0 .../ElectromagneticEmissionsPdu.cpp | 0 .../ElectromagneticEmissionsPdu.h | 0 .../{ => distributed_emissions}/IFFPdu.cpp | 0 src/dis7/{ => distributed_emissions}/IFFPdu.h | 0 .../{ => distributed_emissions}/SeesPdu.cpp | 0 .../{ => distributed_emissions}/SeesPdu.h | 0 .../UnderwaterAcousticsPdu.cpp} | 0 .../UnderwaterAcousticsPdu.h} | 0 .../VectoringNozzleSystem.cpp | 0 .../VectoringNozzleSystem.h | 0 .../{ => entity_information}/AttributePdu.cpp | 0 .../{ => entity_information}/AttributePdu.h | 0 src/dis7/entity_information/CMakeLists.txt | 0 .../CollisionElasticPdu.cpp | 0 .../CollisionElasticPdu.h | 0 .../{ => entity_information}/CollisionPdu.cpp | 0 .../{ => entity_information}/CollisionPdu.h | 0 .../EntityInformationFamilyPdu.cpp | 0 .../EntityInformationFamilyPdu.h | 0 .../EntityStatePdu.cpp | 0 .../{ => entity_information}/EntityStatePdu.h | 0 .../EntityStateUpdatePdu.cpp | 0 .../EntityStateUpdatePdu.h | 0 .../FastEntityStatePdu.cpp | 0 .../FastEntityStatePdu.h | 0 .../EntityManagementFamilyPdu.cpp | 0 .../EntityManagementFamilyPdu.h | 0 .../{ => entity_management}/IsPartOfPdu.cpp | 0 .../{ => entity_management}/IsPartOfPdu.h | 0 src/dis7/logistics/CMakeLists.txt | 0 .../{ => logistics}/LogisticsFamilyPdu.cpp | 0 src/dis7/{ => logistics}/LogisticsFamilyPdu.h | 0 .../{ => logistics}/RepairCompletePdu.cpp | 0 src/dis7/{ => logistics}/RepairCompletePdu.h | 0 .../{ => logistics}/RepairResponsePdu.cpp | 0 src/dis7/{ => logistics}/RepairResponsePdu.h | 0 src/dis7/{ => logistics}/ResupplyOfferPdu.cpp | 0 src/dis7/{ => logistics}/ResupplyOfferPdu.h | 0 .../{ => logistics}/ResupplyReceivedPdu.cpp | 0 .../{ => logistics}/ResupplyReceivedPdu.h | 0 .../{ => logistics}/ServiceRequestPdu.cpp | 0 src/dis7/{ => logistics}/ServiceRequestPdu.h | 0 src/dis7/minefield/CMakeLists.txt | 0 .../{ => minefield}/MinefieldFamilyPdu.cpp | 0 src/dis7/{ => minefield}/MinefieldFamilyPdu.h | 0 .../MinefieldResponseNackPdu.cpp | 0 .../MinefieldResponseNackPdu.h | 0 .../{ => minefield}/MinefieldStatePdu.cpp | 0 src/dis7/{ => minefield}/MinefieldStatePdu.h | 0 src/dis7/{ => minefield}/Vector2Float.cpp | 0 src/dis7/{ => minefield}/Vector2Float.h | 0 src/dis7/radio_communications/CMakeLists.txt | 0 .../IntercomSignalPdu.cpp | 0 .../IntercomSignalPdu.h | 0 .../RadioCommunicationsFamilyPdu.cpp | 0 .../RadioCommunicationsFamilyPdu.h | 0 .../ReceiverPdu.cpp | 0 .../{ => radio_communications}/ReceiverPdu.h | 0 .../AcknowledgePdu.cpp | 0 .../AcknowledgePdu.h | 0 .../ActionRequestPdu.cpp | 0 .../ActionRequestPdu.h | 0 .../ActionResponsePdu.cpp | 0 .../ActionResponsePdu.h | 0 src/dis7/simulation_management/CMakeLists.txt | 0 .../CommentPdu.cpp | 0 .../{ => simulation_management}/CommentPdu.h | 0 .../CreateEntityPdu.cpp | 0 .../CreateEntityPdu.h | 0 .../{ => simulation_management}/DataPdu.cpp | 0 .../{ => simulation_management}/DataPdu.h | 0 .../DataQueryPdu.cpp | 0 .../DataQueryPdu.h | 0 .../EventReportPdu.cpp | 0 .../EventReportPdu.h | 0 .../RemoveEntityPdu.cpp | 0 .../RemoveEntityPdu.h | 0 .../SetDataPdu.cpp | 0 .../{ => simulation_management}/SetDataPdu.h | 0 .../SimulationManagementFamilyPdu.cpp | 0 .../SimulationManagementFamilyPdu.h | 0 .../StartResumePdu.cpp | 0 .../StartResumePdu.h | 0 .../StopFreezePdu.cpp | 0 .../StopFreezePdu.h | 0 .../AcknowledgeReliablePdu.cpp | 0 .../AcknowledgeReliablePdu.h | 0 .../ActionRequestReliablePdu.cpp | 0 .../ActionRequestReliablePdu.h | 0 .../ActionResponseReliablePdu.cpp | 0 .../ActionResponseReliablePdu.h | 0 .../CommentReliablePdu.cpp | 0 .../CommentReliablePdu.h | 0 .../CreateEntityReliablePdu.cpp | 0 .../CreateEntityReliablePdu.h | 0 .../DataQueryReliablePdu.cpp | 0 .../DataQueryReliablePdu.h | 0 .../DataReliablePdu.cpp | 0 .../DataReliablePdu.h | 0 .../EventReportReliablePdu.cpp | 0 .../EventReportReliablePdu.h | 0 .../RecordQueryReliablePdu.cpp | 0 .../RecordQueryReliablePdu.h | 0 .../RemoveEntityReliablePdu.cpp | 0 .../RemoveEntityReliablePdu.h | 0 .../SetDataReliablePdu.cpp | 0 .../SetDataReliablePdu.h | 0 ...tionManagementWithReliabilityFamilyPdu.cpp | 0 ...lationManagementWithReliabilityFamilyPdu.h | 0 .../StartResumeReliablePdu.cpp | 0 .../StartResumeReliablePdu.h | 0 .../StopFreezeReliablePdu.cpp | 0 .../StopFreezeReliablePdu.h | 0 .../ArealObjectStatePdu.cpp | 0 .../ArealObjectStatePdu.h | 0 src/dis7/synthetic_environment/CMakeLists.txt | 0 .../LinearObjectStatePdu.cpp | 0 .../LinearObjectStatePdu.h | 0 .../PointObjectStatePdu.cpp | 0 .../PointObjectStatePdu.h | 0 .../SyntheticEnvironmentFamilyPdu.cpp | 0 .../SyntheticEnvironmentFamilyPdu.h | 0 src/dis7/warfare/CMakeLists.txt | 0 .../{ => warfare}/DirectedEnergyFirePdu.cpp | 0 .../{ => warfare}/DirectedEnergyFirePdu.h | 0 .../{ => warfare}/EntityDamageStatusPdu.cpp | 0 .../{ => warfare}/EntityDamageStatusPdu.h | 0 167 files changed, 12 insertions(+), 375 deletions(-) rename src/dis7/{ => common}/AcousticEmitter.cpp (100%) rename src/dis7/{ => common}/AcousticEmitter.h (100%) rename src/dis7/{ => common}/AggregateIdentifier.cpp (100%) rename src/dis7/{ => common}/AggregateIdentifier.h (100%) rename src/dis7/{ => common}/AggregateMarking.cpp (100%) rename src/dis7/{ => common}/AggregateMarking.h (100%) rename src/dis7/{ => common}/AggregateType.cpp (100%) rename src/dis7/{ => common}/AggregateType.h (100%) rename src/dis7/{ => common}/AngleDeception.cpp (100%) rename src/dis7/{ => common}/AngleDeception.h (100%) rename src/dis7/{ => common}/AngularVelocityVector.cpp (100%) rename src/dis7/{ => common}/AngularVelocityVector.h (100%) rename src/dis7/{ => common}/AntennaLocation.cpp (100%) rename src/dis7/{ => common}/AntennaLocation.h (100%) create mode 100644 src/dis7/common/CMakeLists.txt rename src/dis7/{ => common}/DataQueryDatumSpecification.cpp (100%) rename src/dis7/{ => common}/DataQueryDatumSpecification.h (100%) rename src/dis7/{ => common}/EightByteChunk.cpp (100%) rename src/dis7/{ => common}/EightByteChunk.h (100%) rename src/dis7/{ => common}/FixedDatum.cpp (100%) rename src/dis7/{ => common}/FixedDatum.h (100%) rename src/dis7/{ => common}/FourByteChunk.cpp (100%) rename src/dis7/{ => common}/FourByteChunk.h (100%) rename src/dis7/{ => common}/TwoByteChunk.cpp (100%) rename src/dis7/{ => common}/TwoByteChunk.h (100%) rename src/dis7/{ => common}/UnsignedDISInteger.cpp (100%) rename src/dis7/{ => common}/UnsignedDISInteger.h (100%) rename src/dis7/{ => common}/VariableDatum.cpp (100%) rename src/dis7/{ => common}/VariableDatum.h (100%) rename src/dis7/{ => common}/VariableParameter.cpp (100%) rename src/dis7/{ => common}/VariableParameter.h (100%) rename src/dis7/{ => common}/VariableTransmitterParameters.cpp (100%) rename src/dis7/{ => common}/VariableTransmitterParameters.h (100%) create mode 100644 src/dis7/distributed_emissions/CMakeLists.txt rename src/dis7/{ => distributed_emissions}/DesignatorPdu.cpp (100%) rename src/dis7/{ => distributed_emissions}/DesignatorPdu.h (100%) rename src/dis7/{ => distributed_emissions}/DistributedEmissionsFamilyPdu.cpp (100%) rename src/dis7/{ => distributed_emissions}/DistributedEmissionsFamilyPdu.h (100%) rename src/dis7/{ => distributed_emissions}/ElectromagneticEmissionsPdu.cpp (100%) rename src/dis7/{ => distributed_emissions}/ElectromagneticEmissionsPdu.h (100%) rename src/dis7/{ => distributed_emissions}/IFFPdu.cpp (100%) rename src/dis7/{ => distributed_emissions}/IFFPdu.h (100%) rename src/dis7/{ => distributed_emissions}/SeesPdu.cpp (100%) rename src/dis7/{ => distributed_emissions}/SeesPdu.h (100%) rename src/dis7/{UaPdu.cpp => distributed_emissions/UnderwaterAcousticsPdu.cpp} (100%) rename src/dis7/{UaPdu.h => distributed_emissions/UnderwaterAcousticsPdu.h} (100%) rename src/dis7/{ => distributed_emissions}/VectoringNozzleSystem.cpp (100%) rename src/dis7/{ => distributed_emissions}/VectoringNozzleSystem.h (100%) rename src/dis7/{ => entity_information}/AttributePdu.cpp (100%) rename src/dis7/{ => entity_information}/AttributePdu.h (100%) create mode 100644 src/dis7/entity_information/CMakeLists.txt rename src/dis7/{ => entity_information}/CollisionElasticPdu.cpp (100%) rename src/dis7/{ => entity_information}/CollisionElasticPdu.h (100%) rename src/dis7/{ => entity_information}/CollisionPdu.cpp (100%) rename src/dis7/{ => entity_information}/CollisionPdu.h (100%) rename src/dis7/{ => entity_information}/EntityInformationFamilyPdu.cpp (100%) rename src/dis7/{ => entity_information}/EntityInformationFamilyPdu.h (100%) rename src/dis7/{ => entity_information}/EntityStatePdu.cpp (100%) rename src/dis7/{ => entity_information}/EntityStatePdu.h (100%) rename src/dis7/{ => entity_information}/EntityStateUpdatePdu.cpp (100%) rename src/dis7/{ => entity_information}/EntityStateUpdatePdu.h (100%) rename src/dis7/{ => entity_information}/FastEntityStatePdu.cpp (100%) rename src/dis7/{ => entity_information}/FastEntityStatePdu.h (100%) rename src/dis7/{ => entity_management}/EntityManagementFamilyPdu.cpp (100%) rename src/dis7/{ => entity_management}/EntityManagementFamilyPdu.h (100%) rename src/dis7/{ => entity_management}/IsPartOfPdu.cpp (100%) rename src/dis7/{ => entity_management}/IsPartOfPdu.h (100%) create mode 100644 src/dis7/logistics/CMakeLists.txt rename src/dis7/{ => logistics}/LogisticsFamilyPdu.cpp (100%) rename src/dis7/{ => logistics}/LogisticsFamilyPdu.h (100%) rename src/dis7/{ => logistics}/RepairCompletePdu.cpp (100%) rename src/dis7/{ => logistics}/RepairCompletePdu.h (100%) rename src/dis7/{ => logistics}/RepairResponsePdu.cpp (100%) rename src/dis7/{ => logistics}/RepairResponsePdu.h (100%) rename src/dis7/{ => logistics}/ResupplyOfferPdu.cpp (100%) rename src/dis7/{ => logistics}/ResupplyOfferPdu.h (100%) rename src/dis7/{ => logistics}/ResupplyReceivedPdu.cpp (100%) rename src/dis7/{ => logistics}/ResupplyReceivedPdu.h (100%) rename src/dis7/{ => logistics}/ServiceRequestPdu.cpp (100%) rename src/dis7/{ => logistics}/ServiceRequestPdu.h (100%) create mode 100644 src/dis7/minefield/CMakeLists.txt rename src/dis7/{ => minefield}/MinefieldFamilyPdu.cpp (100%) rename src/dis7/{ => minefield}/MinefieldFamilyPdu.h (100%) rename src/dis7/{ => minefield}/MinefieldResponseNackPdu.cpp (100%) rename src/dis7/{ => minefield}/MinefieldResponseNackPdu.h (100%) rename src/dis7/{ => minefield}/MinefieldStatePdu.cpp (100%) rename src/dis7/{ => minefield}/MinefieldStatePdu.h (100%) rename src/dis7/{ => minefield}/Vector2Float.cpp (100%) rename src/dis7/{ => minefield}/Vector2Float.h (100%) create mode 100644 src/dis7/radio_communications/CMakeLists.txt rename src/dis7/{ => radio_communications}/IntercomSignalPdu.cpp (100%) rename src/dis7/{ => radio_communications}/IntercomSignalPdu.h (100%) rename src/dis7/{ => radio_communications}/RadioCommunicationsFamilyPdu.cpp (100%) rename src/dis7/{ => radio_communications}/RadioCommunicationsFamilyPdu.h (100%) rename src/dis7/{ => radio_communications}/ReceiverPdu.cpp (100%) rename src/dis7/{ => radio_communications}/ReceiverPdu.h (100%) rename src/dis7/{ => simulation_management}/AcknowledgePdu.cpp (100%) rename src/dis7/{ => simulation_management}/AcknowledgePdu.h (100%) rename src/dis7/{ => simulation_management}/ActionRequestPdu.cpp (100%) rename src/dis7/{ => simulation_management}/ActionRequestPdu.h (100%) rename src/dis7/{ => simulation_management}/ActionResponsePdu.cpp (100%) rename src/dis7/{ => simulation_management}/ActionResponsePdu.h (100%) create mode 100644 src/dis7/simulation_management/CMakeLists.txt rename src/dis7/{ => simulation_management}/CommentPdu.cpp (100%) rename src/dis7/{ => simulation_management}/CommentPdu.h (100%) rename src/dis7/{ => simulation_management}/CreateEntityPdu.cpp (100%) rename src/dis7/{ => simulation_management}/CreateEntityPdu.h (100%) rename src/dis7/{ => simulation_management}/DataPdu.cpp (100%) rename src/dis7/{ => simulation_management}/DataPdu.h (100%) rename src/dis7/{ => simulation_management}/DataQueryPdu.cpp (100%) rename src/dis7/{ => simulation_management}/DataQueryPdu.h (100%) rename src/dis7/{ => simulation_management}/EventReportPdu.cpp (100%) rename src/dis7/{ => simulation_management}/EventReportPdu.h (100%) rename src/dis7/{ => simulation_management}/RemoveEntityPdu.cpp (100%) rename src/dis7/{ => simulation_management}/RemoveEntityPdu.h (100%) rename src/dis7/{ => simulation_management}/SetDataPdu.cpp (100%) rename src/dis7/{ => simulation_management}/SetDataPdu.h (100%) rename src/dis7/{ => simulation_management}/SimulationManagementFamilyPdu.cpp (100%) rename src/dis7/{ => simulation_management}/SimulationManagementFamilyPdu.h (100%) rename src/dis7/{ => simulation_management}/StartResumePdu.cpp (100%) rename src/dis7/{ => simulation_management}/StartResumePdu.h (100%) rename src/dis7/{ => simulation_management}/StopFreezePdu.cpp (100%) rename src/dis7/{ => simulation_management}/StopFreezePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/AcknowledgeReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/AcknowledgeReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/ActionRequestReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/ActionRequestReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/ActionResponseReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/ActionResponseReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/CommentReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/CommentReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/CreateEntityReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/CreateEntityReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/DataQueryReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/DataQueryReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/DataReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/DataReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/EventReportReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/EventReportReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/RecordQueryReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/RecordQueryReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/RemoveEntityReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/RemoveEntityReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/SetDataReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/SetDataReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/SimulationManagementWithReliabilityFamilyPdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/SimulationManagementWithReliabilityFamilyPdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/StartResumeReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/StartResumeReliablePdu.h (100%) rename src/dis7/{ => simulation_management_with_reliability}/StopFreezeReliablePdu.cpp (100%) rename src/dis7/{ => simulation_management_with_reliability}/StopFreezeReliablePdu.h (100%) rename src/dis7/{ => synthetic_environment}/ArealObjectStatePdu.cpp (100%) rename src/dis7/{ => synthetic_environment}/ArealObjectStatePdu.h (100%) create mode 100644 src/dis7/synthetic_environment/CMakeLists.txt rename src/dis7/{ => synthetic_environment}/LinearObjectStatePdu.cpp (100%) rename src/dis7/{ => synthetic_environment}/LinearObjectStatePdu.h (100%) rename src/dis7/{ => synthetic_environment}/PointObjectStatePdu.cpp (100%) rename src/dis7/{ => synthetic_environment}/PointObjectStatePdu.h (100%) rename src/dis7/{ => synthetic_environment}/SyntheticEnvironmentFamilyPdu.cpp (100%) rename src/dis7/{ => synthetic_environment}/SyntheticEnvironmentFamilyPdu.h (100%) create mode 100644 src/dis7/warfare/CMakeLists.txt rename src/dis7/{ => warfare}/DirectedEnergyFirePdu.cpp (100%) rename src/dis7/{ => warfare}/DirectedEnergyFirePdu.h (100%) rename src/dis7/{ => warfare}/EntityDamageStatusPdu.cpp (100%) rename src/dis7/{ => warfare}/EntityDamageStatusPdu.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d14fc46..564ef2eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.22) project(OpenDIS VERSION 1.0.1) # Build options @@ -7,7 +7,7 @@ option(BUILD_EXAMPLES "build example sender/receiver applications" OFF) option(BUILD_TESTS "build unit tests" OFF) # Enforce a C++11 compliant compiler -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/src/dis7/CMakeLists.txt b/src/dis7/CMakeLists.txt index c922d3a4..2fc0a8f1 100644 --- a/src/dis7/CMakeLists.txt +++ b/src/dis7/CMakeLists.txt @@ -1,374 +1,11 @@ add_subdirectory(utils) - -# Create list of all headers -set(dis7_hdr - AcknowledgePdu.h - AcknowledgeReliablePdu.h - AcousticEmitter.h - ActionRequestPdu.h - ActionRequestReliablePdu.h - ActionResponsePdu.h - ActionResponseReliablePdu.h - AggregateIdentifier.h - AggregateMarking.h - AggregateType.h - AngleDeception.h - AngularVelocityVector.h - AntennaLocation.h - ArealObjectStatePdu.h - ArticulatedParts.h - Association.h - AttachedParts.h - Attribute.h - AttributePdu.h - BeamAntennaPattern.h - BeamData.h - BeamStatus.h - BlankingSector.h - ClockTime.h - CollisionElasticPdu.h - CollisionPdu.h - CommentPdu.h - CommentReliablePdu.h - CommunicationsNodeID.h - CreateEntityPdu.h - CreateEntityReliablePdu.h - DataPdu.h - DataQueryDatumSpecification.h - DataQueryPdu.h - DataQueryReliablePdu.h - DataReliablePdu.h - DatumSpecification.h - DeadReckoningParameters.h - DesignatorPdu.h - DetonationPdu.h - DirectedEnergyAreaAimpoint.h - DirectedEnergyDamage.h - DirectedEnergyFirePdu.h - DirectedEnergyPrecisionAimpoint.h - DirectedEnergyTargetEnergyDeposition.h - DistributedEmissionsFamilyPdu.h - EEFundamentalParameterData.h - EightByteChunk.h - ElectromagneticEmissionBeamData.h - ElectromagneticEmissionsPdu.h - ElectromagneticEmissionSystemData.h - EmitterSystem.h - EngineFuel.h - EngineFuelReload.h - EntityAssociation.h - EntityDamageStatusPdu.h - EntityID.h - EntityInformationFamilyPdu.h - EntityManagementFamilyPdu.h - EntityMarking.h - EntityStatePdu.h - EntityStateUpdatePdu.h - EntityType.h - EntityTypeVP.h - EnvironmentGeneral.h - Environment.h - EnvironmentType.h - EulerAngles.h - EventIdentifier.h - EventIdentifierLiveEntity.h - EventReportPdu.h - EventReportReliablePdu.h - ExpendableDescriptor.h - Expendable.h - ExpendableReload.h - ExplosionDescriptor.h - FalseTargetsAttribute.h - FastEntityStatePdu.h - FirePdu.h - FixedDatum.h - FourByteChunk.h - FundamentalOperationalData.h - GridAxis.h - GroupIdentifier.h - IffDataSpecification.h - IFFFundamentalParameterData.h - IFFPdu.h - IntercomCommunicationsParameters.h - IntercomIdentifier.h - IntercomSignalPdu.h - IOCommunicationsNode.h - IOEffect.h - IsPartOfPdu.h - JammingTechnique.h - LaunchedMunitionRecord.h - LayerHeader.h - LinearObjectStatePdu.h - LinearSegmentParameter.h - LiveEntityIdentifier.h - LiveEntityPdu.h - LiveSimulationAddress.h - LogisticsFamilyPdu.h - MineEntityIdentifier.h - MinefieldFamilyPdu.h - MinefieldIdentifier.h - MinefieldResponseNackPdu.h - MinefieldStatePdu.h - ModulationParameters.h - ModulationType.h - MunitionDescriptor.h - Munition.h - MunitionReload.h - NamedLocationIdentification.h - ObjectIdentifier.h - ObjectType.h - OwnershipStatus.h - PduContainer.h - Pdu.h - PduHeader.h - PduStatus.h - PduSuperclass.h - PointObjectStatePdu.h - PropulsionSystemData.h - RadioCommunicationsFamilyPdu.h - RadioIdentifier.h - RadioType.h - ReceiverPdu.h - RecordQueryReliablePdu.h - RecordQuerySpecification.h - RecordSpecificationElement.h - RecordSpecification.h - Relationship.h - RemoveEntityPdu.h - RemoveEntityReliablePdu.h - RepairCompletePdu.h - RepairResponsePdu.h - ResupplyOfferPdu.h - ResupplyReceivedPdu.h - SecondaryOperationalData.h - SeesPdu.h - Sensor.h - SeparationVP.h - ServiceRequestPdu.h - SetDataPdu.h - SetDataReliablePdu.h - SimulationAddress.h - SimulationIdentifier.h - SimulationManagementFamilyPdu.h - SimulationManagementPduHeader.h - SimulationManagementWithReliabilityFamilyPdu.h - StandardVariableSpecification.h - StartResumePdu.h - StartResumeReliablePdu.h - StopFreezePdu.h - StopFreezeReliablePdu.h - StorageFuel.h - StorageFuelReload.h - SupplyQuantity.h - SyntheticEnvironmentFamilyPdu.h - SystemIdentifier.h - TotalRecordSets.h - TrackJamData.h - TwoByteChunk.h - UAFundamentalParameter.h - UaPdu.h - UnattachedIdentifier.h - UnsignedDISInteger.h - VariableDatum.h - VariableParameter.h - VariableTransmitterParameters.h - Vector2Float.h - Vector3Double.h - Vector3Float.h - VectoringNozzleSystem.h - WarfareFamilyPdu.h -) - -# Create list of all source files -set(dis7_src - AcknowledgePdu.cpp - AcknowledgeReliablePdu.cpp - AcousticEmitter.cpp - ActionRequestPdu.cpp - ActionRequestReliablePdu.cpp - ActionResponsePdu.cpp - ActionResponseReliablePdu.cpp - AggregateIdentifier.cpp - AggregateMarking.cpp - AggregateType.cpp - AngleDeception.cpp - AngularVelocityVector.cpp - AntennaLocation.cpp - ArealObjectStatePdu.cpp - ArticulatedParts.cpp - Association.cpp - AttachedParts.cpp - Attribute.cpp - AttributePdu.cpp - BeamAntennaPattern.cpp - BeamData.cpp - BeamStatus.cpp - BlankingSector.cpp - ClockTime.cpp - CollisionElasticPdu.cpp - CollisionPdu.cpp - CommentPdu.cpp - CommentReliablePdu.cpp - CommunicationsNodeID.cpp - CreateEntityPdu.cpp - CreateEntityReliablePdu.cpp - DataPdu.cpp - DataQueryDatumSpecification.cpp - DataQueryPdu.cpp - DataQueryReliablePdu.cpp - DataReliablePdu.cpp - DatumSpecification.cpp - DeadReckoningParameters.cpp - DesignatorPdu.cpp - DetonationPdu.cpp - DirectedEnergyAreaAimpoint.cpp - DirectedEnergyDamage.cpp - DirectedEnergyFirePdu.cpp - DirectedEnergyPrecisionAimpoint.cpp - DirectedEnergyTargetEnergyDeposition.cpp - DistributedEmissionsFamilyPdu.cpp - EEFundamentalParameterData.cpp - EightByteChunk.cpp - ElectromagneticEmissionBeamData.cpp - ElectromagneticEmissionsPdu.cpp - ElectromagneticEmissionSystemData.cpp - EmitterSystem.cpp - EngineFuel.cpp - EngineFuelReload.cpp - EntityAssociation.cpp - EntityDamageStatusPdu.cpp - EntityID.cpp - EntityInformationFamilyPdu.cpp - EntityManagementFamilyPdu.cpp - EntityMarking.cpp - EntityStatePdu.cpp - EntityStateUpdatePdu.cpp - EntityType.cpp - EntityTypeVP.cpp - Environment.cpp - EnvironmentGeneral.cpp - EnvironmentType.cpp - EulerAngles.cpp - EventIdentifier.cpp - EventIdentifierLiveEntity.cpp - EventReportPdu.cpp - EventReportReliablePdu.cpp - Expendable.cpp - ExpendableDescriptor.cpp - ExpendableReload.cpp - ExplosionDescriptor.cpp - FalseTargetsAttribute.cpp - FastEntityStatePdu.cpp - FirePdu.cpp - FixedDatum.cpp - FourByteChunk.cpp - FundamentalOperationalData.cpp - GridAxis.cpp - GroupIdentifier.cpp - IffDataSpecification.cpp - IFFFundamentalParameterData.cpp - IFFPdu.cpp - IntercomCommunicationsParameters.cpp - IntercomIdentifier.cpp - IntercomSignalPdu.cpp - IOCommunicationsNode.cpp - IOEffect.cpp - IsPartOfPdu.cpp - JammingTechnique.cpp - LaunchedMunitionRecord.cpp - LayerHeader.cpp - LinearObjectStatePdu.cpp - LinearSegmentParameter.cpp - LiveEntityIdentifier.cpp - LiveEntityPdu.cpp - LiveSimulationAddress.cpp - LogisticsFamilyPdu.cpp - MineEntityIdentifier.cpp - MinefieldFamilyPdu.cpp - MinefieldIdentifier.cpp - MinefieldResponseNackPdu.cpp - MinefieldStatePdu.cpp - ModulationParameters.cpp - ModulationType.cpp - Munition.cpp - MunitionDescriptor.cpp - MunitionReload.cpp - NamedLocationIdentification.cpp - ObjectIdentifier.cpp - ObjectType.cpp - OwnershipStatus.cpp - PduContainer.cpp - Pdu.cpp - PduHeader.cpp - PduStatus.cpp - PduSuperclass.cpp - PointObjectStatePdu.cpp - PropulsionSystemData.cpp - RadioCommunicationsFamilyPdu.cpp - RadioIdentifier.cpp - RadioType.cpp - ReceiverPdu.cpp - RecordQueryReliablePdu.cpp - RecordQuerySpecification.cpp - RecordSpecification.cpp - RecordSpecificationElement.cpp - Relationship.cpp - RemoveEntityPdu.cpp - RemoveEntityReliablePdu.cpp - RepairCompletePdu.cpp - RepairResponsePdu.cpp - ResupplyOfferPdu.cpp - ResupplyReceivedPdu.cpp - SecondaryOperationalData.cpp - SeesPdu.cpp - Sensor.cpp - SeparationVP.cpp - ServiceRequestPdu.cpp - SetDataPdu.cpp - SetDataReliablePdu.cpp - SimulationAddress.cpp - SimulationIdentifier.cpp - SimulationManagementFamilyPdu.cpp - SimulationManagementPduHeader.cpp - SimulationManagementWithReliabilityFamilyPdu.cpp - StandardVariableSpecification.cpp - StartResumePdu.cpp - StartResumeReliablePdu.cpp - StopFreezePdu.cpp - StopFreezeReliablePdu.cpp - StorageFuel.cpp - StorageFuelReload.cpp - SupplyQuantity.cpp - SyntheticEnvironmentFamilyPdu.cpp - SystemIdentifier.cpp - TotalRecordSets.cpp - TrackJamData.cpp - TwoByteChunk.cpp - UAFundamentalParameter.cpp - UaPdu.cpp - UnattachedIdentifier.cpp - UnsignedDISInteger.cpp - VariableDatum.cpp - VariableParameter.cpp - VariableTransmitterParameters.cpp - Vector2Float.cpp - Vector3Double.cpp - Vector3Float.cpp - VectoringNozzleSystem.cpp - WarfareFamilyPdu.cpp -) - -# CMake < 3.16 requires target_sources to be specified as -# absolute paths if not in the same directory as the target -# definition. If cmake_minimum_required is ever changed to -# be >= 16, this line can be removed. -list(TRANSFORM dis7_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") - -include(GenerateExportHeader) -generate_export_header(OpenDIS7) -list(APPEND dis7_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis7_export.h") - -target_sources(OpenDIS7 PRIVATE ${dis7_src}) - -install(FILES ${dis7_hdr} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis7) +add_subdirectory(distributed_emissions) +add_subdirectory(entity_information) +add_subdirectory(entity_management) +add_subdirectory(logistics) +add_subdirectory(minefield) +add_subdirectory(radio_communications) +add_subdirectory(simulation_management) +add_subdirectory(simulation_management_with_reliability) +add_subdirectory(synthetic_environment) +add_subdirectory(warfare) diff --git a/src/dis7/AcousticEmitter.cpp b/src/dis7/common/AcousticEmitter.cpp similarity index 100% rename from src/dis7/AcousticEmitter.cpp rename to src/dis7/common/AcousticEmitter.cpp diff --git a/src/dis7/AcousticEmitter.h b/src/dis7/common/AcousticEmitter.h similarity index 100% rename from src/dis7/AcousticEmitter.h rename to src/dis7/common/AcousticEmitter.h diff --git a/src/dis7/AggregateIdentifier.cpp b/src/dis7/common/AggregateIdentifier.cpp similarity index 100% rename from src/dis7/AggregateIdentifier.cpp rename to src/dis7/common/AggregateIdentifier.cpp diff --git a/src/dis7/AggregateIdentifier.h b/src/dis7/common/AggregateIdentifier.h similarity index 100% rename from src/dis7/AggregateIdentifier.h rename to src/dis7/common/AggregateIdentifier.h diff --git a/src/dis7/AggregateMarking.cpp b/src/dis7/common/AggregateMarking.cpp similarity index 100% rename from src/dis7/AggregateMarking.cpp rename to src/dis7/common/AggregateMarking.cpp diff --git a/src/dis7/AggregateMarking.h b/src/dis7/common/AggregateMarking.h similarity index 100% rename from src/dis7/AggregateMarking.h rename to src/dis7/common/AggregateMarking.h diff --git a/src/dis7/AggregateType.cpp b/src/dis7/common/AggregateType.cpp similarity index 100% rename from src/dis7/AggregateType.cpp rename to src/dis7/common/AggregateType.cpp diff --git a/src/dis7/AggregateType.h b/src/dis7/common/AggregateType.h similarity index 100% rename from src/dis7/AggregateType.h rename to src/dis7/common/AggregateType.h diff --git a/src/dis7/AngleDeception.cpp b/src/dis7/common/AngleDeception.cpp similarity index 100% rename from src/dis7/AngleDeception.cpp rename to src/dis7/common/AngleDeception.cpp diff --git a/src/dis7/AngleDeception.h b/src/dis7/common/AngleDeception.h similarity index 100% rename from src/dis7/AngleDeception.h rename to src/dis7/common/AngleDeception.h diff --git a/src/dis7/AngularVelocityVector.cpp b/src/dis7/common/AngularVelocityVector.cpp similarity index 100% rename from src/dis7/AngularVelocityVector.cpp rename to src/dis7/common/AngularVelocityVector.cpp diff --git a/src/dis7/AngularVelocityVector.h b/src/dis7/common/AngularVelocityVector.h similarity index 100% rename from src/dis7/AngularVelocityVector.h rename to src/dis7/common/AngularVelocityVector.h diff --git a/src/dis7/AntennaLocation.cpp b/src/dis7/common/AntennaLocation.cpp similarity index 100% rename from src/dis7/AntennaLocation.cpp rename to src/dis7/common/AntennaLocation.cpp diff --git a/src/dis7/AntennaLocation.h b/src/dis7/common/AntennaLocation.h similarity index 100% rename from src/dis7/AntennaLocation.h rename to src/dis7/common/AntennaLocation.h diff --git a/src/dis7/common/CMakeLists.txt b/src/dis7/common/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/DataQueryDatumSpecification.cpp b/src/dis7/common/DataQueryDatumSpecification.cpp similarity index 100% rename from src/dis7/DataQueryDatumSpecification.cpp rename to src/dis7/common/DataQueryDatumSpecification.cpp diff --git a/src/dis7/DataQueryDatumSpecification.h b/src/dis7/common/DataQueryDatumSpecification.h similarity index 100% rename from src/dis7/DataQueryDatumSpecification.h rename to src/dis7/common/DataQueryDatumSpecification.h diff --git a/src/dis7/EightByteChunk.cpp b/src/dis7/common/EightByteChunk.cpp similarity index 100% rename from src/dis7/EightByteChunk.cpp rename to src/dis7/common/EightByteChunk.cpp diff --git a/src/dis7/EightByteChunk.h b/src/dis7/common/EightByteChunk.h similarity index 100% rename from src/dis7/EightByteChunk.h rename to src/dis7/common/EightByteChunk.h diff --git a/src/dis7/FixedDatum.cpp b/src/dis7/common/FixedDatum.cpp similarity index 100% rename from src/dis7/FixedDatum.cpp rename to src/dis7/common/FixedDatum.cpp diff --git a/src/dis7/FixedDatum.h b/src/dis7/common/FixedDatum.h similarity index 100% rename from src/dis7/FixedDatum.h rename to src/dis7/common/FixedDatum.h diff --git a/src/dis7/FourByteChunk.cpp b/src/dis7/common/FourByteChunk.cpp similarity index 100% rename from src/dis7/FourByteChunk.cpp rename to src/dis7/common/FourByteChunk.cpp diff --git a/src/dis7/FourByteChunk.h b/src/dis7/common/FourByteChunk.h similarity index 100% rename from src/dis7/FourByteChunk.h rename to src/dis7/common/FourByteChunk.h diff --git a/src/dis7/TwoByteChunk.cpp b/src/dis7/common/TwoByteChunk.cpp similarity index 100% rename from src/dis7/TwoByteChunk.cpp rename to src/dis7/common/TwoByteChunk.cpp diff --git a/src/dis7/TwoByteChunk.h b/src/dis7/common/TwoByteChunk.h similarity index 100% rename from src/dis7/TwoByteChunk.h rename to src/dis7/common/TwoByteChunk.h diff --git a/src/dis7/UnsignedDISInteger.cpp b/src/dis7/common/UnsignedDISInteger.cpp similarity index 100% rename from src/dis7/UnsignedDISInteger.cpp rename to src/dis7/common/UnsignedDISInteger.cpp diff --git a/src/dis7/UnsignedDISInteger.h b/src/dis7/common/UnsignedDISInteger.h similarity index 100% rename from src/dis7/UnsignedDISInteger.h rename to src/dis7/common/UnsignedDISInteger.h diff --git a/src/dis7/VariableDatum.cpp b/src/dis7/common/VariableDatum.cpp similarity index 100% rename from src/dis7/VariableDatum.cpp rename to src/dis7/common/VariableDatum.cpp diff --git a/src/dis7/VariableDatum.h b/src/dis7/common/VariableDatum.h similarity index 100% rename from src/dis7/VariableDatum.h rename to src/dis7/common/VariableDatum.h diff --git a/src/dis7/VariableParameter.cpp b/src/dis7/common/VariableParameter.cpp similarity index 100% rename from src/dis7/VariableParameter.cpp rename to src/dis7/common/VariableParameter.cpp diff --git a/src/dis7/VariableParameter.h b/src/dis7/common/VariableParameter.h similarity index 100% rename from src/dis7/VariableParameter.h rename to src/dis7/common/VariableParameter.h diff --git a/src/dis7/VariableTransmitterParameters.cpp b/src/dis7/common/VariableTransmitterParameters.cpp similarity index 100% rename from src/dis7/VariableTransmitterParameters.cpp rename to src/dis7/common/VariableTransmitterParameters.cpp diff --git a/src/dis7/VariableTransmitterParameters.h b/src/dis7/common/VariableTransmitterParameters.h similarity index 100% rename from src/dis7/VariableTransmitterParameters.h rename to src/dis7/common/VariableTransmitterParameters.h diff --git a/src/dis7/distributed_emissions/CMakeLists.txt b/src/dis7/distributed_emissions/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/DesignatorPdu.cpp b/src/dis7/distributed_emissions/DesignatorPdu.cpp similarity index 100% rename from src/dis7/DesignatorPdu.cpp rename to src/dis7/distributed_emissions/DesignatorPdu.cpp diff --git a/src/dis7/DesignatorPdu.h b/src/dis7/distributed_emissions/DesignatorPdu.h similarity index 100% rename from src/dis7/DesignatorPdu.h rename to src/dis7/distributed_emissions/DesignatorPdu.h diff --git a/src/dis7/DistributedEmissionsFamilyPdu.cpp b/src/dis7/distributed_emissions/DistributedEmissionsFamilyPdu.cpp similarity index 100% rename from src/dis7/DistributedEmissionsFamilyPdu.cpp rename to src/dis7/distributed_emissions/DistributedEmissionsFamilyPdu.cpp diff --git a/src/dis7/DistributedEmissionsFamilyPdu.h b/src/dis7/distributed_emissions/DistributedEmissionsFamilyPdu.h similarity index 100% rename from src/dis7/DistributedEmissionsFamilyPdu.h rename to src/dis7/distributed_emissions/DistributedEmissionsFamilyPdu.h diff --git a/src/dis7/ElectromagneticEmissionsPdu.cpp b/src/dis7/distributed_emissions/ElectromagneticEmissionsPdu.cpp similarity index 100% rename from src/dis7/ElectromagneticEmissionsPdu.cpp rename to src/dis7/distributed_emissions/ElectromagneticEmissionsPdu.cpp diff --git a/src/dis7/ElectromagneticEmissionsPdu.h b/src/dis7/distributed_emissions/ElectromagneticEmissionsPdu.h similarity index 100% rename from src/dis7/ElectromagneticEmissionsPdu.h rename to src/dis7/distributed_emissions/ElectromagneticEmissionsPdu.h diff --git a/src/dis7/IFFPdu.cpp b/src/dis7/distributed_emissions/IFFPdu.cpp similarity index 100% rename from src/dis7/IFFPdu.cpp rename to src/dis7/distributed_emissions/IFFPdu.cpp diff --git a/src/dis7/IFFPdu.h b/src/dis7/distributed_emissions/IFFPdu.h similarity index 100% rename from src/dis7/IFFPdu.h rename to src/dis7/distributed_emissions/IFFPdu.h diff --git a/src/dis7/SeesPdu.cpp b/src/dis7/distributed_emissions/SeesPdu.cpp similarity index 100% rename from src/dis7/SeesPdu.cpp rename to src/dis7/distributed_emissions/SeesPdu.cpp diff --git a/src/dis7/SeesPdu.h b/src/dis7/distributed_emissions/SeesPdu.h similarity index 100% rename from src/dis7/SeesPdu.h rename to src/dis7/distributed_emissions/SeesPdu.h diff --git a/src/dis7/UaPdu.cpp b/src/dis7/distributed_emissions/UnderwaterAcousticsPdu.cpp similarity index 100% rename from src/dis7/UaPdu.cpp rename to src/dis7/distributed_emissions/UnderwaterAcousticsPdu.cpp diff --git a/src/dis7/UaPdu.h b/src/dis7/distributed_emissions/UnderwaterAcousticsPdu.h similarity index 100% rename from src/dis7/UaPdu.h rename to src/dis7/distributed_emissions/UnderwaterAcousticsPdu.h diff --git a/src/dis7/VectoringNozzleSystem.cpp b/src/dis7/distributed_emissions/VectoringNozzleSystem.cpp similarity index 100% rename from src/dis7/VectoringNozzleSystem.cpp rename to src/dis7/distributed_emissions/VectoringNozzleSystem.cpp diff --git a/src/dis7/VectoringNozzleSystem.h b/src/dis7/distributed_emissions/VectoringNozzleSystem.h similarity index 100% rename from src/dis7/VectoringNozzleSystem.h rename to src/dis7/distributed_emissions/VectoringNozzleSystem.h diff --git a/src/dis7/AttributePdu.cpp b/src/dis7/entity_information/AttributePdu.cpp similarity index 100% rename from src/dis7/AttributePdu.cpp rename to src/dis7/entity_information/AttributePdu.cpp diff --git a/src/dis7/AttributePdu.h b/src/dis7/entity_information/AttributePdu.h similarity index 100% rename from src/dis7/AttributePdu.h rename to src/dis7/entity_information/AttributePdu.h diff --git a/src/dis7/entity_information/CMakeLists.txt b/src/dis7/entity_information/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/CollisionElasticPdu.cpp b/src/dis7/entity_information/CollisionElasticPdu.cpp similarity index 100% rename from src/dis7/CollisionElasticPdu.cpp rename to src/dis7/entity_information/CollisionElasticPdu.cpp diff --git a/src/dis7/CollisionElasticPdu.h b/src/dis7/entity_information/CollisionElasticPdu.h similarity index 100% rename from src/dis7/CollisionElasticPdu.h rename to src/dis7/entity_information/CollisionElasticPdu.h diff --git a/src/dis7/CollisionPdu.cpp b/src/dis7/entity_information/CollisionPdu.cpp similarity index 100% rename from src/dis7/CollisionPdu.cpp rename to src/dis7/entity_information/CollisionPdu.cpp diff --git a/src/dis7/CollisionPdu.h b/src/dis7/entity_information/CollisionPdu.h similarity index 100% rename from src/dis7/CollisionPdu.h rename to src/dis7/entity_information/CollisionPdu.h diff --git a/src/dis7/EntityInformationFamilyPdu.cpp b/src/dis7/entity_information/EntityInformationFamilyPdu.cpp similarity index 100% rename from src/dis7/EntityInformationFamilyPdu.cpp rename to src/dis7/entity_information/EntityInformationFamilyPdu.cpp diff --git a/src/dis7/EntityInformationFamilyPdu.h b/src/dis7/entity_information/EntityInformationFamilyPdu.h similarity index 100% rename from src/dis7/EntityInformationFamilyPdu.h rename to src/dis7/entity_information/EntityInformationFamilyPdu.h diff --git a/src/dis7/EntityStatePdu.cpp b/src/dis7/entity_information/EntityStatePdu.cpp similarity index 100% rename from src/dis7/EntityStatePdu.cpp rename to src/dis7/entity_information/EntityStatePdu.cpp diff --git a/src/dis7/EntityStatePdu.h b/src/dis7/entity_information/EntityStatePdu.h similarity index 100% rename from src/dis7/EntityStatePdu.h rename to src/dis7/entity_information/EntityStatePdu.h diff --git a/src/dis7/EntityStateUpdatePdu.cpp b/src/dis7/entity_information/EntityStateUpdatePdu.cpp similarity index 100% rename from src/dis7/EntityStateUpdatePdu.cpp rename to src/dis7/entity_information/EntityStateUpdatePdu.cpp diff --git a/src/dis7/EntityStateUpdatePdu.h b/src/dis7/entity_information/EntityStateUpdatePdu.h similarity index 100% rename from src/dis7/EntityStateUpdatePdu.h rename to src/dis7/entity_information/EntityStateUpdatePdu.h diff --git a/src/dis7/FastEntityStatePdu.cpp b/src/dis7/entity_information/FastEntityStatePdu.cpp similarity index 100% rename from src/dis7/FastEntityStatePdu.cpp rename to src/dis7/entity_information/FastEntityStatePdu.cpp diff --git a/src/dis7/FastEntityStatePdu.h b/src/dis7/entity_information/FastEntityStatePdu.h similarity index 100% rename from src/dis7/FastEntityStatePdu.h rename to src/dis7/entity_information/FastEntityStatePdu.h diff --git a/src/dis7/EntityManagementFamilyPdu.cpp b/src/dis7/entity_management/EntityManagementFamilyPdu.cpp similarity index 100% rename from src/dis7/EntityManagementFamilyPdu.cpp rename to src/dis7/entity_management/EntityManagementFamilyPdu.cpp diff --git a/src/dis7/EntityManagementFamilyPdu.h b/src/dis7/entity_management/EntityManagementFamilyPdu.h similarity index 100% rename from src/dis7/EntityManagementFamilyPdu.h rename to src/dis7/entity_management/EntityManagementFamilyPdu.h diff --git a/src/dis7/IsPartOfPdu.cpp b/src/dis7/entity_management/IsPartOfPdu.cpp similarity index 100% rename from src/dis7/IsPartOfPdu.cpp rename to src/dis7/entity_management/IsPartOfPdu.cpp diff --git a/src/dis7/IsPartOfPdu.h b/src/dis7/entity_management/IsPartOfPdu.h similarity index 100% rename from src/dis7/IsPartOfPdu.h rename to src/dis7/entity_management/IsPartOfPdu.h diff --git a/src/dis7/logistics/CMakeLists.txt b/src/dis7/logistics/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/LogisticsFamilyPdu.cpp b/src/dis7/logistics/LogisticsFamilyPdu.cpp similarity index 100% rename from src/dis7/LogisticsFamilyPdu.cpp rename to src/dis7/logistics/LogisticsFamilyPdu.cpp diff --git a/src/dis7/LogisticsFamilyPdu.h b/src/dis7/logistics/LogisticsFamilyPdu.h similarity index 100% rename from src/dis7/LogisticsFamilyPdu.h rename to src/dis7/logistics/LogisticsFamilyPdu.h diff --git a/src/dis7/RepairCompletePdu.cpp b/src/dis7/logistics/RepairCompletePdu.cpp similarity index 100% rename from src/dis7/RepairCompletePdu.cpp rename to src/dis7/logistics/RepairCompletePdu.cpp diff --git a/src/dis7/RepairCompletePdu.h b/src/dis7/logistics/RepairCompletePdu.h similarity index 100% rename from src/dis7/RepairCompletePdu.h rename to src/dis7/logistics/RepairCompletePdu.h diff --git a/src/dis7/RepairResponsePdu.cpp b/src/dis7/logistics/RepairResponsePdu.cpp similarity index 100% rename from src/dis7/RepairResponsePdu.cpp rename to src/dis7/logistics/RepairResponsePdu.cpp diff --git a/src/dis7/RepairResponsePdu.h b/src/dis7/logistics/RepairResponsePdu.h similarity index 100% rename from src/dis7/RepairResponsePdu.h rename to src/dis7/logistics/RepairResponsePdu.h diff --git a/src/dis7/ResupplyOfferPdu.cpp b/src/dis7/logistics/ResupplyOfferPdu.cpp similarity index 100% rename from src/dis7/ResupplyOfferPdu.cpp rename to src/dis7/logistics/ResupplyOfferPdu.cpp diff --git a/src/dis7/ResupplyOfferPdu.h b/src/dis7/logistics/ResupplyOfferPdu.h similarity index 100% rename from src/dis7/ResupplyOfferPdu.h rename to src/dis7/logistics/ResupplyOfferPdu.h diff --git a/src/dis7/ResupplyReceivedPdu.cpp b/src/dis7/logistics/ResupplyReceivedPdu.cpp similarity index 100% rename from src/dis7/ResupplyReceivedPdu.cpp rename to src/dis7/logistics/ResupplyReceivedPdu.cpp diff --git a/src/dis7/ResupplyReceivedPdu.h b/src/dis7/logistics/ResupplyReceivedPdu.h similarity index 100% rename from src/dis7/ResupplyReceivedPdu.h rename to src/dis7/logistics/ResupplyReceivedPdu.h diff --git a/src/dis7/ServiceRequestPdu.cpp b/src/dis7/logistics/ServiceRequestPdu.cpp similarity index 100% rename from src/dis7/ServiceRequestPdu.cpp rename to src/dis7/logistics/ServiceRequestPdu.cpp diff --git a/src/dis7/ServiceRequestPdu.h b/src/dis7/logistics/ServiceRequestPdu.h similarity index 100% rename from src/dis7/ServiceRequestPdu.h rename to src/dis7/logistics/ServiceRequestPdu.h diff --git a/src/dis7/minefield/CMakeLists.txt b/src/dis7/minefield/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/MinefieldFamilyPdu.cpp b/src/dis7/minefield/MinefieldFamilyPdu.cpp similarity index 100% rename from src/dis7/MinefieldFamilyPdu.cpp rename to src/dis7/minefield/MinefieldFamilyPdu.cpp diff --git a/src/dis7/MinefieldFamilyPdu.h b/src/dis7/minefield/MinefieldFamilyPdu.h similarity index 100% rename from src/dis7/MinefieldFamilyPdu.h rename to src/dis7/minefield/MinefieldFamilyPdu.h diff --git a/src/dis7/MinefieldResponseNackPdu.cpp b/src/dis7/minefield/MinefieldResponseNackPdu.cpp similarity index 100% rename from src/dis7/MinefieldResponseNackPdu.cpp rename to src/dis7/minefield/MinefieldResponseNackPdu.cpp diff --git a/src/dis7/MinefieldResponseNackPdu.h b/src/dis7/minefield/MinefieldResponseNackPdu.h similarity index 100% rename from src/dis7/MinefieldResponseNackPdu.h rename to src/dis7/minefield/MinefieldResponseNackPdu.h diff --git a/src/dis7/MinefieldStatePdu.cpp b/src/dis7/minefield/MinefieldStatePdu.cpp similarity index 100% rename from src/dis7/MinefieldStatePdu.cpp rename to src/dis7/minefield/MinefieldStatePdu.cpp diff --git a/src/dis7/MinefieldStatePdu.h b/src/dis7/minefield/MinefieldStatePdu.h similarity index 100% rename from src/dis7/MinefieldStatePdu.h rename to src/dis7/minefield/MinefieldStatePdu.h diff --git a/src/dis7/Vector2Float.cpp b/src/dis7/minefield/Vector2Float.cpp similarity index 100% rename from src/dis7/Vector2Float.cpp rename to src/dis7/minefield/Vector2Float.cpp diff --git a/src/dis7/Vector2Float.h b/src/dis7/minefield/Vector2Float.h similarity index 100% rename from src/dis7/Vector2Float.h rename to src/dis7/minefield/Vector2Float.h diff --git a/src/dis7/radio_communications/CMakeLists.txt b/src/dis7/radio_communications/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/IntercomSignalPdu.cpp b/src/dis7/radio_communications/IntercomSignalPdu.cpp similarity index 100% rename from src/dis7/IntercomSignalPdu.cpp rename to src/dis7/radio_communications/IntercomSignalPdu.cpp diff --git a/src/dis7/IntercomSignalPdu.h b/src/dis7/radio_communications/IntercomSignalPdu.h similarity index 100% rename from src/dis7/IntercomSignalPdu.h rename to src/dis7/radio_communications/IntercomSignalPdu.h diff --git a/src/dis7/RadioCommunicationsFamilyPdu.cpp b/src/dis7/radio_communications/RadioCommunicationsFamilyPdu.cpp similarity index 100% rename from src/dis7/RadioCommunicationsFamilyPdu.cpp rename to src/dis7/radio_communications/RadioCommunicationsFamilyPdu.cpp diff --git a/src/dis7/RadioCommunicationsFamilyPdu.h b/src/dis7/radio_communications/RadioCommunicationsFamilyPdu.h similarity index 100% rename from src/dis7/RadioCommunicationsFamilyPdu.h rename to src/dis7/radio_communications/RadioCommunicationsFamilyPdu.h diff --git a/src/dis7/ReceiverPdu.cpp b/src/dis7/radio_communications/ReceiverPdu.cpp similarity index 100% rename from src/dis7/ReceiverPdu.cpp rename to src/dis7/radio_communications/ReceiverPdu.cpp diff --git a/src/dis7/ReceiverPdu.h b/src/dis7/radio_communications/ReceiverPdu.h similarity index 100% rename from src/dis7/ReceiverPdu.h rename to src/dis7/radio_communications/ReceiverPdu.h diff --git a/src/dis7/AcknowledgePdu.cpp b/src/dis7/simulation_management/AcknowledgePdu.cpp similarity index 100% rename from src/dis7/AcknowledgePdu.cpp rename to src/dis7/simulation_management/AcknowledgePdu.cpp diff --git a/src/dis7/AcknowledgePdu.h b/src/dis7/simulation_management/AcknowledgePdu.h similarity index 100% rename from src/dis7/AcknowledgePdu.h rename to src/dis7/simulation_management/AcknowledgePdu.h diff --git a/src/dis7/ActionRequestPdu.cpp b/src/dis7/simulation_management/ActionRequestPdu.cpp similarity index 100% rename from src/dis7/ActionRequestPdu.cpp rename to src/dis7/simulation_management/ActionRequestPdu.cpp diff --git a/src/dis7/ActionRequestPdu.h b/src/dis7/simulation_management/ActionRequestPdu.h similarity index 100% rename from src/dis7/ActionRequestPdu.h rename to src/dis7/simulation_management/ActionRequestPdu.h diff --git a/src/dis7/ActionResponsePdu.cpp b/src/dis7/simulation_management/ActionResponsePdu.cpp similarity index 100% rename from src/dis7/ActionResponsePdu.cpp rename to src/dis7/simulation_management/ActionResponsePdu.cpp diff --git a/src/dis7/ActionResponsePdu.h b/src/dis7/simulation_management/ActionResponsePdu.h similarity index 100% rename from src/dis7/ActionResponsePdu.h rename to src/dis7/simulation_management/ActionResponsePdu.h diff --git a/src/dis7/simulation_management/CMakeLists.txt b/src/dis7/simulation_management/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/CommentPdu.cpp b/src/dis7/simulation_management/CommentPdu.cpp similarity index 100% rename from src/dis7/CommentPdu.cpp rename to src/dis7/simulation_management/CommentPdu.cpp diff --git a/src/dis7/CommentPdu.h b/src/dis7/simulation_management/CommentPdu.h similarity index 100% rename from src/dis7/CommentPdu.h rename to src/dis7/simulation_management/CommentPdu.h diff --git a/src/dis7/CreateEntityPdu.cpp b/src/dis7/simulation_management/CreateEntityPdu.cpp similarity index 100% rename from src/dis7/CreateEntityPdu.cpp rename to src/dis7/simulation_management/CreateEntityPdu.cpp diff --git a/src/dis7/CreateEntityPdu.h b/src/dis7/simulation_management/CreateEntityPdu.h similarity index 100% rename from src/dis7/CreateEntityPdu.h rename to src/dis7/simulation_management/CreateEntityPdu.h diff --git a/src/dis7/DataPdu.cpp b/src/dis7/simulation_management/DataPdu.cpp similarity index 100% rename from src/dis7/DataPdu.cpp rename to src/dis7/simulation_management/DataPdu.cpp diff --git a/src/dis7/DataPdu.h b/src/dis7/simulation_management/DataPdu.h similarity index 100% rename from src/dis7/DataPdu.h rename to src/dis7/simulation_management/DataPdu.h diff --git a/src/dis7/DataQueryPdu.cpp b/src/dis7/simulation_management/DataQueryPdu.cpp similarity index 100% rename from src/dis7/DataQueryPdu.cpp rename to src/dis7/simulation_management/DataQueryPdu.cpp diff --git a/src/dis7/DataQueryPdu.h b/src/dis7/simulation_management/DataQueryPdu.h similarity index 100% rename from src/dis7/DataQueryPdu.h rename to src/dis7/simulation_management/DataQueryPdu.h diff --git a/src/dis7/EventReportPdu.cpp b/src/dis7/simulation_management/EventReportPdu.cpp similarity index 100% rename from src/dis7/EventReportPdu.cpp rename to src/dis7/simulation_management/EventReportPdu.cpp diff --git a/src/dis7/EventReportPdu.h b/src/dis7/simulation_management/EventReportPdu.h similarity index 100% rename from src/dis7/EventReportPdu.h rename to src/dis7/simulation_management/EventReportPdu.h diff --git a/src/dis7/RemoveEntityPdu.cpp b/src/dis7/simulation_management/RemoveEntityPdu.cpp similarity index 100% rename from src/dis7/RemoveEntityPdu.cpp rename to src/dis7/simulation_management/RemoveEntityPdu.cpp diff --git a/src/dis7/RemoveEntityPdu.h b/src/dis7/simulation_management/RemoveEntityPdu.h similarity index 100% rename from src/dis7/RemoveEntityPdu.h rename to src/dis7/simulation_management/RemoveEntityPdu.h diff --git a/src/dis7/SetDataPdu.cpp b/src/dis7/simulation_management/SetDataPdu.cpp similarity index 100% rename from src/dis7/SetDataPdu.cpp rename to src/dis7/simulation_management/SetDataPdu.cpp diff --git a/src/dis7/SetDataPdu.h b/src/dis7/simulation_management/SetDataPdu.h similarity index 100% rename from src/dis7/SetDataPdu.h rename to src/dis7/simulation_management/SetDataPdu.h diff --git a/src/dis7/SimulationManagementFamilyPdu.cpp b/src/dis7/simulation_management/SimulationManagementFamilyPdu.cpp similarity index 100% rename from src/dis7/SimulationManagementFamilyPdu.cpp rename to src/dis7/simulation_management/SimulationManagementFamilyPdu.cpp diff --git a/src/dis7/SimulationManagementFamilyPdu.h b/src/dis7/simulation_management/SimulationManagementFamilyPdu.h similarity index 100% rename from src/dis7/SimulationManagementFamilyPdu.h rename to src/dis7/simulation_management/SimulationManagementFamilyPdu.h diff --git a/src/dis7/StartResumePdu.cpp b/src/dis7/simulation_management/StartResumePdu.cpp similarity index 100% rename from src/dis7/StartResumePdu.cpp rename to src/dis7/simulation_management/StartResumePdu.cpp diff --git a/src/dis7/StartResumePdu.h b/src/dis7/simulation_management/StartResumePdu.h similarity index 100% rename from src/dis7/StartResumePdu.h rename to src/dis7/simulation_management/StartResumePdu.h diff --git a/src/dis7/StopFreezePdu.cpp b/src/dis7/simulation_management/StopFreezePdu.cpp similarity index 100% rename from src/dis7/StopFreezePdu.cpp rename to src/dis7/simulation_management/StopFreezePdu.cpp diff --git a/src/dis7/StopFreezePdu.h b/src/dis7/simulation_management/StopFreezePdu.h similarity index 100% rename from src/dis7/StopFreezePdu.h rename to src/dis7/simulation_management/StopFreezePdu.h diff --git a/src/dis7/AcknowledgeReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/AcknowledgeReliablePdu.cpp similarity index 100% rename from src/dis7/AcknowledgeReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/AcknowledgeReliablePdu.cpp diff --git a/src/dis7/AcknowledgeReliablePdu.h b/src/dis7/simulation_management_with_reliability/AcknowledgeReliablePdu.h similarity index 100% rename from src/dis7/AcknowledgeReliablePdu.h rename to src/dis7/simulation_management_with_reliability/AcknowledgeReliablePdu.h diff --git a/src/dis7/ActionRequestReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/ActionRequestReliablePdu.cpp similarity index 100% rename from src/dis7/ActionRequestReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/ActionRequestReliablePdu.cpp diff --git a/src/dis7/ActionRequestReliablePdu.h b/src/dis7/simulation_management_with_reliability/ActionRequestReliablePdu.h similarity index 100% rename from src/dis7/ActionRequestReliablePdu.h rename to src/dis7/simulation_management_with_reliability/ActionRequestReliablePdu.h diff --git a/src/dis7/ActionResponseReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/ActionResponseReliablePdu.cpp similarity index 100% rename from src/dis7/ActionResponseReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/ActionResponseReliablePdu.cpp diff --git a/src/dis7/ActionResponseReliablePdu.h b/src/dis7/simulation_management_with_reliability/ActionResponseReliablePdu.h similarity index 100% rename from src/dis7/ActionResponseReliablePdu.h rename to src/dis7/simulation_management_with_reliability/ActionResponseReliablePdu.h diff --git a/src/dis7/CommentReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/CommentReliablePdu.cpp similarity index 100% rename from src/dis7/CommentReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/CommentReliablePdu.cpp diff --git a/src/dis7/CommentReliablePdu.h b/src/dis7/simulation_management_with_reliability/CommentReliablePdu.h similarity index 100% rename from src/dis7/CommentReliablePdu.h rename to src/dis7/simulation_management_with_reliability/CommentReliablePdu.h diff --git a/src/dis7/CreateEntityReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/CreateEntityReliablePdu.cpp similarity index 100% rename from src/dis7/CreateEntityReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/CreateEntityReliablePdu.cpp diff --git a/src/dis7/CreateEntityReliablePdu.h b/src/dis7/simulation_management_with_reliability/CreateEntityReliablePdu.h similarity index 100% rename from src/dis7/CreateEntityReliablePdu.h rename to src/dis7/simulation_management_with_reliability/CreateEntityReliablePdu.h diff --git a/src/dis7/DataQueryReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/DataQueryReliablePdu.cpp similarity index 100% rename from src/dis7/DataQueryReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/DataQueryReliablePdu.cpp diff --git a/src/dis7/DataQueryReliablePdu.h b/src/dis7/simulation_management_with_reliability/DataQueryReliablePdu.h similarity index 100% rename from src/dis7/DataQueryReliablePdu.h rename to src/dis7/simulation_management_with_reliability/DataQueryReliablePdu.h diff --git a/src/dis7/DataReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/DataReliablePdu.cpp similarity index 100% rename from src/dis7/DataReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/DataReliablePdu.cpp diff --git a/src/dis7/DataReliablePdu.h b/src/dis7/simulation_management_with_reliability/DataReliablePdu.h similarity index 100% rename from src/dis7/DataReliablePdu.h rename to src/dis7/simulation_management_with_reliability/DataReliablePdu.h diff --git a/src/dis7/EventReportReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/EventReportReliablePdu.cpp similarity index 100% rename from src/dis7/EventReportReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/EventReportReliablePdu.cpp diff --git a/src/dis7/EventReportReliablePdu.h b/src/dis7/simulation_management_with_reliability/EventReportReliablePdu.h similarity index 100% rename from src/dis7/EventReportReliablePdu.h rename to src/dis7/simulation_management_with_reliability/EventReportReliablePdu.h diff --git a/src/dis7/RecordQueryReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/RecordQueryReliablePdu.cpp similarity index 100% rename from src/dis7/RecordQueryReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/RecordQueryReliablePdu.cpp diff --git a/src/dis7/RecordQueryReliablePdu.h b/src/dis7/simulation_management_with_reliability/RecordQueryReliablePdu.h similarity index 100% rename from src/dis7/RecordQueryReliablePdu.h rename to src/dis7/simulation_management_with_reliability/RecordQueryReliablePdu.h diff --git a/src/dis7/RemoveEntityReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/RemoveEntityReliablePdu.cpp similarity index 100% rename from src/dis7/RemoveEntityReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/RemoveEntityReliablePdu.cpp diff --git a/src/dis7/RemoveEntityReliablePdu.h b/src/dis7/simulation_management_with_reliability/RemoveEntityReliablePdu.h similarity index 100% rename from src/dis7/RemoveEntityReliablePdu.h rename to src/dis7/simulation_management_with_reliability/RemoveEntityReliablePdu.h diff --git a/src/dis7/SetDataReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/SetDataReliablePdu.cpp similarity index 100% rename from src/dis7/SetDataReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/SetDataReliablePdu.cpp diff --git a/src/dis7/SetDataReliablePdu.h b/src/dis7/simulation_management_with_reliability/SetDataReliablePdu.h similarity index 100% rename from src/dis7/SetDataReliablePdu.h rename to src/dis7/simulation_management_with_reliability/SetDataReliablePdu.h diff --git a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp b/src/dis7/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.cpp similarity index 100% rename from src/dis7/SimulationManagementWithReliabilityFamilyPdu.cpp rename to src/dis7/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.cpp diff --git a/src/dis7/SimulationManagementWithReliabilityFamilyPdu.h b/src/dis7/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h similarity index 100% rename from src/dis7/SimulationManagementWithReliabilityFamilyPdu.h rename to src/dis7/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h diff --git a/src/dis7/StartResumeReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/StartResumeReliablePdu.cpp similarity index 100% rename from src/dis7/StartResumeReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/StartResumeReliablePdu.cpp diff --git a/src/dis7/StartResumeReliablePdu.h b/src/dis7/simulation_management_with_reliability/StartResumeReliablePdu.h similarity index 100% rename from src/dis7/StartResumeReliablePdu.h rename to src/dis7/simulation_management_with_reliability/StartResumeReliablePdu.h diff --git a/src/dis7/StopFreezeReliablePdu.cpp b/src/dis7/simulation_management_with_reliability/StopFreezeReliablePdu.cpp similarity index 100% rename from src/dis7/StopFreezeReliablePdu.cpp rename to src/dis7/simulation_management_with_reliability/StopFreezeReliablePdu.cpp diff --git a/src/dis7/StopFreezeReliablePdu.h b/src/dis7/simulation_management_with_reliability/StopFreezeReliablePdu.h similarity index 100% rename from src/dis7/StopFreezeReliablePdu.h rename to src/dis7/simulation_management_with_reliability/StopFreezeReliablePdu.h diff --git a/src/dis7/ArealObjectStatePdu.cpp b/src/dis7/synthetic_environment/ArealObjectStatePdu.cpp similarity index 100% rename from src/dis7/ArealObjectStatePdu.cpp rename to src/dis7/synthetic_environment/ArealObjectStatePdu.cpp diff --git a/src/dis7/ArealObjectStatePdu.h b/src/dis7/synthetic_environment/ArealObjectStatePdu.h similarity index 100% rename from src/dis7/ArealObjectStatePdu.h rename to src/dis7/synthetic_environment/ArealObjectStatePdu.h diff --git a/src/dis7/synthetic_environment/CMakeLists.txt b/src/dis7/synthetic_environment/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/LinearObjectStatePdu.cpp b/src/dis7/synthetic_environment/LinearObjectStatePdu.cpp similarity index 100% rename from src/dis7/LinearObjectStatePdu.cpp rename to src/dis7/synthetic_environment/LinearObjectStatePdu.cpp diff --git a/src/dis7/LinearObjectStatePdu.h b/src/dis7/synthetic_environment/LinearObjectStatePdu.h similarity index 100% rename from src/dis7/LinearObjectStatePdu.h rename to src/dis7/synthetic_environment/LinearObjectStatePdu.h diff --git a/src/dis7/PointObjectStatePdu.cpp b/src/dis7/synthetic_environment/PointObjectStatePdu.cpp similarity index 100% rename from src/dis7/PointObjectStatePdu.cpp rename to src/dis7/synthetic_environment/PointObjectStatePdu.cpp diff --git a/src/dis7/PointObjectStatePdu.h b/src/dis7/synthetic_environment/PointObjectStatePdu.h similarity index 100% rename from src/dis7/PointObjectStatePdu.h rename to src/dis7/synthetic_environment/PointObjectStatePdu.h diff --git a/src/dis7/SyntheticEnvironmentFamilyPdu.cpp b/src/dis7/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp similarity index 100% rename from src/dis7/SyntheticEnvironmentFamilyPdu.cpp rename to src/dis7/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp diff --git a/src/dis7/SyntheticEnvironmentFamilyPdu.h b/src/dis7/synthetic_environment/SyntheticEnvironmentFamilyPdu.h similarity index 100% rename from src/dis7/SyntheticEnvironmentFamilyPdu.h rename to src/dis7/synthetic_environment/SyntheticEnvironmentFamilyPdu.h diff --git a/src/dis7/warfare/CMakeLists.txt b/src/dis7/warfare/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/DirectedEnergyFirePdu.cpp b/src/dis7/warfare/DirectedEnergyFirePdu.cpp similarity index 100% rename from src/dis7/DirectedEnergyFirePdu.cpp rename to src/dis7/warfare/DirectedEnergyFirePdu.cpp diff --git a/src/dis7/DirectedEnergyFirePdu.h b/src/dis7/warfare/DirectedEnergyFirePdu.h similarity index 100% rename from src/dis7/DirectedEnergyFirePdu.h rename to src/dis7/warfare/DirectedEnergyFirePdu.h diff --git a/src/dis7/EntityDamageStatusPdu.cpp b/src/dis7/warfare/EntityDamageStatusPdu.cpp similarity index 100% rename from src/dis7/EntityDamageStatusPdu.cpp rename to src/dis7/warfare/EntityDamageStatusPdu.cpp diff --git a/src/dis7/EntityDamageStatusPdu.h b/src/dis7/warfare/EntityDamageStatusPdu.h similarity index 100% rename from src/dis7/EntityDamageStatusPdu.h rename to src/dis7/warfare/EntityDamageStatusPdu.h From c70b84b9287176104f71567eaf71553f11b65f9b Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Fri, 19 Jan 2024 14:47:20 -0600 Subject: [PATCH 15/22] Moved all DIS7 source files into more organized dir structure --- src/dis7/{ => common}/ArticulatedParts.cpp | 0 src/dis7/{ => common}/ArticulatedParts.h | 0 src/dis7/{ => common}/Association.cpp | 0 src/dis7/{ => common}/Association.h | 0 src/dis7/{ => common}/AttachedParts.cpp | 0 src/dis7/{ => common}/AttachedParts.h | 0 src/dis7/{ => common}/Attribute.cpp | 0 src/dis7/{ => common}/Attribute.h | 0 src/dis7/{ => common}/BeamAntennaPattern.cpp | 0 src/dis7/{ => common}/BeamAntennaPattern.h | 0 src/dis7/{ => common}/BeamStatus.cpp | 0 src/dis7/{ => common}/BeamStatus.h | 0 src/dis7/{ => common}/BlankingSector.cpp | 0 src/dis7/{ => common}/BlankingSector.h | 0 src/dis7/{ => common}/CommunicationsNodeID.cpp | 0 src/dis7/{ => common}/CommunicationsNodeID.h | 0 src/dis7/{ => common}/DatumSpecification.cpp | 0 src/dis7/{ => common}/DatumSpecification.h | 0 src/dis7/{ => common}/DirectedEnergyAreaAimpoint.cpp | 0 src/dis7/{ => common}/DirectedEnergyAreaAimpoint.h | 0 src/dis7/{ => common}/DirectedEnergyPrecisionAimpoint.cpp | 0 src/dis7/{ => common}/DirectedEnergyPrecisionAimpoint.h | 0 src/dis7/{ => common}/DirectedEnergyTargetEnergyDeposition.cpp | 0 src/dis7/{ => common}/DirectedEnergyTargetEnergyDeposition.h | 0 src/dis7/{ => common}/EngineFuel.cpp | 0 src/dis7/{ => common}/EngineFuel.h | 0 src/dis7/{ => common}/EngineFuelReload.cpp | 0 src/dis7/{ => common}/EngineFuelReload.h | 0 src/dis7/{ => common}/EntityAssociation.cpp | 0 src/dis7/{ => common}/EntityAssociation.h | 0 src/dis7/{ => common}/EntityTypeVP.cpp | 0 src/dis7/{ => common}/EntityTypeVP.h | 0 src/dis7/{ => common}/Environment.cpp | 0 src/dis7/{ => common}/Environment.h | 0 src/dis7/{ => common}/EnvironmentGeneral.cpp | 0 src/dis7/{ => common}/EnvironmentGeneral.h | 0 src/dis7/{ => common}/EnvironmentType.cpp | 0 src/dis7/{ => common}/EnvironmentType.h | 0 src/dis7/{ => common}/EulerAngles.cpp | 0 src/dis7/{ => common}/EulerAngles.h | 0 src/dis7/{ => common}/EventIdentifier.cpp | 0 src/dis7/{ => common}/EventIdentifier.h | 0 src/dis7/{ => common}/EventIdentifierLiveEntity.cpp | 0 src/dis7/{ => common}/EventIdentifierLiveEntity.h | 0 src/dis7/{ => common}/Expendable.cpp | 0 src/dis7/{ => common}/Expendable.h | 0 src/dis7/{ => common}/ExpendableDescriptor.cpp | 0 src/dis7/{ => common}/ExpendableDescriptor.h | 0 src/dis7/{ => common}/ExpendableReload.cpp | 0 src/dis7/{ => common}/ExpendableReload.h | 0 src/dis7/{ => common}/ExplosionDescriptor.cpp | 0 src/dis7/{ => common}/ExplosionDescriptor.h | 0 src/dis7/{ => common}/FalseTargetsAttribute.cpp | 0 src/dis7/{ => common}/FalseTargetsAttribute.h | 0 src/dis7/{ => common}/GridAxis.cpp | 0 src/dis7/{ => common}/GridAxis.h | 0 src/dis7/{ => common}/GroupIdentifier.cpp | 0 src/dis7/{ => common}/GroupIdentifier.h | 0 src/dis7/{ => common}/IOCommunicationsNode.cpp | 0 src/dis7/{ => common}/IOCommunicationsNode.h | 0 src/dis7/{ => common}/IOEffect.cpp | 0 src/dis7/{ => common}/IOEffect.h | 0 src/dis7/{ => common}/IffDataSpecification.cpp | 0 src/dis7/{ => common}/IffDataSpecification.h | 0 src/dis7/{ => common}/IntercomCommunicationsParameters.cpp | 0 src/dis7/{ => common}/IntercomCommunicationsParameters.h | 0 src/dis7/{ => common}/IntercomIdentifier.cpp | 0 src/dis7/{ => common}/IntercomIdentifier.h | 0 src/dis7/{ => common}/LaunchedMunitionRecord.cpp | 0 src/dis7/{ => common}/LaunchedMunitionRecord.h | 0 src/dis7/{ => common}/LiveEntityIdentifier.cpp | 0 src/dis7/{ => common}/LiveEntityIdentifier.h | 0 src/dis7/{ => common}/LiveEntityPdu.cpp | 0 src/dis7/{ => common}/LiveEntityPdu.h | 0 src/dis7/{ => common}/LiveSimulationAddress.cpp | 0 src/dis7/{ => common}/LiveSimulationAddress.h | 0 src/dis7/{ => common}/MineEntityIdentifier.cpp | 0 src/dis7/{ => common}/MineEntityIdentifier.h | 0 src/dis7/{ => common}/ModulationParameters.cpp | 0 src/dis7/{ => common}/ModulationParameters.h | 0 src/dis7/{ => common}/ModulationType.cpp | 0 src/dis7/{ => common}/ModulationType.h | 0 src/dis7/{ => common}/Munition.cpp | 0 src/dis7/{ => common}/Munition.h | 0 src/dis7/{ => common}/MunitionReload.cpp | 0 src/dis7/{ => common}/MunitionReload.h | 0 src/dis7/{ => common}/ObjectIdentifier.cpp | 0 src/dis7/{ => common}/ObjectIdentifier.h | 0 src/dis7/{ => common}/OwnershipStatus.cpp | 0 src/dis7/{ => common}/OwnershipStatus.h | 0 src/dis7/{ => common}/PduContainer.cpp | 0 src/dis7/{ => common}/PduContainer.h | 0 src/dis7/{ => common}/PduHeader.cpp | 0 src/dis7/{ => common}/PduHeader.h | 0 src/dis7/{ => common}/PduStatus.cpp | 0 src/dis7/{ => common}/PduStatus.h | 0 src/dis7/{ => common}/PduSuperclass.cpp | 0 src/dis7/{ => common}/PduSuperclass.h | 0 src/dis7/{ => common}/RadioIdentifier.cpp | 0 src/dis7/{ => common}/RadioIdentifier.h | 0 src/dis7/{ => common}/RadioType.cpp | 0 src/dis7/{ => common}/RadioType.h | 0 src/dis7/{ => common}/RecordQuerySpecification.cpp | 0 src/dis7/{ => common}/RecordQuerySpecification.h | 0 src/dis7/{ => common}/RecordSpecification.cpp | 0 src/dis7/{ => common}/RecordSpecification.h | 0 src/dis7/{ => common}/RecordSpecificationElement.cpp | 0 src/dis7/{ => common}/RecordSpecificationElement.h | 0 src/dis7/{ => common}/Sensor.cpp | 0 src/dis7/{ => common}/Sensor.h | 0 src/dis7/{ => common}/SeparationVP.cpp | 0 src/dis7/{ => common}/SeparationVP.h | 0 src/dis7/{ => common}/SimulationIdentifier.cpp | 0 src/dis7/{ => common}/SimulationIdentifier.h | 0 src/dis7/{ => common}/SimulationManagementPduHeader.cpp | 0 src/dis7/{ => common}/SimulationManagementPduHeader.h | 0 src/dis7/{ => common}/StorageFuel.cpp | 0 src/dis7/{ => common}/StorageFuel.h | 0 src/dis7/{ => common}/StorageFuelReload.cpp | 0 src/dis7/{ => common}/StorageFuelReload.h | 0 src/dis7/{ => common}/TotalRecordSets.cpp | 0 src/dis7/{ => common}/TotalRecordSets.h | 0 src/dis7/{ => common}/UAFundamentalParameter.cpp | 0 src/dis7/{ => common}/UAFundamentalParameter.h | 0 src/dis7/{ => common}/UnattachedIdentifier.cpp | 0 src/dis7/{ => common}/UnattachedIdentifier.h | 0 src/dis7/{ => distributed_emissions}/BeamData.cpp | 0 src/dis7/{ => distributed_emissions}/BeamData.h | 0 .../{ => distributed_emissions}/EEFundamentalParameterData.cpp | 0 src/dis7/{ => distributed_emissions}/EEFundamentalParameterData.h | 0 .../ElectromagneticEmissionBeamData.cpp | 0 .../{ => distributed_emissions}/ElectromagneticEmissionBeamData.h | 0 .../ElectromagneticEmissionSystemData.cpp | 0 .../ElectromagneticEmissionSystemData.h | 0 src/dis7/{ => distributed_emissions}/EmitterSystem.cpp | 0 src/dis7/{ => distributed_emissions}/EmitterSystem.h | 0 .../{ => distributed_emissions}/FundamentalOperationalData.cpp | 0 src/dis7/{ => distributed_emissions}/FundamentalOperationalData.h | 0 .../{ => distributed_emissions}/IFFFundamentalParameterData.cpp | 0 .../{ => distributed_emissions}/IFFFundamentalParameterData.h | 0 src/dis7/{ => distributed_emissions}/JammingTechnique.cpp | 0 src/dis7/{ => distributed_emissions}/JammingTechnique.h | 0 src/dis7/{ => distributed_emissions}/LayerHeader.cpp | 0 src/dis7/{ => distributed_emissions}/LayerHeader.h | 0 src/dis7/{ => distributed_emissions}/PropulsionSystemData.cpp | 0 src/dis7/{ => distributed_emissions}/PropulsionSystemData.h | 0 src/dis7/{ => distributed_emissions}/SecondaryOperationalData.cpp | 0 src/dis7/{ => distributed_emissions}/SecondaryOperationalData.h | 0 src/dis7/{ => distributed_emissions}/SystemIdentifier.cpp | 0 src/dis7/{ => distributed_emissions}/SystemIdentifier.h | 0 src/dis7/{ => distributed_emissions}/TrackJamData.cpp | 0 src/dis7/{ => distributed_emissions}/TrackJamData.h | 0 src/dis7/{ => entity_information}/DeadReckoningParameters.cpp | 0 src/dis7/{ => entity_information}/DeadReckoningParameters.h | 0 src/dis7/{ => entity_information}/EntityMarking.cpp | 0 src/dis7/{ => entity_information}/EntityMarking.h | 0 src/dis7/entity_management/CMakeLists.txt | 0 src/dis7/{ => entity_management}/NamedLocationIdentification.cpp | 0 src/dis7/{ => entity_management}/NamedLocationIdentification.h | 0 src/dis7/{ => entity_management}/Relationship.cpp | 0 src/dis7/{ => entity_management}/Relationship.h | 0 src/dis7/{ => logistics}/SupplyQuantity.cpp | 0 src/dis7/{ => logistics}/SupplyQuantity.h | 0 src/dis7/{ => minefield}/MinefieldIdentifier.cpp | 0 src/dis7/{ => minefield}/MinefieldIdentifier.h | 0 src/dis7/simulation_management_with_reliability/CMakeLists.txt | 0 src/dis7/{ => synthetic_environment}/LinearSegmentParameter.cpp | 0 src/dis7/{ => synthetic_environment}/LinearSegmentParameter.h | 0 src/dis7/{ => synthetic_environment}/ObjectType.cpp | 0 src/dis7/{ => synthetic_environment}/ObjectType.h | 0 src/dis7/{ => warfare}/DirectedEnergyDamage.cpp | 0 src/dis7/{ => warfare}/DirectedEnergyDamage.h | 0 src/dis7/{ => warfare}/MunitionDescriptor.cpp | 0 src/dis7/{ => warfare}/MunitionDescriptor.h | 0 src/dis7/{ => warfare}/StandardVariableSpecification.cpp | 0 src/dis7/{ => warfare}/StandardVariableSpecification.h | 0 176 files changed, 0 insertions(+), 0 deletions(-) rename src/dis7/{ => common}/ArticulatedParts.cpp (100%) rename src/dis7/{ => common}/ArticulatedParts.h (100%) rename src/dis7/{ => common}/Association.cpp (100%) rename src/dis7/{ => common}/Association.h (100%) rename src/dis7/{ => common}/AttachedParts.cpp (100%) rename src/dis7/{ => common}/AttachedParts.h (100%) rename src/dis7/{ => common}/Attribute.cpp (100%) rename src/dis7/{ => common}/Attribute.h (100%) rename src/dis7/{ => common}/BeamAntennaPattern.cpp (100%) rename src/dis7/{ => common}/BeamAntennaPattern.h (100%) rename src/dis7/{ => common}/BeamStatus.cpp (100%) rename src/dis7/{ => common}/BeamStatus.h (100%) rename src/dis7/{ => common}/BlankingSector.cpp (100%) rename src/dis7/{ => common}/BlankingSector.h (100%) rename src/dis7/{ => common}/CommunicationsNodeID.cpp (100%) rename src/dis7/{ => common}/CommunicationsNodeID.h (100%) rename src/dis7/{ => common}/DatumSpecification.cpp (100%) rename src/dis7/{ => common}/DatumSpecification.h (100%) rename src/dis7/{ => common}/DirectedEnergyAreaAimpoint.cpp (100%) rename src/dis7/{ => common}/DirectedEnergyAreaAimpoint.h (100%) rename src/dis7/{ => common}/DirectedEnergyPrecisionAimpoint.cpp (100%) rename src/dis7/{ => common}/DirectedEnergyPrecisionAimpoint.h (100%) rename src/dis7/{ => common}/DirectedEnergyTargetEnergyDeposition.cpp (100%) rename src/dis7/{ => common}/DirectedEnergyTargetEnergyDeposition.h (100%) rename src/dis7/{ => common}/EngineFuel.cpp (100%) rename src/dis7/{ => common}/EngineFuel.h (100%) rename src/dis7/{ => common}/EngineFuelReload.cpp (100%) rename src/dis7/{ => common}/EngineFuelReload.h (100%) rename src/dis7/{ => common}/EntityAssociation.cpp (100%) rename src/dis7/{ => common}/EntityAssociation.h (100%) rename src/dis7/{ => common}/EntityTypeVP.cpp (100%) rename src/dis7/{ => common}/EntityTypeVP.h (100%) rename src/dis7/{ => common}/Environment.cpp (100%) rename src/dis7/{ => common}/Environment.h (100%) rename src/dis7/{ => common}/EnvironmentGeneral.cpp (100%) rename src/dis7/{ => common}/EnvironmentGeneral.h (100%) rename src/dis7/{ => common}/EnvironmentType.cpp (100%) rename src/dis7/{ => common}/EnvironmentType.h (100%) rename src/dis7/{ => common}/EulerAngles.cpp (100%) rename src/dis7/{ => common}/EulerAngles.h (100%) rename src/dis7/{ => common}/EventIdentifier.cpp (100%) rename src/dis7/{ => common}/EventIdentifier.h (100%) rename src/dis7/{ => common}/EventIdentifierLiveEntity.cpp (100%) rename src/dis7/{ => common}/EventIdentifierLiveEntity.h (100%) rename src/dis7/{ => common}/Expendable.cpp (100%) rename src/dis7/{ => common}/Expendable.h (100%) rename src/dis7/{ => common}/ExpendableDescriptor.cpp (100%) rename src/dis7/{ => common}/ExpendableDescriptor.h (100%) rename src/dis7/{ => common}/ExpendableReload.cpp (100%) rename src/dis7/{ => common}/ExpendableReload.h (100%) rename src/dis7/{ => common}/ExplosionDescriptor.cpp (100%) rename src/dis7/{ => common}/ExplosionDescriptor.h (100%) rename src/dis7/{ => common}/FalseTargetsAttribute.cpp (100%) rename src/dis7/{ => common}/FalseTargetsAttribute.h (100%) rename src/dis7/{ => common}/GridAxis.cpp (100%) rename src/dis7/{ => common}/GridAxis.h (100%) rename src/dis7/{ => common}/GroupIdentifier.cpp (100%) rename src/dis7/{ => common}/GroupIdentifier.h (100%) rename src/dis7/{ => common}/IOCommunicationsNode.cpp (100%) rename src/dis7/{ => common}/IOCommunicationsNode.h (100%) rename src/dis7/{ => common}/IOEffect.cpp (100%) rename src/dis7/{ => common}/IOEffect.h (100%) rename src/dis7/{ => common}/IffDataSpecification.cpp (100%) rename src/dis7/{ => common}/IffDataSpecification.h (100%) rename src/dis7/{ => common}/IntercomCommunicationsParameters.cpp (100%) rename src/dis7/{ => common}/IntercomCommunicationsParameters.h (100%) rename src/dis7/{ => common}/IntercomIdentifier.cpp (100%) rename src/dis7/{ => common}/IntercomIdentifier.h (100%) rename src/dis7/{ => common}/LaunchedMunitionRecord.cpp (100%) rename src/dis7/{ => common}/LaunchedMunitionRecord.h (100%) rename src/dis7/{ => common}/LiveEntityIdentifier.cpp (100%) rename src/dis7/{ => common}/LiveEntityIdentifier.h (100%) rename src/dis7/{ => common}/LiveEntityPdu.cpp (100%) rename src/dis7/{ => common}/LiveEntityPdu.h (100%) rename src/dis7/{ => common}/LiveSimulationAddress.cpp (100%) rename src/dis7/{ => common}/LiveSimulationAddress.h (100%) rename src/dis7/{ => common}/MineEntityIdentifier.cpp (100%) rename src/dis7/{ => common}/MineEntityIdentifier.h (100%) rename src/dis7/{ => common}/ModulationParameters.cpp (100%) rename src/dis7/{ => common}/ModulationParameters.h (100%) rename src/dis7/{ => common}/ModulationType.cpp (100%) rename src/dis7/{ => common}/ModulationType.h (100%) rename src/dis7/{ => common}/Munition.cpp (100%) rename src/dis7/{ => common}/Munition.h (100%) rename src/dis7/{ => common}/MunitionReload.cpp (100%) rename src/dis7/{ => common}/MunitionReload.h (100%) rename src/dis7/{ => common}/ObjectIdentifier.cpp (100%) rename src/dis7/{ => common}/ObjectIdentifier.h (100%) rename src/dis7/{ => common}/OwnershipStatus.cpp (100%) rename src/dis7/{ => common}/OwnershipStatus.h (100%) rename src/dis7/{ => common}/PduContainer.cpp (100%) rename src/dis7/{ => common}/PduContainer.h (100%) rename src/dis7/{ => common}/PduHeader.cpp (100%) rename src/dis7/{ => common}/PduHeader.h (100%) rename src/dis7/{ => common}/PduStatus.cpp (100%) rename src/dis7/{ => common}/PduStatus.h (100%) rename src/dis7/{ => common}/PduSuperclass.cpp (100%) rename src/dis7/{ => common}/PduSuperclass.h (100%) rename src/dis7/{ => common}/RadioIdentifier.cpp (100%) rename src/dis7/{ => common}/RadioIdentifier.h (100%) rename src/dis7/{ => common}/RadioType.cpp (100%) rename src/dis7/{ => common}/RadioType.h (100%) rename src/dis7/{ => common}/RecordQuerySpecification.cpp (100%) rename src/dis7/{ => common}/RecordQuerySpecification.h (100%) rename src/dis7/{ => common}/RecordSpecification.cpp (100%) rename src/dis7/{ => common}/RecordSpecification.h (100%) rename src/dis7/{ => common}/RecordSpecificationElement.cpp (100%) rename src/dis7/{ => common}/RecordSpecificationElement.h (100%) rename src/dis7/{ => common}/Sensor.cpp (100%) rename src/dis7/{ => common}/Sensor.h (100%) rename src/dis7/{ => common}/SeparationVP.cpp (100%) rename src/dis7/{ => common}/SeparationVP.h (100%) rename src/dis7/{ => common}/SimulationIdentifier.cpp (100%) rename src/dis7/{ => common}/SimulationIdentifier.h (100%) rename src/dis7/{ => common}/SimulationManagementPduHeader.cpp (100%) rename src/dis7/{ => common}/SimulationManagementPduHeader.h (100%) rename src/dis7/{ => common}/StorageFuel.cpp (100%) rename src/dis7/{ => common}/StorageFuel.h (100%) rename src/dis7/{ => common}/StorageFuelReload.cpp (100%) rename src/dis7/{ => common}/StorageFuelReload.h (100%) rename src/dis7/{ => common}/TotalRecordSets.cpp (100%) rename src/dis7/{ => common}/TotalRecordSets.h (100%) rename src/dis7/{ => common}/UAFundamentalParameter.cpp (100%) rename src/dis7/{ => common}/UAFundamentalParameter.h (100%) rename src/dis7/{ => common}/UnattachedIdentifier.cpp (100%) rename src/dis7/{ => common}/UnattachedIdentifier.h (100%) rename src/dis7/{ => distributed_emissions}/BeamData.cpp (100%) rename src/dis7/{ => distributed_emissions}/BeamData.h (100%) rename src/dis7/{ => distributed_emissions}/EEFundamentalParameterData.cpp (100%) rename src/dis7/{ => distributed_emissions}/EEFundamentalParameterData.h (100%) rename src/dis7/{ => distributed_emissions}/ElectromagneticEmissionBeamData.cpp (100%) rename src/dis7/{ => distributed_emissions}/ElectromagneticEmissionBeamData.h (100%) rename src/dis7/{ => distributed_emissions}/ElectromagneticEmissionSystemData.cpp (100%) rename src/dis7/{ => distributed_emissions}/ElectromagneticEmissionSystemData.h (100%) rename src/dis7/{ => distributed_emissions}/EmitterSystem.cpp (100%) rename src/dis7/{ => distributed_emissions}/EmitterSystem.h (100%) rename src/dis7/{ => distributed_emissions}/FundamentalOperationalData.cpp (100%) rename src/dis7/{ => distributed_emissions}/FundamentalOperationalData.h (100%) rename src/dis7/{ => distributed_emissions}/IFFFundamentalParameterData.cpp (100%) rename src/dis7/{ => distributed_emissions}/IFFFundamentalParameterData.h (100%) rename src/dis7/{ => distributed_emissions}/JammingTechnique.cpp (100%) rename src/dis7/{ => distributed_emissions}/JammingTechnique.h (100%) rename src/dis7/{ => distributed_emissions}/LayerHeader.cpp (100%) rename src/dis7/{ => distributed_emissions}/LayerHeader.h (100%) rename src/dis7/{ => distributed_emissions}/PropulsionSystemData.cpp (100%) rename src/dis7/{ => distributed_emissions}/PropulsionSystemData.h (100%) rename src/dis7/{ => distributed_emissions}/SecondaryOperationalData.cpp (100%) rename src/dis7/{ => distributed_emissions}/SecondaryOperationalData.h (100%) rename src/dis7/{ => distributed_emissions}/SystemIdentifier.cpp (100%) rename src/dis7/{ => distributed_emissions}/SystemIdentifier.h (100%) rename src/dis7/{ => distributed_emissions}/TrackJamData.cpp (100%) rename src/dis7/{ => distributed_emissions}/TrackJamData.h (100%) rename src/dis7/{ => entity_information}/DeadReckoningParameters.cpp (100%) rename src/dis7/{ => entity_information}/DeadReckoningParameters.h (100%) rename src/dis7/{ => entity_information}/EntityMarking.cpp (100%) rename src/dis7/{ => entity_information}/EntityMarking.h (100%) create mode 100644 src/dis7/entity_management/CMakeLists.txt rename src/dis7/{ => entity_management}/NamedLocationIdentification.cpp (100%) rename src/dis7/{ => entity_management}/NamedLocationIdentification.h (100%) rename src/dis7/{ => entity_management}/Relationship.cpp (100%) rename src/dis7/{ => entity_management}/Relationship.h (100%) rename src/dis7/{ => logistics}/SupplyQuantity.cpp (100%) rename src/dis7/{ => logistics}/SupplyQuantity.h (100%) rename src/dis7/{ => minefield}/MinefieldIdentifier.cpp (100%) rename src/dis7/{ => minefield}/MinefieldIdentifier.h (100%) create mode 100644 src/dis7/simulation_management_with_reliability/CMakeLists.txt rename src/dis7/{ => synthetic_environment}/LinearSegmentParameter.cpp (100%) rename src/dis7/{ => synthetic_environment}/LinearSegmentParameter.h (100%) rename src/dis7/{ => synthetic_environment}/ObjectType.cpp (100%) rename src/dis7/{ => synthetic_environment}/ObjectType.h (100%) rename src/dis7/{ => warfare}/DirectedEnergyDamage.cpp (100%) rename src/dis7/{ => warfare}/DirectedEnergyDamage.h (100%) rename src/dis7/{ => warfare}/MunitionDescriptor.cpp (100%) rename src/dis7/{ => warfare}/MunitionDescriptor.h (100%) rename src/dis7/{ => warfare}/StandardVariableSpecification.cpp (100%) rename src/dis7/{ => warfare}/StandardVariableSpecification.h (100%) diff --git a/src/dis7/ArticulatedParts.cpp b/src/dis7/common/ArticulatedParts.cpp similarity index 100% rename from src/dis7/ArticulatedParts.cpp rename to src/dis7/common/ArticulatedParts.cpp diff --git a/src/dis7/ArticulatedParts.h b/src/dis7/common/ArticulatedParts.h similarity index 100% rename from src/dis7/ArticulatedParts.h rename to src/dis7/common/ArticulatedParts.h diff --git a/src/dis7/Association.cpp b/src/dis7/common/Association.cpp similarity index 100% rename from src/dis7/Association.cpp rename to src/dis7/common/Association.cpp diff --git a/src/dis7/Association.h b/src/dis7/common/Association.h similarity index 100% rename from src/dis7/Association.h rename to src/dis7/common/Association.h diff --git a/src/dis7/AttachedParts.cpp b/src/dis7/common/AttachedParts.cpp similarity index 100% rename from src/dis7/AttachedParts.cpp rename to src/dis7/common/AttachedParts.cpp diff --git a/src/dis7/AttachedParts.h b/src/dis7/common/AttachedParts.h similarity index 100% rename from src/dis7/AttachedParts.h rename to src/dis7/common/AttachedParts.h diff --git a/src/dis7/Attribute.cpp b/src/dis7/common/Attribute.cpp similarity index 100% rename from src/dis7/Attribute.cpp rename to src/dis7/common/Attribute.cpp diff --git a/src/dis7/Attribute.h b/src/dis7/common/Attribute.h similarity index 100% rename from src/dis7/Attribute.h rename to src/dis7/common/Attribute.h diff --git a/src/dis7/BeamAntennaPattern.cpp b/src/dis7/common/BeamAntennaPattern.cpp similarity index 100% rename from src/dis7/BeamAntennaPattern.cpp rename to src/dis7/common/BeamAntennaPattern.cpp diff --git a/src/dis7/BeamAntennaPattern.h b/src/dis7/common/BeamAntennaPattern.h similarity index 100% rename from src/dis7/BeamAntennaPattern.h rename to src/dis7/common/BeamAntennaPattern.h diff --git a/src/dis7/BeamStatus.cpp b/src/dis7/common/BeamStatus.cpp similarity index 100% rename from src/dis7/BeamStatus.cpp rename to src/dis7/common/BeamStatus.cpp diff --git a/src/dis7/BeamStatus.h b/src/dis7/common/BeamStatus.h similarity index 100% rename from src/dis7/BeamStatus.h rename to src/dis7/common/BeamStatus.h diff --git a/src/dis7/BlankingSector.cpp b/src/dis7/common/BlankingSector.cpp similarity index 100% rename from src/dis7/BlankingSector.cpp rename to src/dis7/common/BlankingSector.cpp diff --git a/src/dis7/BlankingSector.h b/src/dis7/common/BlankingSector.h similarity index 100% rename from src/dis7/BlankingSector.h rename to src/dis7/common/BlankingSector.h diff --git a/src/dis7/CommunicationsNodeID.cpp b/src/dis7/common/CommunicationsNodeID.cpp similarity index 100% rename from src/dis7/CommunicationsNodeID.cpp rename to src/dis7/common/CommunicationsNodeID.cpp diff --git a/src/dis7/CommunicationsNodeID.h b/src/dis7/common/CommunicationsNodeID.h similarity index 100% rename from src/dis7/CommunicationsNodeID.h rename to src/dis7/common/CommunicationsNodeID.h diff --git a/src/dis7/DatumSpecification.cpp b/src/dis7/common/DatumSpecification.cpp similarity index 100% rename from src/dis7/DatumSpecification.cpp rename to src/dis7/common/DatumSpecification.cpp diff --git a/src/dis7/DatumSpecification.h b/src/dis7/common/DatumSpecification.h similarity index 100% rename from src/dis7/DatumSpecification.h rename to src/dis7/common/DatumSpecification.h diff --git a/src/dis7/DirectedEnergyAreaAimpoint.cpp b/src/dis7/common/DirectedEnergyAreaAimpoint.cpp similarity index 100% rename from src/dis7/DirectedEnergyAreaAimpoint.cpp rename to src/dis7/common/DirectedEnergyAreaAimpoint.cpp diff --git a/src/dis7/DirectedEnergyAreaAimpoint.h b/src/dis7/common/DirectedEnergyAreaAimpoint.h similarity index 100% rename from src/dis7/DirectedEnergyAreaAimpoint.h rename to src/dis7/common/DirectedEnergyAreaAimpoint.h diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.cpp b/src/dis7/common/DirectedEnergyPrecisionAimpoint.cpp similarity index 100% rename from src/dis7/DirectedEnergyPrecisionAimpoint.cpp rename to src/dis7/common/DirectedEnergyPrecisionAimpoint.cpp diff --git a/src/dis7/DirectedEnergyPrecisionAimpoint.h b/src/dis7/common/DirectedEnergyPrecisionAimpoint.h similarity index 100% rename from src/dis7/DirectedEnergyPrecisionAimpoint.h rename to src/dis7/common/DirectedEnergyPrecisionAimpoint.h diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.cpp b/src/dis7/common/DirectedEnergyTargetEnergyDeposition.cpp similarity index 100% rename from src/dis7/DirectedEnergyTargetEnergyDeposition.cpp rename to src/dis7/common/DirectedEnergyTargetEnergyDeposition.cpp diff --git a/src/dis7/DirectedEnergyTargetEnergyDeposition.h b/src/dis7/common/DirectedEnergyTargetEnergyDeposition.h similarity index 100% rename from src/dis7/DirectedEnergyTargetEnergyDeposition.h rename to src/dis7/common/DirectedEnergyTargetEnergyDeposition.h diff --git a/src/dis7/EngineFuel.cpp b/src/dis7/common/EngineFuel.cpp similarity index 100% rename from src/dis7/EngineFuel.cpp rename to src/dis7/common/EngineFuel.cpp diff --git a/src/dis7/EngineFuel.h b/src/dis7/common/EngineFuel.h similarity index 100% rename from src/dis7/EngineFuel.h rename to src/dis7/common/EngineFuel.h diff --git a/src/dis7/EngineFuelReload.cpp b/src/dis7/common/EngineFuelReload.cpp similarity index 100% rename from src/dis7/EngineFuelReload.cpp rename to src/dis7/common/EngineFuelReload.cpp diff --git a/src/dis7/EngineFuelReload.h b/src/dis7/common/EngineFuelReload.h similarity index 100% rename from src/dis7/EngineFuelReload.h rename to src/dis7/common/EngineFuelReload.h diff --git a/src/dis7/EntityAssociation.cpp b/src/dis7/common/EntityAssociation.cpp similarity index 100% rename from src/dis7/EntityAssociation.cpp rename to src/dis7/common/EntityAssociation.cpp diff --git a/src/dis7/EntityAssociation.h b/src/dis7/common/EntityAssociation.h similarity index 100% rename from src/dis7/EntityAssociation.h rename to src/dis7/common/EntityAssociation.h diff --git a/src/dis7/EntityTypeVP.cpp b/src/dis7/common/EntityTypeVP.cpp similarity index 100% rename from src/dis7/EntityTypeVP.cpp rename to src/dis7/common/EntityTypeVP.cpp diff --git a/src/dis7/EntityTypeVP.h b/src/dis7/common/EntityTypeVP.h similarity index 100% rename from src/dis7/EntityTypeVP.h rename to src/dis7/common/EntityTypeVP.h diff --git a/src/dis7/Environment.cpp b/src/dis7/common/Environment.cpp similarity index 100% rename from src/dis7/Environment.cpp rename to src/dis7/common/Environment.cpp diff --git a/src/dis7/Environment.h b/src/dis7/common/Environment.h similarity index 100% rename from src/dis7/Environment.h rename to src/dis7/common/Environment.h diff --git a/src/dis7/EnvironmentGeneral.cpp b/src/dis7/common/EnvironmentGeneral.cpp similarity index 100% rename from src/dis7/EnvironmentGeneral.cpp rename to src/dis7/common/EnvironmentGeneral.cpp diff --git a/src/dis7/EnvironmentGeneral.h b/src/dis7/common/EnvironmentGeneral.h similarity index 100% rename from src/dis7/EnvironmentGeneral.h rename to src/dis7/common/EnvironmentGeneral.h diff --git a/src/dis7/EnvironmentType.cpp b/src/dis7/common/EnvironmentType.cpp similarity index 100% rename from src/dis7/EnvironmentType.cpp rename to src/dis7/common/EnvironmentType.cpp diff --git a/src/dis7/EnvironmentType.h b/src/dis7/common/EnvironmentType.h similarity index 100% rename from src/dis7/EnvironmentType.h rename to src/dis7/common/EnvironmentType.h diff --git a/src/dis7/EulerAngles.cpp b/src/dis7/common/EulerAngles.cpp similarity index 100% rename from src/dis7/EulerAngles.cpp rename to src/dis7/common/EulerAngles.cpp diff --git a/src/dis7/EulerAngles.h b/src/dis7/common/EulerAngles.h similarity index 100% rename from src/dis7/EulerAngles.h rename to src/dis7/common/EulerAngles.h diff --git a/src/dis7/EventIdentifier.cpp b/src/dis7/common/EventIdentifier.cpp similarity index 100% rename from src/dis7/EventIdentifier.cpp rename to src/dis7/common/EventIdentifier.cpp diff --git a/src/dis7/EventIdentifier.h b/src/dis7/common/EventIdentifier.h similarity index 100% rename from src/dis7/EventIdentifier.h rename to src/dis7/common/EventIdentifier.h diff --git a/src/dis7/EventIdentifierLiveEntity.cpp b/src/dis7/common/EventIdentifierLiveEntity.cpp similarity index 100% rename from src/dis7/EventIdentifierLiveEntity.cpp rename to src/dis7/common/EventIdentifierLiveEntity.cpp diff --git a/src/dis7/EventIdentifierLiveEntity.h b/src/dis7/common/EventIdentifierLiveEntity.h similarity index 100% rename from src/dis7/EventIdentifierLiveEntity.h rename to src/dis7/common/EventIdentifierLiveEntity.h diff --git a/src/dis7/Expendable.cpp b/src/dis7/common/Expendable.cpp similarity index 100% rename from src/dis7/Expendable.cpp rename to src/dis7/common/Expendable.cpp diff --git a/src/dis7/Expendable.h b/src/dis7/common/Expendable.h similarity index 100% rename from src/dis7/Expendable.h rename to src/dis7/common/Expendable.h diff --git a/src/dis7/ExpendableDescriptor.cpp b/src/dis7/common/ExpendableDescriptor.cpp similarity index 100% rename from src/dis7/ExpendableDescriptor.cpp rename to src/dis7/common/ExpendableDescriptor.cpp diff --git a/src/dis7/ExpendableDescriptor.h b/src/dis7/common/ExpendableDescriptor.h similarity index 100% rename from src/dis7/ExpendableDescriptor.h rename to src/dis7/common/ExpendableDescriptor.h diff --git a/src/dis7/ExpendableReload.cpp b/src/dis7/common/ExpendableReload.cpp similarity index 100% rename from src/dis7/ExpendableReload.cpp rename to src/dis7/common/ExpendableReload.cpp diff --git a/src/dis7/ExpendableReload.h b/src/dis7/common/ExpendableReload.h similarity index 100% rename from src/dis7/ExpendableReload.h rename to src/dis7/common/ExpendableReload.h diff --git a/src/dis7/ExplosionDescriptor.cpp b/src/dis7/common/ExplosionDescriptor.cpp similarity index 100% rename from src/dis7/ExplosionDescriptor.cpp rename to src/dis7/common/ExplosionDescriptor.cpp diff --git a/src/dis7/ExplosionDescriptor.h b/src/dis7/common/ExplosionDescriptor.h similarity index 100% rename from src/dis7/ExplosionDescriptor.h rename to src/dis7/common/ExplosionDescriptor.h diff --git a/src/dis7/FalseTargetsAttribute.cpp b/src/dis7/common/FalseTargetsAttribute.cpp similarity index 100% rename from src/dis7/FalseTargetsAttribute.cpp rename to src/dis7/common/FalseTargetsAttribute.cpp diff --git a/src/dis7/FalseTargetsAttribute.h b/src/dis7/common/FalseTargetsAttribute.h similarity index 100% rename from src/dis7/FalseTargetsAttribute.h rename to src/dis7/common/FalseTargetsAttribute.h diff --git a/src/dis7/GridAxis.cpp b/src/dis7/common/GridAxis.cpp similarity index 100% rename from src/dis7/GridAxis.cpp rename to src/dis7/common/GridAxis.cpp diff --git a/src/dis7/GridAxis.h b/src/dis7/common/GridAxis.h similarity index 100% rename from src/dis7/GridAxis.h rename to src/dis7/common/GridAxis.h diff --git a/src/dis7/GroupIdentifier.cpp b/src/dis7/common/GroupIdentifier.cpp similarity index 100% rename from src/dis7/GroupIdentifier.cpp rename to src/dis7/common/GroupIdentifier.cpp diff --git a/src/dis7/GroupIdentifier.h b/src/dis7/common/GroupIdentifier.h similarity index 100% rename from src/dis7/GroupIdentifier.h rename to src/dis7/common/GroupIdentifier.h diff --git a/src/dis7/IOCommunicationsNode.cpp b/src/dis7/common/IOCommunicationsNode.cpp similarity index 100% rename from src/dis7/IOCommunicationsNode.cpp rename to src/dis7/common/IOCommunicationsNode.cpp diff --git a/src/dis7/IOCommunicationsNode.h b/src/dis7/common/IOCommunicationsNode.h similarity index 100% rename from src/dis7/IOCommunicationsNode.h rename to src/dis7/common/IOCommunicationsNode.h diff --git a/src/dis7/IOEffect.cpp b/src/dis7/common/IOEffect.cpp similarity index 100% rename from src/dis7/IOEffect.cpp rename to src/dis7/common/IOEffect.cpp diff --git a/src/dis7/IOEffect.h b/src/dis7/common/IOEffect.h similarity index 100% rename from src/dis7/IOEffect.h rename to src/dis7/common/IOEffect.h diff --git a/src/dis7/IffDataSpecification.cpp b/src/dis7/common/IffDataSpecification.cpp similarity index 100% rename from src/dis7/IffDataSpecification.cpp rename to src/dis7/common/IffDataSpecification.cpp diff --git a/src/dis7/IffDataSpecification.h b/src/dis7/common/IffDataSpecification.h similarity index 100% rename from src/dis7/IffDataSpecification.h rename to src/dis7/common/IffDataSpecification.h diff --git a/src/dis7/IntercomCommunicationsParameters.cpp b/src/dis7/common/IntercomCommunicationsParameters.cpp similarity index 100% rename from src/dis7/IntercomCommunicationsParameters.cpp rename to src/dis7/common/IntercomCommunicationsParameters.cpp diff --git a/src/dis7/IntercomCommunicationsParameters.h b/src/dis7/common/IntercomCommunicationsParameters.h similarity index 100% rename from src/dis7/IntercomCommunicationsParameters.h rename to src/dis7/common/IntercomCommunicationsParameters.h diff --git a/src/dis7/IntercomIdentifier.cpp b/src/dis7/common/IntercomIdentifier.cpp similarity index 100% rename from src/dis7/IntercomIdentifier.cpp rename to src/dis7/common/IntercomIdentifier.cpp diff --git a/src/dis7/IntercomIdentifier.h b/src/dis7/common/IntercomIdentifier.h similarity index 100% rename from src/dis7/IntercomIdentifier.h rename to src/dis7/common/IntercomIdentifier.h diff --git a/src/dis7/LaunchedMunitionRecord.cpp b/src/dis7/common/LaunchedMunitionRecord.cpp similarity index 100% rename from src/dis7/LaunchedMunitionRecord.cpp rename to src/dis7/common/LaunchedMunitionRecord.cpp diff --git a/src/dis7/LaunchedMunitionRecord.h b/src/dis7/common/LaunchedMunitionRecord.h similarity index 100% rename from src/dis7/LaunchedMunitionRecord.h rename to src/dis7/common/LaunchedMunitionRecord.h diff --git a/src/dis7/LiveEntityIdentifier.cpp b/src/dis7/common/LiveEntityIdentifier.cpp similarity index 100% rename from src/dis7/LiveEntityIdentifier.cpp rename to src/dis7/common/LiveEntityIdentifier.cpp diff --git a/src/dis7/LiveEntityIdentifier.h b/src/dis7/common/LiveEntityIdentifier.h similarity index 100% rename from src/dis7/LiveEntityIdentifier.h rename to src/dis7/common/LiveEntityIdentifier.h diff --git a/src/dis7/LiveEntityPdu.cpp b/src/dis7/common/LiveEntityPdu.cpp similarity index 100% rename from src/dis7/LiveEntityPdu.cpp rename to src/dis7/common/LiveEntityPdu.cpp diff --git a/src/dis7/LiveEntityPdu.h b/src/dis7/common/LiveEntityPdu.h similarity index 100% rename from src/dis7/LiveEntityPdu.h rename to src/dis7/common/LiveEntityPdu.h diff --git a/src/dis7/LiveSimulationAddress.cpp b/src/dis7/common/LiveSimulationAddress.cpp similarity index 100% rename from src/dis7/LiveSimulationAddress.cpp rename to src/dis7/common/LiveSimulationAddress.cpp diff --git a/src/dis7/LiveSimulationAddress.h b/src/dis7/common/LiveSimulationAddress.h similarity index 100% rename from src/dis7/LiveSimulationAddress.h rename to src/dis7/common/LiveSimulationAddress.h diff --git a/src/dis7/MineEntityIdentifier.cpp b/src/dis7/common/MineEntityIdentifier.cpp similarity index 100% rename from src/dis7/MineEntityIdentifier.cpp rename to src/dis7/common/MineEntityIdentifier.cpp diff --git a/src/dis7/MineEntityIdentifier.h b/src/dis7/common/MineEntityIdentifier.h similarity index 100% rename from src/dis7/MineEntityIdentifier.h rename to src/dis7/common/MineEntityIdentifier.h diff --git a/src/dis7/ModulationParameters.cpp b/src/dis7/common/ModulationParameters.cpp similarity index 100% rename from src/dis7/ModulationParameters.cpp rename to src/dis7/common/ModulationParameters.cpp diff --git a/src/dis7/ModulationParameters.h b/src/dis7/common/ModulationParameters.h similarity index 100% rename from src/dis7/ModulationParameters.h rename to src/dis7/common/ModulationParameters.h diff --git a/src/dis7/ModulationType.cpp b/src/dis7/common/ModulationType.cpp similarity index 100% rename from src/dis7/ModulationType.cpp rename to src/dis7/common/ModulationType.cpp diff --git a/src/dis7/ModulationType.h b/src/dis7/common/ModulationType.h similarity index 100% rename from src/dis7/ModulationType.h rename to src/dis7/common/ModulationType.h diff --git a/src/dis7/Munition.cpp b/src/dis7/common/Munition.cpp similarity index 100% rename from src/dis7/Munition.cpp rename to src/dis7/common/Munition.cpp diff --git a/src/dis7/Munition.h b/src/dis7/common/Munition.h similarity index 100% rename from src/dis7/Munition.h rename to src/dis7/common/Munition.h diff --git a/src/dis7/MunitionReload.cpp b/src/dis7/common/MunitionReload.cpp similarity index 100% rename from src/dis7/MunitionReload.cpp rename to src/dis7/common/MunitionReload.cpp diff --git a/src/dis7/MunitionReload.h b/src/dis7/common/MunitionReload.h similarity index 100% rename from src/dis7/MunitionReload.h rename to src/dis7/common/MunitionReload.h diff --git a/src/dis7/ObjectIdentifier.cpp b/src/dis7/common/ObjectIdentifier.cpp similarity index 100% rename from src/dis7/ObjectIdentifier.cpp rename to src/dis7/common/ObjectIdentifier.cpp diff --git a/src/dis7/ObjectIdentifier.h b/src/dis7/common/ObjectIdentifier.h similarity index 100% rename from src/dis7/ObjectIdentifier.h rename to src/dis7/common/ObjectIdentifier.h diff --git a/src/dis7/OwnershipStatus.cpp b/src/dis7/common/OwnershipStatus.cpp similarity index 100% rename from src/dis7/OwnershipStatus.cpp rename to src/dis7/common/OwnershipStatus.cpp diff --git a/src/dis7/OwnershipStatus.h b/src/dis7/common/OwnershipStatus.h similarity index 100% rename from src/dis7/OwnershipStatus.h rename to src/dis7/common/OwnershipStatus.h diff --git a/src/dis7/PduContainer.cpp b/src/dis7/common/PduContainer.cpp similarity index 100% rename from src/dis7/PduContainer.cpp rename to src/dis7/common/PduContainer.cpp diff --git a/src/dis7/PduContainer.h b/src/dis7/common/PduContainer.h similarity index 100% rename from src/dis7/PduContainer.h rename to src/dis7/common/PduContainer.h diff --git a/src/dis7/PduHeader.cpp b/src/dis7/common/PduHeader.cpp similarity index 100% rename from src/dis7/PduHeader.cpp rename to src/dis7/common/PduHeader.cpp diff --git a/src/dis7/PduHeader.h b/src/dis7/common/PduHeader.h similarity index 100% rename from src/dis7/PduHeader.h rename to src/dis7/common/PduHeader.h diff --git a/src/dis7/PduStatus.cpp b/src/dis7/common/PduStatus.cpp similarity index 100% rename from src/dis7/PduStatus.cpp rename to src/dis7/common/PduStatus.cpp diff --git a/src/dis7/PduStatus.h b/src/dis7/common/PduStatus.h similarity index 100% rename from src/dis7/PduStatus.h rename to src/dis7/common/PduStatus.h diff --git a/src/dis7/PduSuperclass.cpp b/src/dis7/common/PduSuperclass.cpp similarity index 100% rename from src/dis7/PduSuperclass.cpp rename to src/dis7/common/PduSuperclass.cpp diff --git a/src/dis7/PduSuperclass.h b/src/dis7/common/PduSuperclass.h similarity index 100% rename from src/dis7/PduSuperclass.h rename to src/dis7/common/PduSuperclass.h diff --git a/src/dis7/RadioIdentifier.cpp b/src/dis7/common/RadioIdentifier.cpp similarity index 100% rename from src/dis7/RadioIdentifier.cpp rename to src/dis7/common/RadioIdentifier.cpp diff --git a/src/dis7/RadioIdentifier.h b/src/dis7/common/RadioIdentifier.h similarity index 100% rename from src/dis7/RadioIdentifier.h rename to src/dis7/common/RadioIdentifier.h diff --git a/src/dis7/RadioType.cpp b/src/dis7/common/RadioType.cpp similarity index 100% rename from src/dis7/RadioType.cpp rename to src/dis7/common/RadioType.cpp diff --git a/src/dis7/RadioType.h b/src/dis7/common/RadioType.h similarity index 100% rename from src/dis7/RadioType.h rename to src/dis7/common/RadioType.h diff --git a/src/dis7/RecordQuerySpecification.cpp b/src/dis7/common/RecordQuerySpecification.cpp similarity index 100% rename from src/dis7/RecordQuerySpecification.cpp rename to src/dis7/common/RecordQuerySpecification.cpp diff --git a/src/dis7/RecordQuerySpecification.h b/src/dis7/common/RecordQuerySpecification.h similarity index 100% rename from src/dis7/RecordQuerySpecification.h rename to src/dis7/common/RecordQuerySpecification.h diff --git a/src/dis7/RecordSpecification.cpp b/src/dis7/common/RecordSpecification.cpp similarity index 100% rename from src/dis7/RecordSpecification.cpp rename to src/dis7/common/RecordSpecification.cpp diff --git a/src/dis7/RecordSpecification.h b/src/dis7/common/RecordSpecification.h similarity index 100% rename from src/dis7/RecordSpecification.h rename to src/dis7/common/RecordSpecification.h diff --git a/src/dis7/RecordSpecificationElement.cpp b/src/dis7/common/RecordSpecificationElement.cpp similarity index 100% rename from src/dis7/RecordSpecificationElement.cpp rename to src/dis7/common/RecordSpecificationElement.cpp diff --git a/src/dis7/RecordSpecificationElement.h b/src/dis7/common/RecordSpecificationElement.h similarity index 100% rename from src/dis7/RecordSpecificationElement.h rename to src/dis7/common/RecordSpecificationElement.h diff --git a/src/dis7/Sensor.cpp b/src/dis7/common/Sensor.cpp similarity index 100% rename from src/dis7/Sensor.cpp rename to src/dis7/common/Sensor.cpp diff --git a/src/dis7/Sensor.h b/src/dis7/common/Sensor.h similarity index 100% rename from src/dis7/Sensor.h rename to src/dis7/common/Sensor.h diff --git a/src/dis7/SeparationVP.cpp b/src/dis7/common/SeparationVP.cpp similarity index 100% rename from src/dis7/SeparationVP.cpp rename to src/dis7/common/SeparationVP.cpp diff --git a/src/dis7/SeparationVP.h b/src/dis7/common/SeparationVP.h similarity index 100% rename from src/dis7/SeparationVP.h rename to src/dis7/common/SeparationVP.h diff --git a/src/dis7/SimulationIdentifier.cpp b/src/dis7/common/SimulationIdentifier.cpp similarity index 100% rename from src/dis7/SimulationIdentifier.cpp rename to src/dis7/common/SimulationIdentifier.cpp diff --git a/src/dis7/SimulationIdentifier.h b/src/dis7/common/SimulationIdentifier.h similarity index 100% rename from src/dis7/SimulationIdentifier.h rename to src/dis7/common/SimulationIdentifier.h diff --git a/src/dis7/SimulationManagementPduHeader.cpp b/src/dis7/common/SimulationManagementPduHeader.cpp similarity index 100% rename from src/dis7/SimulationManagementPduHeader.cpp rename to src/dis7/common/SimulationManagementPduHeader.cpp diff --git a/src/dis7/SimulationManagementPduHeader.h b/src/dis7/common/SimulationManagementPduHeader.h similarity index 100% rename from src/dis7/SimulationManagementPduHeader.h rename to src/dis7/common/SimulationManagementPduHeader.h diff --git a/src/dis7/StorageFuel.cpp b/src/dis7/common/StorageFuel.cpp similarity index 100% rename from src/dis7/StorageFuel.cpp rename to src/dis7/common/StorageFuel.cpp diff --git a/src/dis7/StorageFuel.h b/src/dis7/common/StorageFuel.h similarity index 100% rename from src/dis7/StorageFuel.h rename to src/dis7/common/StorageFuel.h diff --git a/src/dis7/StorageFuelReload.cpp b/src/dis7/common/StorageFuelReload.cpp similarity index 100% rename from src/dis7/StorageFuelReload.cpp rename to src/dis7/common/StorageFuelReload.cpp diff --git a/src/dis7/StorageFuelReload.h b/src/dis7/common/StorageFuelReload.h similarity index 100% rename from src/dis7/StorageFuelReload.h rename to src/dis7/common/StorageFuelReload.h diff --git a/src/dis7/TotalRecordSets.cpp b/src/dis7/common/TotalRecordSets.cpp similarity index 100% rename from src/dis7/TotalRecordSets.cpp rename to src/dis7/common/TotalRecordSets.cpp diff --git a/src/dis7/TotalRecordSets.h b/src/dis7/common/TotalRecordSets.h similarity index 100% rename from src/dis7/TotalRecordSets.h rename to src/dis7/common/TotalRecordSets.h diff --git a/src/dis7/UAFundamentalParameter.cpp b/src/dis7/common/UAFundamentalParameter.cpp similarity index 100% rename from src/dis7/UAFundamentalParameter.cpp rename to src/dis7/common/UAFundamentalParameter.cpp diff --git a/src/dis7/UAFundamentalParameter.h b/src/dis7/common/UAFundamentalParameter.h similarity index 100% rename from src/dis7/UAFundamentalParameter.h rename to src/dis7/common/UAFundamentalParameter.h diff --git a/src/dis7/UnattachedIdentifier.cpp b/src/dis7/common/UnattachedIdentifier.cpp similarity index 100% rename from src/dis7/UnattachedIdentifier.cpp rename to src/dis7/common/UnattachedIdentifier.cpp diff --git a/src/dis7/UnattachedIdentifier.h b/src/dis7/common/UnattachedIdentifier.h similarity index 100% rename from src/dis7/UnattachedIdentifier.h rename to src/dis7/common/UnattachedIdentifier.h diff --git a/src/dis7/BeamData.cpp b/src/dis7/distributed_emissions/BeamData.cpp similarity index 100% rename from src/dis7/BeamData.cpp rename to src/dis7/distributed_emissions/BeamData.cpp diff --git a/src/dis7/BeamData.h b/src/dis7/distributed_emissions/BeamData.h similarity index 100% rename from src/dis7/BeamData.h rename to src/dis7/distributed_emissions/BeamData.h diff --git a/src/dis7/EEFundamentalParameterData.cpp b/src/dis7/distributed_emissions/EEFundamentalParameterData.cpp similarity index 100% rename from src/dis7/EEFundamentalParameterData.cpp rename to src/dis7/distributed_emissions/EEFundamentalParameterData.cpp diff --git a/src/dis7/EEFundamentalParameterData.h b/src/dis7/distributed_emissions/EEFundamentalParameterData.h similarity index 100% rename from src/dis7/EEFundamentalParameterData.h rename to src/dis7/distributed_emissions/EEFundamentalParameterData.h diff --git a/src/dis7/ElectromagneticEmissionBeamData.cpp b/src/dis7/distributed_emissions/ElectromagneticEmissionBeamData.cpp similarity index 100% rename from src/dis7/ElectromagneticEmissionBeamData.cpp rename to src/dis7/distributed_emissions/ElectromagneticEmissionBeamData.cpp diff --git a/src/dis7/ElectromagneticEmissionBeamData.h b/src/dis7/distributed_emissions/ElectromagneticEmissionBeamData.h similarity index 100% rename from src/dis7/ElectromagneticEmissionBeamData.h rename to src/dis7/distributed_emissions/ElectromagneticEmissionBeamData.h diff --git a/src/dis7/ElectromagneticEmissionSystemData.cpp b/src/dis7/distributed_emissions/ElectromagneticEmissionSystemData.cpp similarity index 100% rename from src/dis7/ElectromagneticEmissionSystemData.cpp rename to src/dis7/distributed_emissions/ElectromagneticEmissionSystemData.cpp diff --git a/src/dis7/ElectromagneticEmissionSystemData.h b/src/dis7/distributed_emissions/ElectromagneticEmissionSystemData.h similarity index 100% rename from src/dis7/ElectromagneticEmissionSystemData.h rename to src/dis7/distributed_emissions/ElectromagneticEmissionSystemData.h diff --git a/src/dis7/EmitterSystem.cpp b/src/dis7/distributed_emissions/EmitterSystem.cpp similarity index 100% rename from src/dis7/EmitterSystem.cpp rename to src/dis7/distributed_emissions/EmitterSystem.cpp diff --git a/src/dis7/EmitterSystem.h b/src/dis7/distributed_emissions/EmitterSystem.h similarity index 100% rename from src/dis7/EmitterSystem.h rename to src/dis7/distributed_emissions/EmitterSystem.h diff --git a/src/dis7/FundamentalOperationalData.cpp b/src/dis7/distributed_emissions/FundamentalOperationalData.cpp similarity index 100% rename from src/dis7/FundamentalOperationalData.cpp rename to src/dis7/distributed_emissions/FundamentalOperationalData.cpp diff --git a/src/dis7/FundamentalOperationalData.h b/src/dis7/distributed_emissions/FundamentalOperationalData.h similarity index 100% rename from src/dis7/FundamentalOperationalData.h rename to src/dis7/distributed_emissions/FundamentalOperationalData.h diff --git a/src/dis7/IFFFundamentalParameterData.cpp b/src/dis7/distributed_emissions/IFFFundamentalParameterData.cpp similarity index 100% rename from src/dis7/IFFFundamentalParameterData.cpp rename to src/dis7/distributed_emissions/IFFFundamentalParameterData.cpp diff --git a/src/dis7/IFFFundamentalParameterData.h b/src/dis7/distributed_emissions/IFFFundamentalParameterData.h similarity index 100% rename from src/dis7/IFFFundamentalParameterData.h rename to src/dis7/distributed_emissions/IFFFundamentalParameterData.h diff --git a/src/dis7/JammingTechnique.cpp b/src/dis7/distributed_emissions/JammingTechnique.cpp similarity index 100% rename from src/dis7/JammingTechnique.cpp rename to src/dis7/distributed_emissions/JammingTechnique.cpp diff --git a/src/dis7/JammingTechnique.h b/src/dis7/distributed_emissions/JammingTechnique.h similarity index 100% rename from src/dis7/JammingTechnique.h rename to src/dis7/distributed_emissions/JammingTechnique.h diff --git a/src/dis7/LayerHeader.cpp b/src/dis7/distributed_emissions/LayerHeader.cpp similarity index 100% rename from src/dis7/LayerHeader.cpp rename to src/dis7/distributed_emissions/LayerHeader.cpp diff --git a/src/dis7/LayerHeader.h b/src/dis7/distributed_emissions/LayerHeader.h similarity index 100% rename from src/dis7/LayerHeader.h rename to src/dis7/distributed_emissions/LayerHeader.h diff --git a/src/dis7/PropulsionSystemData.cpp b/src/dis7/distributed_emissions/PropulsionSystemData.cpp similarity index 100% rename from src/dis7/PropulsionSystemData.cpp rename to src/dis7/distributed_emissions/PropulsionSystemData.cpp diff --git a/src/dis7/PropulsionSystemData.h b/src/dis7/distributed_emissions/PropulsionSystemData.h similarity index 100% rename from src/dis7/PropulsionSystemData.h rename to src/dis7/distributed_emissions/PropulsionSystemData.h diff --git a/src/dis7/SecondaryOperationalData.cpp b/src/dis7/distributed_emissions/SecondaryOperationalData.cpp similarity index 100% rename from src/dis7/SecondaryOperationalData.cpp rename to src/dis7/distributed_emissions/SecondaryOperationalData.cpp diff --git a/src/dis7/SecondaryOperationalData.h b/src/dis7/distributed_emissions/SecondaryOperationalData.h similarity index 100% rename from src/dis7/SecondaryOperationalData.h rename to src/dis7/distributed_emissions/SecondaryOperationalData.h diff --git a/src/dis7/SystemIdentifier.cpp b/src/dis7/distributed_emissions/SystemIdentifier.cpp similarity index 100% rename from src/dis7/SystemIdentifier.cpp rename to src/dis7/distributed_emissions/SystemIdentifier.cpp diff --git a/src/dis7/SystemIdentifier.h b/src/dis7/distributed_emissions/SystemIdentifier.h similarity index 100% rename from src/dis7/SystemIdentifier.h rename to src/dis7/distributed_emissions/SystemIdentifier.h diff --git a/src/dis7/TrackJamData.cpp b/src/dis7/distributed_emissions/TrackJamData.cpp similarity index 100% rename from src/dis7/TrackJamData.cpp rename to src/dis7/distributed_emissions/TrackJamData.cpp diff --git a/src/dis7/TrackJamData.h b/src/dis7/distributed_emissions/TrackJamData.h similarity index 100% rename from src/dis7/TrackJamData.h rename to src/dis7/distributed_emissions/TrackJamData.h diff --git a/src/dis7/DeadReckoningParameters.cpp b/src/dis7/entity_information/DeadReckoningParameters.cpp similarity index 100% rename from src/dis7/DeadReckoningParameters.cpp rename to src/dis7/entity_information/DeadReckoningParameters.cpp diff --git a/src/dis7/DeadReckoningParameters.h b/src/dis7/entity_information/DeadReckoningParameters.h similarity index 100% rename from src/dis7/DeadReckoningParameters.h rename to src/dis7/entity_information/DeadReckoningParameters.h diff --git a/src/dis7/EntityMarking.cpp b/src/dis7/entity_information/EntityMarking.cpp similarity index 100% rename from src/dis7/EntityMarking.cpp rename to src/dis7/entity_information/EntityMarking.cpp diff --git a/src/dis7/EntityMarking.h b/src/dis7/entity_information/EntityMarking.h similarity index 100% rename from src/dis7/EntityMarking.h rename to src/dis7/entity_information/EntityMarking.h diff --git a/src/dis7/entity_management/CMakeLists.txt b/src/dis7/entity_management/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/NamedLocationIdentification.cpp b/src/dis7/entity_management/NamedLocationIdentification.cpp similarity index 100% rename from src/dis7/NamedLocationIdentification.cpp rename to src/dis7/entity_management/NamedLocationIdentification.cpp diff --git a/src/dis7/NamedLocationIdentification.h b/src/dis7/entity_management/NamedLocationIdentification.h similarity index 100% rename from src/dis7/NamedLocationIdentification.h rename to src/dis7/entity_management/NamedLocationIdentification.h diff --git a/src/dis7/Relationship.cpp b/src/dis7/entity_management/Relationship.cpp similarity index 100% rename from src/dis7/Relationship.cpp rename to src/dis7/entity_management/Relationship.cpp diff --git a/src/dis7/Relationship.h b/src/dis7/entity_management/Relationship.h similarity index 100% rename from src/dis7/Relationship.h rename to src/dis7/entity_management/Relationship.h diff --git a/src/dis7/SupplyQuantity.cpp b/src/dis7/logistics/SupplyQuantity.cpp similarity index 100% rename from src/dis7/SupplyQuantity.cpp rename to src/dis7/logistics/SupplyQuantity.cpp diff --git a/src/dis7/SupplyQuantity.h b/src/dis7/logistics/SupplyQuantity.h similarity index 100% rename from src/dis7/SupplyQuantity.h rename to src/dis7/logistics/SupplyQuantity.h diff --git a/src/dis7/MinefieldIdentifier.cpp b/src/dis7/minefield/MinefieldIdentifier.cpp similarity index 100% rename from src/dis7/MinefieldIdentifier.cpp rename to src/dis7/minefield/MinefieldIdentifier.cpp diff --git a/src/dis7/MinefieldIdentifier.h b/src/dis7/minefield/MinefieldIdentifier.h similarity index 100% rename from src/dis7/MinefieldIdentifier.h rename to src/dis7/minefield/MinefieldIdentifier.h diff --git a/src/dis7/simulation_management_with_reliability/CMakeLists.txt b/src/dis7/simulation_management_with_reliability/CMakeLists.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/dis7/LinearSegmentParameter.cpp b/src/dis7/synthetic_environment/LinearSegmentParameter.cpp similarity index 100% rename from src/dis7/LinearSegmentParameter.cpp rename to src/dis7/synthetic_environment/LinearSegmentParameter.cpp diff --git a/src/dis7/LinearSegmentParameter.h b/src/dis7/synthetic_environment/LinearSegmentParameter.h similarity index 100% rename from src/dis7/LinearSegmentParameter.h rename to src/dis7/synthetic_environment/LinearSegmentParameter.h diff --git a/src/dis7/ObjectType.cpp b/src/dis7/synthetic_environment/ObjectType.cpp similarity index 100% rename from src/dis7/ObjectType.cpp rename to src/dis7/synthetic_environment/ObjectType.cpp diff --git a/src/dis7/ObjectType.h b/src/dis7/synthetic_environment/ObjectType.h similarity index 100% rename from src/dis7/ObjectType.h rename to src/dis7/synthetic_environment/ObjectType.h diff --git a/src/dis7/DirectedEnergyDamage.cpp b/src/dis7/warfare/DirectedEnergyDamage.cpp similarity index 100% rename from src/dis7/DirectedEnergyDamage.cpp rename to src/dis7/warfare/DirectedEnergyDamage.cpp diff --git a/src/dis7/DirectedEnergyDamage.h b/src/dis7/warfare/DirectedEnergyDamage.h similarity index 100% rename from src/dis7/DirectedEnergyDamage.h rename to src/dis7/warfare/DirectedEnergyDamage.h diff --git a/src/dis7/MunitionDescriptor.cpp b/src/dis7/warfare/MunitionDescriptor.cpp similarity index 100% rename from src/dis7/MunitionDescriptor.cpp rename to src/dis7/warfare/MunitionDescriptor.cpp diff --git a/src/dis7/MunitionDescriptor.h b/src/dis7/warfare/MunitionDescriptor.h similarity index 100% rename from src/dis7/MunitionDescriptor.h rename to src/dis7/warfare/MunitionDescriptor.h diff --git a/src/dis7/StandardVariableSpecification.cpp b/src/dis7/warfare/StandardVariableSpecification.cpp similarity index 100% rename from src/dis7/StandardVariableSpecification.cpp rename to src/dis7/warfare/StandardVariableSpecification.cpp diff --git a/src/dis7/StandardVariableSpecification.h b/src/dis7/warfare/StandardVariableSpecification.h similarity index 100% rename from src/dis7/StandardVariableSpecification.h rename to src/dis7/warfare/StandardVariableSpecification.h From a64d1e6a38eff83d2a66781d62e23b08bfb138ca Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Fri, 19 Jan 2024 15:12:47 -0600 Subject: [PATCH 16/22] [WIP] --- .clang-tidy | 2 + src/dis6/common/ArticulationParameter.cpp | 3 +- src/dis6/common/ArticulationParameter.h | 45 ++++++++++--------- src/dis6/common/CMakeLists.txt | 6 --- .../AcousticBeamData.cpp | 14 ++---- .../distributed_emissions/AcousticBeamData.h | 4 +- .../AcousticBeamFundamentalParameter.cpp | 6 +-- .../AcousticBeamFundamentalParameter.h | 2 +- src/dis6/utils/CMakeLists.txt | 8 ---- src/dis6/warfare/BurstDescriptor.cpp | 2 +- src/dis6/warfare/BurstDescriptor.h | 2 +- src/dis6/warfare/DetonationPdu.cpp | 13 ++---- 12 files changed, 43 insertions(+), 64 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index a5868e94..a0eb0716 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -28,7 +28,9 @@ CheckOptions: - { key: readability-identifier-naming.GlobalConstantCase, value: CamelCase } - { key: readability-identifier-naming.GlobalConstantPrefix, value: k } - { key: readability-identifier-naming.PrivateMemberSuffix, value: _ } + - { key: readability-identifier-naming.PrivateMemberCase, value: lower_case } - { key: readability-identifier-naming.ProtectedMemberSuffix, value: _ } + - { key: readability-identifier-naming.ProtectedMemberCase, value: lower_case } - { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase } - { key: readability-identifier-naming.ConstexprVariablePrefix, value: k } - { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE } diff --git a/src/dis6/common/ArticulationParameter.cpp b/src/dis6/common/ArticulationParameter.cpp index ac950733..d5ba7256 100644 --- a/src/dis6/common/ArticulationParameter.cpp +++ b/src/dis6/common/ArticulationParameter.cpp @@ -1,6 +1,6 @@ #include "dis6/common/ArticulationParameter.h" -using namespace DIS; +namespace dis { ArticulationParameter::ArticulationParameter() : _parameterTypeDesignator(0), @@ -87,6 +87,7 @@ int ArticulationParameter::getMarshalledSize() const { return marshalSize; } +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/ArticulationParameter.h b/src/dis6/common/ArticulationParameter.h index 4cdc568d..b41ddc2b 100644 --- a/src/dis6/common/ArticulationParameter.h +++ b/src/dis6/common/ArticulationParameter.h @@ -1,9 +1,10 @@ #pragma once -#include "dis6/common/opendis6_export.h" +#include + #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.5. Articulation parameters for movable parts and attached parts // of an entity. Specifes wether or not a change has occured, the part // identifcation of the articulated part to which it is attached, and the type @@ -14,45 +15,45 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ArticulationParameter { +class ArticulationParameter { protected: - uint8_t _parameterTypeDesignator; + uint8_t parameter_type_designator_; - uint8_t _changeIndicator; + uint8_t change_indicator_; - uint16_t _partAttachedTo; + uint16_t part_attached_to_; - int _parameterType; + int parameter_type_; - double _parameterValue; + double parameter_value_; public: ArticulationParameter(); virtual ~ArticulationParameter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint8_t getParameterTypeDesignator() const; - void setParameterTypeDesignator(uint8_t pX); + [[nodiscard]] uint8_t GetParameterTypeDesignator() const; + void SetParameterTypeDesignator(uint8_t pX); - uint8_t getChangeIndicator() const; - void setChangeIndicator(uint8_t pX); + [[nodiscard]] uint8_t GetChangeIndicator() const; + void SetChangeIndicator(uint8_t pX); - uint16_t getPartAttachedTo() const; - void setPartAttachedTo(uint16_t pX); + [[nodiscard]] uint16_t GetPartAttachedTo() const; + void SetPartAttachedTo(uint16_t pX); - int getParameterType() const; - void setParameterType(int pX); + [[nodiscard]] int GetParameterType() const; + void SetParameterType(int pX); - double getParameterValue() const; - void setParameterValue(double pX); + [[nodiscard]] double GetParameterValue() const; + void SetParameterValue(double pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const ArticulationParameter& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/CMakeLists.txt b/src/dis6/common/CMakeLists.txt index 72009da4..33030f3f 100644 --- a/src/dis6/common/CMakeLists.txt +++ b/src/dis6/common/CMakeLists.txt @@ -38,12 +38,6 @@ set(common_hdr Vector3Float.h ) -list(TRANSFORM common_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") - -include(GenerateExportHeader) -generate_export_header(OpenDIS6) -list(APPEND common_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") - target_sources(OpenDIS6 PRIVATE ${common_src}) install(FILES ${common_hdr} diff --git a/src/dis6/distributed_emissions/AcousticBeamData.cpp b/src/dis6/distributed_emissions/AcousticBeamData.cpp index ace917b3..03bbd939 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamData.cpp @@ -1,4 +1,4 @@ -#include "dis6/AcousticBeamData.h" +#include "dis6/distribued_emissions/AcousticBeamData.h" using namespace DIS; @@ -10,17 +10,11 @@ AcousticBeamData::AcousticBeamData() AcousticBeamData::~AcousticBeamData() {} -uint16_t AcousticBeamData::getBeamDataLength() const { - return _beamDataLength; -} +uint16_t AcousticBeamData::getBeamDataLength() const { return _beamDataLength; } -void AcousticBeamData::setBeamDataLength(uint16_t pX) { - _beamDataLength = pX; -} +void AcousticBeamData::setBeamDataLength(uint16_t pX) { _beamDataLength = pX; } -uint8_t AcousticBeamData::getBeamIDNumber() const { - return _beamIDNumber; -} +uint8_t AcousticBeamData::getBeamIDNumber() const { return _beamIDNumber; } void AcousticBeamData::setBeamIDNumber(uint8_t pX) { _beamIDNumber = pX; } diff --git a/src/dis6/distributed_emissions/AcousticBeamData.h b/src/dis6/distributed_emissions/AcousticBeamData.h index 644e9518..1d95748a 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.h +++ b/src/dis6/distributed_emissions/AcousticBeamData.h @@ -1,7 +1,7 @@ #pragma once -#include "dis6/AcousticBeamFundamentalParameter.h" -#include "dis6/opendis6_export.h" +#include "dis6/distributed_emissions/AcousticBeamFundamentalParameter.h" +#include "dis6/distributed_emissions/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp index f1219c59..aefb2b1f 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp @@ -1,4 +1,4 @@ -#include "dis6/AcousticBeamFundamentalParameter.h" +#include "dis6/distributed_emissions/AcousticBeamFundamentalParameter.h" using namespace DIS; @@ -12,8 +12,8 @@ AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter() AcousticBeamFundamentalParameter::~AcousticBeamFundamentalParameter() {} -uint16_t -AcousticBeamFundamentalParameter::getActiveEmissionParameterIndex() const { +uint16_t AcousticBeamFundamentalParameter::getActiveEmissionParameterIndex() + const { return _activeEmissionParameterIndex; } diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h index 5d09cc20..a0bfa0fe 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" +#include "dis6/distributed_emissions/opendis6_export.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/utils/CMakeLists.txt b/src/dis6/utils/CMakeLists.txt index a5f29523..8fb34107 100644 --- a/src/dis6/utils/CMakeLists.txt +++ b/src/dis6/utils/CMakeLists.txt @@ -26,13 +26,5 @@ set(utils_src StreamUtils.cpp ) -# CMake < 3.16 requires target_sources to be specified as -# absolute paths if not in the same directory as the target -# definition. If cmake_minimum_required is ever changed to -# be >= 16, these 2 lines can be removed. -list(TRANSFORM utils_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") - -target_sources(OpenDIS6 PRIVATE ${utils_src}) - install(FILES ${utils_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dis6/utils) diff --git a/src/dis6/warfare/BurstDescriptor.cpp b/src/dis6/warfare/BurstDescriptor.cpp index 99d4a263..bbd43328 100644 --- a/src/dis6/warfare/BurstDescriptor.cpp +++ b/src/dis6/warfare/BurstDescriptor.cpp @@ -1,4 +1,4 @@ -#include "dis6/BurstDescriptor.h" +#include "dis6/warfare/BurstDescriptor.h" using namespace DIS; diff --git a/src/dis6/warfare/BurstDescriptor.h b/src/dis6/warfare/BurstDescriptor.h index 9efac4b6..a652d8ad 100644 --- a/src/dis6/warfare/BurstDescriptor.h +++ b/src/dis6/warfare/BurstDescriptor.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/EntityType.h" +#include "dis6/common/EntityType.h" #include "dis6/opendis6_export.h" #include "dis6/utils/DataStream.h" diff --git a/src/dis6/warfare/DetonationPdu.cpp b/src/dis6/warfare/DetonationPdu.cpp index 7e11c161..1c8bb1e1 100644 --- a/src/dis6/warfare/DetonationPdu.cpp +++ b/src/dis6/warfare/DetonationPdu.cpp @@ -1,4 +1,4 @@ -#include "dis6/DetonationPdu.h" +#include "dis6/warfare/DetonationPdu.h" using namespace DIS; @@ -72,13 +72,9 @@ void DetonationPdu::setLocationInEntityCoordinates(const Vector3Float& pX) { _locationInEntityCoordinates = pX; } -uint8_t DetonationPdu::getDetonationResult() const { - return _detonationResult; -} +uint8_t DetonationPdu::getDetonationResult() const { return _detonationResult; } -void DetonationPdu::setDetonationResult(uint8_t pX) { - _detonationResult = pX; -} +void DetonationPdu::setDetonationResult(uint8_t pX) { _detonationResult = pX; } uint8_t DetonationPdu::getNumberOfArticulationParameters() const { return _articulationParameters.size(); @@ -185,8 +181,7 @@ int DetonationPdu::getMarshalledSize() const { marshalSize = marshalSize + 1; // _numberOfArticulationParameters marshalSize = marshalSize + 2; // _pad - for (uint64_t idx = 0; idx < _articulationParameters.size(); - idx++) { + for (uint64_t idx = 0; idx < _articulationParameters.size(); idx++) { ArticulationParameter listElement = _articulationParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } From 7b9afece1cdc96a59592c866313aabbc50f435c4 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Fri, 19 Jan 2024 15:45:54 -0600 Subject: [PATCH 17/22] Removed unnecessary OPENDIS6_EXPORT macro --- src/dis6/common/ClockTime.h | 4 +- src/dis6/common/EightByteChunk.h | 4 +- src/dis6/common/EntityID.h | 4 +- src/dis6/common/EntityType.h | 4 +- src/dis6/common/EventID.h | 4 +- src/dis6/common/FixedDatum.h | 4 +- src/dis6/common/FourByteChunk.h | 4 +- src/dis6/common/Orientation.h | 4 +- src/dis6/common/Pdu.h | 4 +- src/dis6/common/RecordSet.h | 4 +- src/dis6/common/SimulationAddress.h | 4 +- src/dis6/common/SixByteChunk.h | 4 +- src/dis6/common/TwoByteChunk.h | 4 +- src/dis6/common/VariableDatum.h | 4 +- src/dis6/common/Vector3Double.h | 4 +- src/dis6/common/Vector3Float.h | 4 +- .../distributed_emissions/AcousticBeamData.h | 2 +- .../AcousticBeamFundamentalParameter.h | 2 +- .../distributed_emissions/AcousticEmitter.h | 4 +- .../AcousticEmitterSystem.h | 4 +- .../AcousticEmitterSystemData.h | 4 +- src/dis6/distributed_emissions/ApaData.h | 4 +- src/dis6/distributed_emissions/BeamData.h | 4 +- .../distributed_emissions/DesignatorPdu.h | 2 +- .../DistributedEmissionsFamilyPdu.h | 4 +- .../ElectromagneticEmissionBeamData.h | 4 +- .../ElectromagneticEmissionSystemData.h | 4 +- .../ElectromagneticEmissionsPdu.h | 4 +- .../distributed_emissions/EmitterSystem.h | 4 +- .../FundamentalParameterData.h | 4 +- .../FundamentalParameterDataIff.h | 4 +- .../IffAtcNavAidsLayer1Pdu.h | 4 +- .../IffAtcNavAidsLayer2Pdu.h | 4 +- .../IffFundamentalData.h | 4 +- src/dis6/distributed_emissions/LayerHeader.h | 4 +- .../PropulsionSystemData.h | 4 +- src/dis6/distributed_emissions/SeesPdu.h | 4 +- src/dis6/distributed_emissions/ShaftRPMs.h | 4 +- src/dis6/distributed_emissions/SystemID.h | 4 +- .../distributed_emissions/TrackJamTarget.h | 4 +- .../UnderwaterAcousticsPdu.h | 4 +- .../VectoringNozzleSystemData.h | 4 +- .../entity_information/CollisionElasticPdu.h | 4 +- src/dis6/entity_information/CollisionPdu.h | 4 +- .../DeadReckoningParameter.h | 4 +- .../EntityInformationFamilyPdu.h | 4 +- src/dis6/entity_information/EntityStatePdu.h | 4 +- .../entity_information/EntityStateUpdatePdu.h | 4 +- src/dis6/entity_management/AggregateID.h | 4 +- src/dis6/entity_management/AggregateMarking.h | 4 +- .../entity_management/AggregateStatePdu.h | 4 +- src/dis6/entity_management/AggregateType.h | 4 +- .../EntityManagementFamilyPdu.h | 4 +- src/dis6/entity_management/IsGroupOfPdu.h | 4 +- src/dis6/entity_management/IsPartOfPdu.h | 4 +- src/dis6/entity_management/Marking.h | 4 +- src/dis6/entity_management/NamedLocation.h | 4 +- src/dis6/entity_management/Relationship.h | 4 +- .../TransferControlRequestPdu.h | 4 +- src/dis6/logistics/LogisticsFamilyPdu.h | 4 +- src/dis6/logistics/RepairCompletePdu.h | 4 +- src/dis6/logistics/RepairResponsePdu.h | 4 +- src/dis6/logistics/ResupplyCancelPdu.h | 4 +- src/dis6/logistics/ResupplyOfferPdu.h | 4 +- src/dis6/logistics/ResupplyReceivedPdu.h | 4 +- src/dis6/logistics/ServiceRequestPdu.h | 4 +- src/dis6/logistics/SupplyQuantity.h | 4 +- src/dis6/minefield/MinefieldDataPdu.h | 4 +- src/dis6/minefield/MinefieldFamilyPdu.h | 4 +- src/dis6/minefield/MinefieldQueryPdu.h | 4 +- src/dis6/minefield/MinefieldResponseNackPdu.h | 4 +- src/dis6/minefield/MinefieldStatePdu.h | 4 +- src/dis6/minefield/Point.h | 4 +- .../radio_communications/AntennaLocation.h | 4 +- .../IntercomCommunicationsParameters.h | 4 +- .../radio_communications/IntercomControlPdu.h | 4 +- .../radio_communications/IntercomSignalPdu.h | 4 +- .../radio_communications/ModulationType.h | 4 +- .../RadioCommunicationsFamilyPdu.h | 4 +- .../radio_communications/RadioEntityType.h | 4 +- src/dis6/radio_communications/ReceiverPdu.h | 4 +- src/dis6/radio_communications/SignalPdu.h | 4 +- .../radio_communications/TransmitterPdu.h | 4 +- .../simulation_management/AcknowledgePdu.h | 4 +- .../simulation_management/ActionRequestPdu.h | 4 +- .../simulation_management/ActionResponsePdu.h | 4 +- src/dis6/simulation_management/CommentPdu.h | 4 +- .../simulation_management/CreateEntityPdu.h | 4 +- src/dis6/simulation_management/DataPdu.h | 4 +- src/dis6/simulation_management/DataQueryPdu.h | 4 +- .../simulation_management/EventReportPdu.h | 4 +- .../simulation_management/RemoveEntityPdu.h | 4 +- src/dis6/simulation_management/SetDataPdu.h | 4 +- .../SimulationManagementFamilyPdu.h | 4 +- .../simulation_management/StartResumePdu.h | 4 +- .../simulation_management/StopFreezePdu.h | 4 +- .../AcknowledgeReliablePdu.h | 4 +- .../ActionRequestReliablePdu.h | 4 +- .../ActionResponseReliablePdu.h | 4 +- .../CommentReliablePdu.h | 4 +- .../CreateEntityReliablePdu.h | 4 +- .../DataQueryReliablePdu.h | 4 +- .../DataReliablePdu.h | 4 +- .../EventReportReliablePdu.h | 4 +- .../RecordQueryReliablePdu.h | 4 +- .../RemoveEntityReliablePdu.h | 4 +- .../SetDataReliablePdu.h | 4 +- .../SetRecordReliablePdu.h | 4 +- ...lationManagementWithReliabilityFamilyPdu.h | 4 +- .../StartResumeReliablePdu.h | 4 +- .../StopFreezeReliablePdu.h | 4 +- .../ArealObjectStatePdu.h | 4 +- src/dis6/synthetic_environment/Environment.h | 4 +- .../EnvironmentalProcessPdu.h | 4 +- .../synthetic_environment/GridAxisRecord.h | 4 +- .../GridAxisRecordRepresentation0.h | 4 +- .../GridAxisRecordRepresentation1.h | 4 +- .../GridAxisRecordRepresentation2.h | 4 +- .../synthetic_environment/GriddedDataPdu.h | 4 +- .../LinearObjectStatePdu.h | 4 +- .../LinearSegmentParameter.h | 4 +- src/dis6/synthetic_environment/ObjectType.h | 4 +- .../PointObjectStatePdu.h | 4 +- .../SyntheticEnvironmentFamilyPdu.h | 4 +- src/dis6/utils/Conversion.cpp | 17 +++++---- src/dis6/utils/Conversion.h | 10 ++--- src/dis6/utils/DataStream.cpp | 8 ++-- src/dis6/utils/DataStream.h | 38 +++++++++---------- src/dis6/utils/Endian.h | 9 ++--- src/dis6/utils/IBufferProcessor.h | 8 ++-- src/dis6/utils/IncomingMessage.h | 18 ++++----- src/dis6/utils/Masks.h | 8 ++-- src/dis6/utils/PDUBank.h | 10 ++--- src/dis6/utils/PDUType.h | 2 +- src/dis6/utils/PacketFactory.h | 21 +++++----- src/dis6/utils/PduFactory.h | 2 +- src/dis6/utils/StreamUtils.h | 18 +++------ src/dis6/warfare/BurstDescriptor.h | 4 +- src/dis6/warfare/DetonationPdu.h | 4 +- src/dis6/warfare/FirePdu.h | 4 +- src/dis6/warfare/WarfareFamilyPdu.h | 4 +- 141 files changed, 332 insertions(+), 343 deletions(-) diff --git a/src/dis6/common/ClockTime.h b/src/dis6/common/ClockTime.h index 7c8d0527..de8025ba 100644 --- a/src/dis6/common/ClockTime.h +++ b/src/dis6/common/ClockTime.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ClockTime { +class ClockTime { protected: /** Hours in UTC */ int _hour; diff --git a/src/dis6/common/EightByteChunk.h b/src/dis6/common/EightByteChunk.h index a192899c..ee14168e 100644 --- a/src/dis6/common/EightByteChunk.h +++ b/src/dis6/common/EightByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EightByteChunk { +class EightByteChunk { protected: /** Eight bytes of arbitrary data */ char _otherParameters[8]; diff --git a/src/dis6/common/EntityID.h b/src/dis6/common/EntityID.h index e6f31916..e9599fa7 100644 --- a/src/dis6/common/EntityID.h +++ b/src/dis6/common/EntityID.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -24,7 +24,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityID { +class EntityID { protected: /** The site ID */ uint16_t _site; diff --git a/src/dis6/common/EntityType.h b/src/dis6/common/EntityType.h index 4a888449..ac2e37da 100644 --- a/src/dis6/common/EntityType.h +++ b/src/dis6/common/EntityType.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityType { +class EntityType { protected: /** Kind of entity */ uint8_t _entityKind; diff --git a/src/dis6/common/EventID.h b/src/dis6/common/EventID.h index bd14bd79..220187ec 100644 --- a/src/dis6/common/EventID.h +++ b/src/dis6/common/EventID.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EventID { +class EventID { protected: /** The site ID */ uint16_t _site; diff --git a/src/dis6/common/FixedDatum.h b/src/dis6/common/FixedDatum.h index 5515cbda..7125ab8a 100644 --- a/src/dis6/common/FixedDatum.h +++ b/src/dis6/common/FixedDatum.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT FixedDatum { +class FixedDatum { protected: /** ID of the fixed datum */ uint32_t _fixedDatumID; diff --git a/src/dis6/common/FourByteChunk.h b/src/dis6/common/FourByteChunk.h index 5273a2ed..53f66afc 100644 --- a/src/dis6/common/FourByteChunk.h +++ b/src/dis6/common/FourByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT FourByteChunk { +class FourByteChunk { protected: /** four bytes of arbitrary data */ char _otherParameters[4]; diff --git a/src/dis6/common/Orientation.h b/src/dis6/common/Orientation.h index d6edabf1..6088dae5 100644 --- a/src/dis6/common/Orientation.h +++ b/src/dis6/common/Orientation.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Orientation { +class Orientation { protected: float _psi; diff --git a/src/dis6/common/Pdu.h b/src/dis6/common/Pdu.h index 8a65a08f..87606e97 100644 --- a/src/dis6/common/Pdu.h +++ b/src/dis6/common/Pdu.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Pdu { +class Pdu { protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998. */ uint8_t _protocolVersion; diff --git a/src/dis6/common/RecordSet.h b/src/dis6/common/RecordSet.h index 4b1a1d53..e3b804ec 100644 --- a/src/dis6/common/RecordSet.h +++ b/src/dis6/common/RecordSet.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RecordSet { +class RecordSet { protected: /** record ID */ uint32_t _recordID; diff --git a/src/dis6/common/SimulationAddress.h b/src/dis6/common/SimulationAddress.h index 1322a5f1..504e3e62 100644 --- a/src/dis6/common/SimulationAddress.h +++ b/src/dis6/common/SimulationAddress.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SimulationAddress { +class SimulationAddress { protected: /** The site ID */ uint16_t _site; diff --git a/src/dis6/common/SixByteChunk.h b/src/dis6/common/SixByteChunk.h index 7aef43ae..0fc25cde 100644 --- a/src/dis6/common/SixByteChunk.h +++ b/src/dis6/common/SixByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SixByteChunk { +class SixByteChunk { protected: /** six bytes of arbitrary data */ char _otherParameters[6]; diff --git a/src/dis6/common/TwoByteChunk.h b/src/dis6/common/TwoByteChunk.h index 74fab719..0b05ed65 100644 --- a/src/dis6/common/TwoByteChunk.h +++ b/src/dis6/common/TwoByteChunk.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT TwoByteChunk { +class TwoByteChunk { protected: /** two bytes of arbitrary data */ char _otherParameters[2]; diff --git a/src/dis6/common/VariableDatum.h b/src/dis6/common/VariableDatum.h index 605ed490..dc23e8de 100644 --- a/src/dis6/common/VariableDatum.h +++ b/src/dis6/common/VariableDatum.h @@ -2,7 +2,7 @@ #include -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" // length in bytes for the variable data. This should be a dynamically allocated @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT VariableDatum { +class VariableDatum { protected: /** ID of the variable datum */ uint32_t _variableDatumID; diff --git a/src/dis6/common/Vector3Double.h b/src/dis6/common/Vector3Double.h index f02ccc75..29c96784 100644 --- a/src/dis6/common/Vector3Double.h +++ b/src/dis6/common/Vector3Double.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Vector3Double { +class Vector3Double { protected: /** X value */ double _x; diff --git a/src/dis6/common/Vector3Float.h b/src/dis6/common/Vector3Float.h index 7629e446..643f5512 100644 --- a/src/dis6/common/Vector3Float.h +++ b/src/dis6/common/Vector3Float.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/common/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Vector3Float { +class Vector3Float { protected: /** X value */ float _x; diff --git a/src/dis6/distributed_emissions/AcousticBeamData.h b/src/dis6/distributed_emissions/AcousticBeamData.h index 1d95748a..ed7bbcc5 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.h +++ b/src/dis6/distributed_emissions/AcousticBeamData.h @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticBeamData { +class AcousticBeamData { protected: /** beam data length */ uint16_t _beamDataLength; diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h index a0bfa0fe..85b012e9 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticBeamFundamentalParameter { +class AcousticBeamFundamentalParameter { protected: /** parameter index */ uint16_t _activeEmissionParameterIndex; diff --git a/src/dis6/distributed_emissions/AcousticEmitter.h b/src/dis6/distributed_emissions/AcousticEmitter.h index ae2b878c..0708e50d 100644 --- a/src/dis6/distributed_emissions/AcousticEmitter.h +++ b/src/dis6/distributed_emissions/AcousticEmitter.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticEmitter { +class AcousticEmitter { protected: /** the system for a particular UA emitter, and an enumeration */ uint16_t _acousticName; diff --git a/src/dis6/distributed_emissions/AcousticEmitterSystem.h b/src/dis6/distributed_emissions/AcousticEmitterSystem.h index b3e7814a..16ca5ffe 100644 --- a/src/dis6/distributed_emissions/AcousticEmitterSystem.h +++ b/src/dis6/distributed_emissions/AcousticEmitterSystem.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticEmitterSystem { +class AcousticEmitterSystem { protected: /** This field shall specify the system for a particular UA emitter. */ uint16_t _acousticName; diff --git a/src/dis6/distributed_emissions/AcousticEmitterSystemData.h b/src/dis6/distributed_emissions/AcousticEmitterSystemData.h index 09fee175..bf9f1b33 100644 --- a/src/dis6/distributed_emissions/AcousticEmitterSystemData.h +++ b/src/dis6/distributed_emissions/AcousticEmitterSystemData.h @@ -5,7 +5,7 @@ #include "dis6/AcousticBeamData.h" #include "dis6/AcousticEmitterSystem.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AcousticEmitterSystemData { +class AcousticEmitterSystemData { protected: /** Length of emitter system data */ uint8_t _emitterSystemDataLength; diff --git a/src/dis6/distributed_emissions/ApaData.h b/src/dis6/distributed_emissions/ApaData.h index 9d43aec8..fae3ff2c 100644 --- a/src/dis6/distributed_emissions/ApaData.h +++ b/src/dis6/distributed_emissions/ApaData.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ApaData { +class ApaData { protected: /** Index of APA parameter */ uint16_t _parameterIndex; diff --git a/src/dis6/distributed_emissions/BeamData.h b/src/dis6/distributed_emissions/BeamData.h index 7a79abab..324abeb6 100644 --- a/src/dis6/distributed_emissions/BeamData.h +++ b/src/dis6/distributed_emissions/BeamData.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT BeamData { +class BeamData { protected: /** Specifies the beam azimuth an elevation centers and corresponding * half-angles to describe the scan volume */ diff --git a/src/dis6/distributed_emissions/DesignatorPdu.h b/src/dis6/distributed_emissions/DesignatorPdu.h index f72b27aa..588b0003 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.h +++ b/src/dis6/distributed_emissions/DesignatorPdu.h @@ -15,7 +15,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DesignatorPdu : public DistributedEmissionsFamilyPdu { +class DesignatorPdu : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity designating */ EntityID _designatingEntityID; diff --git a/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h index 534aba31..ccda1981 100644 --- a/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h +++ b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DistributedEmissionsFamilyPdu : public Pdu { +class DistributedEmissionsFamilyPdu : public Pdu { protected: public: DistributedEmissionsFamilyPdu(); diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h index e0358f57..567f1a09 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h @@ -4,7 +4,7 @@ #include "dis6/FundamentalParameterData.h" #include "dis6/TrackJamTarget.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -15,7 +15,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ElectromagneticEmissionBeamData { +class ElectromagneticEmissionBeamData { protected: /** This field shall specify the length of this beams data in 32 bit words */ uint8_t _beamDataLength; diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h index bd821dc6..7763ae8d 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h @@ -5,7 +5,7 @@ #include "dis6/ElectromagneticEmissionBeamData.h" #include "dis6/EmitterSystem.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ElectromagneticEmissionSystemData { +class ElectromagneticEmissionSystemData { protected: /** This field shall specify the length of this emitter system�s data * (including beam data and its track/jam information) in 32-bit words. The diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h index c1618676..dbd65471 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h @@ -6,7 +6,7 @@ #include "dis6/ElectromagneticEmissionSystemData.h" #include "dis6/EntityID.h" #include "dis6/EventID.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ElectromagneticEmissionsPdu +class ElectromagneticEmissionsPdu : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity emitting */ diff --git a/src/dis6/distributed_emissions/EmitterSystem.h b/src/dis6/distributed_emissions/EmitterSystem.h index cd0d8142..d014adba 100644 --- a/src/dis6/distributed_emissions/EmitterSystem.h +++ b/src/dis6/distributed_emissions/EmitterSystem.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EmitterSystem { +class EmitterSystem { protected: /** Name of the emitter, 16 bit enumeration */ uint16_t _emitterName; diff --git a/src/dis6/distributed_emissions/FundamentalParameterData.h b/src/dis6/distributed_emissions/FundamentalParameterData.h index 3929bb6f..377f539b 100644 --- a/src/dis6/distributed_emissions/FundamentalParameterData.h +++ b/src/dis6/distributed_emissions/FundamentalParameterData.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT FundamentalParameterData { +class FundamentalParameterData { protected: /** center frequency of the emission in hertz. */ float _frequency; diff --git a/src/dis6/distributed_emissions/FundamentalParameterDataIff.h b/src/dis6/distributed_emissions/FundamentalParameterDataIff.h index 09dbe436..7a063979 100644 --- a/src/dis6/distributed_emissions/FundamentalParameterDataIff.h +++ b/src/dis6/distributed_emissions/FundamentalParameterDataIff.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT FundamentalParameterDataIff { +class FundamentalParameterDataIff { protected: /** ERP */ float _erp; diff --git a/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h index 0bf02ae4..c1224f18 100644 --- a/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h +++ b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h @@ -6,7 +6,7 @@ #include "dis6/IffFundamentalData.h" #include "dis6/SystemID.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IffAtcNavAidsLayer1Pdu +class IffAtcNavAidsLayer1Pdu : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity that is the source of the emissions */ diff --git a/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h index aeb40814..b11cbfda 100644 --- a/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h +++ b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h @@ -6,7 +6,7 @@ #include "dis6/FundamentalParameterDataIff.h" #include "dis6/IffAtcNavAidsLayer1Pdu.h" #include "dis6/LayerHeader.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IffAtcNavAidsLayer2Pdu : public IffAtcNavAidsLayer1Pdu { +class IffAtcNavAidsLayer2Pdu : public IffAtcNavAidsLayer1Pdu { protected: /** layer header */ LayerHeader _layerHeader; diff --git a/src/dis6/distributed_emissions/IffFundamentalData.h b/src/dis6/distributed_emissions/IffFundamentalData.h index 3cc077c5..68ec3506 100644 --- a/src/dis6/distributed_emissions/IffFundamentalData.h +++ b/src/dis6/distributed_emissions/IffFundamentalData.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IffFundamentalData { +class IffFundamentalData { protected: /** system status */ uint8_t _systemStatus; diff --git a/src/dis6/distributed_emissions/LayerHeader.h b/src/dis6/distributed_emissions/LayerHeader.h index deb6adcb..a885c4bd 100644 --- a/src/dis6/distributed_emissions/LayerHeader.h +++ b/src/dis6/distributed_emissions/LayerHeader.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT LayerHeader { +class LayerHeader { protected: /** Layer number */ uint8_t _layerNumber; diff --git a/src/dis6/distributed_emissions/PropulsionSystemData.h b/src/dis6/distributed_emissions/PropulsionSystemData.h index a65a1d10..96f52896 100644 --- a/src/dis6/distributed_emissions/PropulsionSystemData.h +++ b/src/dis6/distributed_emissions/PropulsionSystemData.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT PropulsionSystemData { +class PropulsionSystemData { protected: /** powerSetting */ float _powerSetting; diff --git a/src/dis6/distributed_emissions/SeesPdu.h b/src/dis6/distributed_emissions/SeesPdu.h index 3f18ffa4..5aee9227 100644 --- a/src/dis6/distributed_emissions/SeesPdu.h +++ b/src/dis6/distributed_emissions/SeesPdu.h @@ -6,7 +6,7 @@ #include "dis6/EntityID.h" #include "dis6/PropulsionSystemData.h" #include "dis6/VectoringNozzleSystemData.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -18,7 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SeesPdu : public DistributedEmissionsFamilyPdu { +class SeesPdu : public DistributedEmissionsFamilyPdu { protected: /** Originating entity ID */ EntityID _orginatingEntityID; diff --git a/src/dis6/distributed_emissions/ShaftRPMs.h b/src/dis6/distributed_emissions/ShaftRPMs.h index a1b485e9..c1ffe5f7 100644 --- a/src/dis6/distributed_emissions/ShaftRPMs.h +++ b/src/dis6/distributed_emissions/ShaftRPMs.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ShaftRPMs { +class ShaftRPMs { protected: /** Current shaft RPMs */ int16_t _currentShaftRPMs; diff --git a/src/dis6/distributed_emissions/SystemID.h b/src/dis6/distributed_emissions/SystemID.h index 1e2c6b93..dc60e485 100644 --- a/src/dis6/distributed_emissions/SystemID.h +++ b/src/dis6/distributed_emissions/SystemID.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SystemID { +class SystemID { protected: /** System Type */ uint16_t _systemType; diff --git a/src/dis6/distributed_emissions/TrackJamTarget.h b/src/dis6/distributed_emissions/TrackJamTarget.h index 0d6aae47..ba029b6d 100644 --- a/src/dis6/distributed_emissions/TrackJamTarget.h +++ b/src/dis6/distributed_emissions/TrackJamTarget.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/EntityID.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT TrackJamTarget { +class TrackJamTarget { protected: /** track/jam target */ EntityID _trackJam; diff --git a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h index 09ac29da..895101ca 100644 --- a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h +++ b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h @@ -8,7 +8,7 @@ #include "dis6/EntityID.h" #include "dis6/EventID.h" #include "dis6/ShaftRPMs.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -21,7 +21,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT UnderwaterAcousticsPdu +class UnderwaterAcousticsPdu : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity that is the source of the emission */ diff --git a/src/dis6/distributed_emissions/VectoringNozzleSystemData.h b/src/dis6/distributed_emissions/VectoringNozzleSystemData.h index fb0ab2c5..d49945b4 100644 --- a/src/dis6/distributed_emissions/VectoringNozzleSystemData.h +++ b/src/dis6/distributed_emissions/VectoringNozzleSystemData.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT VectoringNozzleSystemData { +class VectoringNozzleSystemData { protected: /** horizontal deflection angle */ float _horizontalDeflectionAngle; diff --git a/src/dis6/entity_information/CollisionElasticPdu.h b/src/dis6/entity_information/CollisionElasticPdu.h index 4fb5b666..a68815f6 100644 --- a/src/dis6/entity_information/CollisionElasticPdu.h +++ b/src/dis6/entity_information/CollisionElasticPdu.h @@ -4,7 +4,7 @@ #include "dis6/EntityInformationFamilyPdu.h" #include "dis6/EventID.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT CollisionElasticPdu : public EntityInformationFamilyPdu { +class CollisionElasticPdu : public EntityInformationFamilyPdu { protected: /** ID of the entity that issued the collision PDU */ EntityID _issuingEntityID; diff --git a/src/dis6/entity_information/CollisionPdu.h b/src/dis6/entity_information/CollisionPdu.h index 0fc2913a..538705e6 100644 --- a/src/dis6/entity_information/CollisionPdu.h +++ b/src/dis6/entity_information/CollisionPdu.h @@ -4,7 +4,7 @@ #include "dis6/EntityInformationFamilyPdu.h" #include "dis6/EventID.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -15,7 +15,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT CollisionPdu : public EntityInformationFamilyPdu { +class CollisionPdu : public EntityInformationFamilyPdu { protected: /** ID of the entity that issued the collision PDU */ EntityID _issuingEntityID; diff --git a/src/dis6/entity_information/DeadReckoningParameter.h b/src/dis6/entity_information/DeadReckoningParameter.h index 797fc880..f81ae86f 100644 --- a/src/dis6/entity_information/DeadReckoningParameter.h +++ b/src/dis6/entity_information/DeadReckoningParameter.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DeadReckoningParameter { +class DeadReckoningParameter { protected: /** enumeration of what dead reckoning algorighm to use */ uint8_t _deadReckoningAlgorithm; diff --git a/src/dis6/entity_information/EntityInformationFamilyPdu.h b/src/dis6/entity_information/EntityInformationFamilyPdu.h index 3c79ffdc..787880e6 100644 --- a/src/dis6/entity_information/EntityInformationFamilyPdu.h +++ b/src/dis6/entity_information/EntityInformationFamilyPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityInformationFamilyPdu : public Pdu { +class EntityInformationFamilyPdu : public Pdu { protected: public: EntityInformationFamilyPdu(); diff --git a/src/dis6/entity_information/EntityStatePdu.h b/src/dis6/entity_information/EntityStatePdu.h index 50d90acc..01997d0b 100644 --- a/src/dis6/entity_information/EntityStatePdu.h +++ b/src/dis6/entity_information/EntityStatePdu.h @@ -11,7 +11,7 @@ #include "dis6/Orientation.h" #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -23,7 +23,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityStatePdu : public EntityInformationFamilyPdu { +class EntityStatePdu : public EntityInformationFamilyPdu { protected: /** Unique ID for an entity that is tied to this state information */ EntityID _entityID; diff --git a/src/dis6/entity_information/EntityStateUpdatePdu.h b/src/dis6/entity_information/EntityStateUpdatePdu.h index f70e6002..3f0d402a 100644 --- a/src/dis6/entity_information/EntityStateUpdatePdu.h +++ b/src/dis6/entity_information/EntityStateUpdatePdu.h @@ -8,7 +8,7 @@ #include "dis6/Orientation.h" #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -20,7 +20,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityStateUpdatePdu : public EntityInformationFamilyPdu { +class EntityStateUpdatePdu : public EntityInformationFamilyPdu { protected: /** This field shall identify the entity issuing the PDU */ EntityID _entityID; diff --git a/src/dis6/entity_management/AggregateID.h b/src/dis6/entity_management/AggregateID.h index 93ec4003..82bad0ea 100644 --- a/src/dis6/entity_management/AggregateID.h +++ b/src/dis6/entity_management/AggregateID.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateID { +class AggregateID { protected: /** The site ID */ uint16_t _site; diff --git a/src/dis6/entity_management/AggregateMarking.h b/src/dis6/entity_management/AggregateMarking.h index 712f6f97..43c1632c 100644 --- a/src/dis6/entity_management/AggregateMarking.h +++ b/src/dis6/entity_management/AggregateMarking.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateMarking { +class AggregateMarking { protected: /** The character set */ uint8_t _characterSet; diff --git a/src/dis6/entity_management/AggregateStatePdu.h b/src/dis6/entity_management/AggregateStatePdu.h index 943beea8..d702dc3b 100644 --- a/src/dis6/entity_management/AggregateStatePdu.h +++ b/src/dis6/entity_management/AggregateStatePdu.h @@ -11,7 +11,7 @@ #include "dis6/VariableDatum.h" #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -26,7 +26,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateStatePdu : public EntityManagementFamilyPdu { +class AggregateStatePdu : public EntityManagementFamilyPdu { protected: /** ID of aggregated entities */ EntityID _aggregateID; diff --git a/src/dis6/entity_management/AggregateType.h b/src/dis6/entity_management/AggregateType.h index 227ae188..7aa00f3a 100644 --- a/src/dis6/entity_management/AggregateType.h +++ b/src/dis6/entity_management/AggregateType.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AggregateType { +class AggregateType { protected: /** Kind of entity */ uint8_t _aggregateKind; diff --git a/src/dis6/entity_management/EntityManagementFamilyPdu.h b/src/dis6/entity_management/EntityManagementFamilyPdu.h index 5e8442e0..757bd60b 100644 --- a/src/dis6/entity_management/EntityManagementFamilyPdu.h +++ b/src/dis6/entity_management/EntityManagementFamilyPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EntityManagementFamilyPdu : public Pdu { +class EntityManagementFamilyPdu : public Pdu { protected: public: EntityManagementFamilyPdu(); diff --git a/src/dis6/entity_management/IsGroupOfPdu.h b/src/dis6/entity_management/IsGroupOfPdu.h index eba66d58..4e5d1488 100644 --- a/src/dis6/entity_management/IsGroupOfPdu.h +++ b/src/dis6/entity_management/IsGroupOfPdu.h @@ -5,7 +5,7 @@ #include "dis6/EntityID.h" #include "dis6/EntityManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IsGroupOfPdu : public EntityManagementFamilyPdu { +class IsGroupOfPdu : public EntityManagementFamilyPdu { protected: /** ID of aggregated entities */ EntityID _groupEntityID; diff --git a/src/dis6/entity_management/IsPartOfPdu.h b/src/dis6/entity_management/IsPartOfPdu.h index a8272ee7..17ec00b7 100644 --- a/src/dis6/entity_management/IsPartOfPdu.h +++ b/src/dis6/entity_management/IsPartOfPdu.h @@ -6,7 +6,7 @@ #include "dis6/NamedLocation.h" #include "dis6/Relationship.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -18,7 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IsPartOfPdu : public EntityManagementFamilyPdu { +class IsPartOfPdu : public EntityManagementFamilyPdu { protected: /** ID of entity originating PDU */ EntityID _orginatingEntityID; diff --git a/src/dis6/entity_management/Marking.h b/src/dis6/entity_management/Marking.h index fa8d218e..f47cfd01 100644 --- a/src/dis6/entity_management/Marking.h +++ b/src/dis6/entity_management/Marking.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Marking { +class Marking { protected: /** The character set */ uint8_t _characterSet; diff --git a/src/dis6/entity_management/NamedLocation.h b/src/dis6/entity_management/NamedLocation.h index aa571aaf..805e7d1b 100644 --- a/src/dis6/entity_management/NamedLocation.h +++ b/src/dis6/entity_management/NamedLocation.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT NamedLocation { +class NamedLocation { protected: /** station name enumeration */ uint16_t _stationName; diff --git a/src/dis6/entity_management/Relationship.h b/src/dis6/entity_management/Relationship.h index a35f4e9d..3812b0bf 100644 --- a/src/dis6/entity_management/Relationship.h +++ b/src/dis6/entity_management/Relationship.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Relationship { +class Relationship { protected: /** Nature of join */ uint16_t _nature; diff --git a/src/dis6/entity_management/TransferControlRequestPdu.h b/src/dis6/entity_management/TransferControlRequestPdu.h index 3869d7df..4a3264b2 100644 --- a/src/dis6/entity_management/TransferControlRequestPdu.h +++ b/src/dis6/entity_management/TransferControlRequestPdu.h @@ -5,7 +5,7 @@ #include "dis6/EntityID.h" #include "dis6/EntityManagementFamilyPdu.h" #include "dis6/RecordSet.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -18,7 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT TransferControlRequestPdu +class TransferControlRequestPdu : public EntityManagementFamilyPdu { protected: /** ID of entity originating request */ diff --git a/src/dis6/logistics/LogisticsFamilyPdu.h b/src/dis6/logistics/LogisticsFamilyPdu.h index 4c6c2c0e..e64a7c22 100644 --- a/src/dis6/logistics/LogisticsFamilyPdu.h +++ b/src/dis6/logistics/LogisticsFamilyPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT LogisticsFamilyPdu : public Pdu { +class LogisticsFamilyPdu : public Pdu { protected: public: LogisticsFamilyPdu(); diff --git a/src/dis6/logistics/RepairCompletePdu.h b/src/dis6/logistics/RepairCompletePdu.h index 084fbfe6..9ffb3850 100644 --- a/src/dis6/logistics/RepairCompletePdu.h +++ b/src/dis6/logistics/RepairCompletePdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/LogisticsFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RepairCompletePdu : public LogisticsFamilyPdu { +class RepairCompletePdu : public LogisticsFamilyPdu { protected: /** Entity that is receiving service */ EntityID _receivingEntityID; diff --git a/src/dis6/logistics/RepairResponsePdu.h b/src/dis6/logistics/RepairResponsePdu.h index 6b64b365..39ff8a45 100644 --- a/src/dis6/logistics/RepairResponsePdu.h +++ b/src/dis6/logistics/RepairResponsePdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/LogisticsFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RepairResponsePdu : public LogisticsFamilyPdu { +class RepairResponsePdu : public LogisticsFamilyPdu { protected: /** Entity that is receiving service */ EntityID _receivingEntityID; diff --git a/src/dis6/logistics/ResupplyCancelPdu.h b/src/dis6/logistics/ResupplyCancelPdu.h index 7e0a2d45..ba62ea44 100644 --- a/src/dis6/logistics/ResupplyCancelPdu.h +++ b/src/dis6/logistics/ResupplyCancelPdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/LogisticsFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ResupplyCancelPdu : public LogisticsFamilyPdu { +class ResupplyCancelPdu : public LogisticsFamilyPdu { protected: /** Entity that is receiving service */ EntityID _receivingEntityID; diff --git a/src/dis6/logistics/ResupplyOfferPdu.h b/src/dis6/logistics/ResupplyOfferPdu.h index a6101bfd..594f4750 100644 --- a/src/dis6/logistics/ResupplyOfferPdu.h +++ b/src/dis6/logistics/ResupplyOfferPdu.h @@ -5,7 +5,7 @@ #include "dis6/EntityID.h" #include "dis6/LogisticsFamilyPdu.h" #include "dis6/SupplyQuantity.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ResupplyOfferPdu : public LogisticsFamilyPdu { +class ResupplyOfferPdu : public LogisticsFamilyPdu { protected: /** Entity that is receiving service */ EntityID _receivingEntityID; diff --git a/src/dis6/logistics/ResupplyReceivedPdu.h b/src/dis6/logistics/ResupplyReceivedPdu.h index df1f97fb..525ff0fd 100644 --- a/src/dis6/logistics/ResupplyReceivedPdu.h +++ b/src/dis6/logistics/ResupplyReceivedPdu.h @@ -5,7 +5,7 @@ #include "dis6/EntityID.h" #include "dis6/LogisticsFamilyPdu.h" #include "dis6/SupplyQuantity.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ResupplyReceivedPdu : public LogisticsFamilyPdu { +class ResupplyReceivedPdu : public LogisticsFamilyPdu { protected: /** Entity that is receiving service */ EntityID _receivingEntityID; diff --git a/src/dis6/logistics/ServiceRequestPdu.h b/src/dis6/logistics/ServiceRequestPdu.h index 29cca0c3..85689e52 100644 --- a/src/dis6/logistics/ServiceRequestPdu.h +++ b/src/dis6/logistics/ServiceRequestPdu.h @@ -5,7 +5,7 @@ #include "dis6/EntityID.h" #include "dis6/LogisticsFamilyPdu.h" #include "dis6/SupplyQuantity.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ServiceRequestPdu : public LogisticsFamilyPdu { +class ServiceRequestPdu : public LogisticsFamilyPdu { protected: /** Entity that is requesting service */ EntityID _requestingEntityID; diff --git a/src/dis6/logistics/SupplyQuantity.h b/src/dis6/logistics/SupplyQuantity.h index f41e8de6..f6bf204b 100644 --- a/src/dis6/logistics/SupplyQuantity.h +++ b/src/dis6/logistics/SupplyQuantity.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/EntityType.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SupplyQuantity { +class SupplyQuantity { protected: /** Type of supply */ EntityType _supplyType; diff --git a/src/dis6/minefield/MinefieldDataPdu.h b/src/dis6/minefield/MinefieldDataPdu.h index e59461ac..2802ea62 100644 --- a/src/dis6/minefield/MinefieldDataPdu.h +++ b/src/dis6/minefield/MinefieldDataPdu.h @@ -7,7 +7,7 @@ #include "dis6/MinefieldFamilyPdu.h" #include "dis6/TwoByteChunk.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldDataPdu : public MinefieldFamilyPdu { +class MinefieldDataPdu : public MinefieldFamilyPdu { protected: /** Minefield ID */ EntityID _minefieldID; diff --git a/src/dis6/minefield/MinefieldFamilyPdu.h b/src/dis6/minefield/MinefieldFamilyPdu.h index f59cd0a9..4751857b 100644 --- a/src/dis6/minefield/MinefieldFamilyPdu.h +++ b/src/dis6/minefield/MinefieldFamilyPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldFamilyPdu : public Pdu { +class MinefieldFamilyPdu : public Pdu { protected: public: MinefieldFamilyPdu(); diff --git a/src/dis6/minefield/MinefieldQueryPdu.h b/src/dis6/minefield/MinefieldQueryPdu.h index 793b7bdc..795eabc8 100644 --- a/src/dis6/minefield/MinefieldQueryPdu.h +++ b/src/dis6/minefield/MinefieldQueryPdu.h @@ -7,7 +7,7 @@ #include "dis6/MinefieldFamilyPdu.h" #include "dis6/Point.h" #include "dis6/TwoByteChunk.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldQueryPdu : public MinefieldFamilyPdu { +class MinefieldQueryPdu : public MinefieldFamilyPdu { protected: /** Minefield ID */ EntityID _minefieldID; diff --git a/src/dis6/minefield/MinefieldResponseNackPdu.h b/src/dis6/minefield/MinefieldResponseNackPdu.h index b2bd488a..4bad320e 100644 --- a/src/dis6/minefield/MinefieldResponseNackPdu.h +++ b/src/dis6/minefield/MinefieldResponseNackPdu.h @@ -5,7 +5,7 @@ #include "dis6/EightByteChunk.h" #include "dis6/EntityID.h" #include "dis6/MinefieldFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldResponseNackPdu : public MinefieldFamilyPdu { +class MinefieldResponseNackPdu : public MinefieldFamilyPdu { protected: /** Minefield ID */ EntityID _minefieldID; diff --git a/src/dis6/minefield/MinefieldStatePdu.h b/src/dis6/minefield/MinefieldStatePdu.h index aa58447c..f4325ff3 100644 --- a/src/dis6/minefield/MinefieldStatePdu.h +++ b/src/dis6/minefield/MinefieldStatePdu.h @@ -8,7 +8,7 @@ #include "dis6/Orientation.h" #include "dis6/Point.h" #include "dis6/Vector3Double.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -20,7 +20,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT MinefieldStatePdu : public MinefieldFamilyPdu { +class MinefieldStatePdu : public MinefieldFamilyPdu { protected: /** Minefield ID */ EntityID _minefieldID; diff --git a/src/dis6/minefield/Point.h b/src/dis6/minefield/Point.h index 8e72af92..abccc65d 100644 --- a/src/dis6/minefield/Point.h +++ b/src/dis6/minefield/Point.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Point { +class Point { protected: /** x */ float _x; diff --git a/src/dis6/radio_communications/AntennaLocation.h b/src/dis6/radio_communications/AntennaLocation.h index 268985fd..56e19a49 100644 --- a/src/dis6/radio_communications/AntennaLocation.h +++ b/src/dis6/radio_communications/AntennaLocation.h @@ -2,7 +2,7 @@ #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AntennaLocation { +class AntennaLocation { protected: /** Location of the radiating portion of the antenna in world coordinates */ diff --git a/src/dis6/radio_communications/IntercomCommunicationsParameters.h b/src/dis6/radio_communications/IntercomCommunicationsParameters.h index f5c80451..caad8d1b 100644 --- a/src/dis6/radio_communications/IntercomCommunicationsParameters.h +++ b/src/dis6/radio_communications/IntercomCommunicationsParameters.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IntercomCommunicationsParameters { +class IntercomCommunicationsParameters { protected: /** Type of intercom parameters record */ uint16_t _recordType; diff --git a/src/dis6/radio_communications/IntercomControlPdu.h b/src/dis6/radio_communications/IntercomControlPdu.h index 5b1fc451..44f9030e 100644 --- a/src/dis6/radio_communications/IntercomControlPdu.h +++ b/src/dis6/radio_communications/IntercomControlPdu.h @@ -5,7 +5,7 @@ #include "dis6/EntityID.h" #include "dis6/IntercomCommunicationsParameters.h" #include "dis6/RadioCommunicationsFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IntercomControlPdu : public RadioCommunicationsFamilyPdu { +class IntercomControlPdu : public RadioCommunicationsFamilyPdu { protected: /** control type */ uint8_t _controlType; diff --git a/src/dis6/radio_communications/IntercomSignalPdu.h b/src/dis6/radio_communications/IntercomSignalPdu.h index 8629fac4..fc389501 100644 --- a/src/dis6/radio_communications/IntercomSignalPdu.h +++ b/src/dis6/radio_communications/IntercomSignalPdu.h @@ -5,7 +5,7 @@ #include "dis6/EntityID.h" #include "dis6/RadioCommunicationsFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT IntercomSignalPdu : public RadioCommunicationsFamilyPdu { +class IntercomSignalPdu : public RadioCommunicationsFamilyPdu { protected: /** entity ID */ EntityID _entityID; diff --git a/src/dis6/radio_communications/ModulationType.h b/src/dis6/radio_communications/ModulationType.h index 320087ad..5e6458cd 100644 --- a/src/dis6/radio_communications/ModulationType.h +++ b/src/dis6/radio_communications/ModulationType.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ModulationType { +class ModulationType { protected: /** spread spectrum, 16 bit boolean array */ uint16_t _spreadSpectrum; diff --git a/src/dis6/radio_communications/RadioCommunicationsFamilyPdu.h b/src/dis6/radio_communications/RadioCommunicationsFamilyPdu.h index 90fa818c..09935d35 100644 --- a/src/dis6/radio_communications/RadioCommunicationsFamilyPdu.h +++ b/src/dis6/radio_communications/RadioCommunicationsFamilyPdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RadioCommunicationsFamilyPdu : public Pdu { +class RadioCommunicationsFamilyPdu : public Pdu { protected: /** ID of the entitythat is the source of the communication */ EntityID _entityId; diff --git a/src/dis6/radio_communications/RadioEntityType.h b/src/dis6/radio_communications/RadioEntityType.h index f2e5e096..cba282c9 100644 --- a/src/dis6/radio_communications/RadioEntityType.h +++ b/src/dis6/radio_communications/RadioEntityType.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RadioEntityType { +class RadioEntityType { protected: /** Kind of entity */ uint8_t _entityKind; diff --git a/src/dis6/radio_communications/ReceiverPdu.h b/src/dis6/radio_communications/ReceiverPdu.h index 0f3ab930..ef81deb8 100644 --- a/src/dis6/radio_communications/ReceiverPdu.h +++ b/src/dis6/radio_communications/ReceiverPdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/RadioCommunicationsFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ReceiverPdu : public RadioCommunicationsFamilyPdu { +class ReceiverPdu : public RadioCommunicationsFamilyPdu { protected: /** encoding scheme used, and enumeration */ uint16_t _receiverState; diff --git a/src/dis6/radio_communications/SignalPdu.h b/src/dis6/radio_communications/SignalPdu.h index e449feb7..0e93430c 100644 --- a/src/dis6/radio_communications/SignalPdu.h +++ b/src/dis6/radio_communications/SignalPdu.h @@ -4,7 +4,7 @@ #include #include "dis6/RadioCommunicationsFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -18,7 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SignalPdu : public RadioCommunicationsFamilyPdu { +class SignalPdu : public RadioCommunicationsFamilyPdu { protected: /** encoding scheme used, and enumeration */ uint16_t _encodingScheme; diff --git a/src/dis6/radio_communications/TransmitterPdu.h b/src/dis6/radio_communications/TransmitterPdu.h index 93f315e5..73ae3596 100644 --- a/src/dis6/radio_communications/TransmitterPdu.h +++ b/src/dis6/radio_communications/TransmitterPdu.h @@ -7,7 +7,7 @@ #include "dis6/RadioEntityType.h" #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -20,7 +20,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT TransmitterPdu : public RadioCommunicationsFamilyPdu { +class TransmitterPdu : public RadioCommunicationsFamilyPdu { protected: /** linear accelleration of entity */ RadioEntityType _radioEntityType; diff --git a/src/dis6/simulation_management/AcknowledgePdu.h b/src/dis6/simulation_management/AcknowledgePdu.h index 207073d2..eadd2464 100644 --- a/src/dis6/simulation_management/AcknowledgePdu.h +++ b/src/dis6/simulation_management/AcknowledgePdu.h @@ -2,7 +2,7 @@ #include #include "dis6/SimulationManagementFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AcknowledgePdu : public SimulationManagementFamilyPdu { +class AcknowledgePdu : public SimulationManagementFamilyPdu { protected: /** type of message being acknowledged */ uint16_t _acknowledgeFlag; diff --git a/src/dis6/simulation_management/ActionRequestPdu.h b/src/dis6/simulation_management/ActionRequestPdu.h index 09512c98..63bdbfe1 100644 --- a/src/dis6/simulation_management/ActionRequestPdu.h +++ b/src/dis6/simulation_management/ActionRequestPdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionRequestPdu : public SimulationManagementFamilyPdu { +class ActionRequestPdu : public SimulationManagementFamilyPdu { protected: /** Request ID that is unique */ uint32_t _requestID; diff --git a/src/dis6/simulation_management/ActionResponsePdu.h b/src/dis6/simulation_management/ActionResponsePdu.h index 9dcdeab5..a81746a9 100644 --- a/src/dis6/simulation_management/ActionResponsePdu.h +++ b/src/dis6/simulation_management/ActionResponsePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionResponsePdu : public SimulationManagementFamilyPdu { +class ActionResponsePdu : public SimulationManagementFamilyPdu { protected: /** Request ID that is unique */ uint32_t _requestID; diff --git a/src/dis6/simulation_management/CommentPdu.h b/src/dis6/simulation_management/CommentPdu.h index 9036ba50..259a8aaf 100644 --- a/src/dis6/simulation_management/CommentPdu.h +++ b/src/dis6/simulation_management/CommentPdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT CommentPdu : public SimulationManagementFamilyPdu { +class CommentPdu : public SimulationManagementFamilyPdu { protected: /** Number of fixed datum records */ uint32_t _numberOfFixedDatumRecords; diff --git a/src/dis6/simulation_management/CreateEntityPdu.h b/src/dis6/simulation_management/CreateEntityPdu.h index 390c53af..6313eb50 100644 --- a/src/dis6/simulation_management/CreateEntityPdu.h +++ b/src/dis6/simulation_management/CreateEntityPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/SimulationManagementFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT CreateEntityPdu : public SimulationManagementFamilyPdu { +class CreateEntityPdu : public SimulationManagementFamilyPdu { protected: /** Identifier for the request */ uint32_t _requestID; diff --git a/src/dis6/simulation_management/DataPdu.h b/src/dis6/simulation_management/DataPdu.h index d89f37cb..4d9e2027 100644 --- a/src/dis6/simulation_management/DataPdu.h +++ b/src/dis6/simulation_management/DataPdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DataPdu : public SimulationManagementFamilyPdu { +class DataPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ uint32_t _requestID; diff --git a/src/dis6/simulation_management/DataQueryPdu.h b/src/dis6/simulation_management/DataQueryPdu.h index 04e67b17..c7d836ac 100644 --- a/src/dis6/simulation_management/DataQueryPdu.h +++ b/src/dis6/simulation_management/DataQueryPdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DataQueryPdu : public SimulationManagementFamilyPdu { +class DataQueryPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ uint32_t _requestID; diff --git a/src/dis6/simulation_management/EventReportPdu.h b/src/dis6/simulation_management/EventReportPdu.h index 82d347d7..5ba16c69 100644 --- a/src/dis6/simulation_management/EventReportPdu.h +++ b/src/dis6/simulation_management/EventReportPdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EventReportPdu : public SimulationManagementFamilyPdu { +class EventReportPdu : public SimulationManagementFamilyPdu { protected: /** Type of event */ uint32_t _eventType; diff --git a/src/dis6/simulation_management/RemoveEntityPdu.h b/src/dis6/simulation_management/RemoveEntityPdu.h index 330d76ed..dd3ad1e4 100644 --- a/src/dis6/simulation_management/RemoveEntityPdu.h +++ b/src/dis6/simulation_management/RemoveEntityPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/SimulationManagementFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RemoveEntityPdu : public SimulationManagementFamilyPdu { +class RemoveEntityPdu : public SimulationManagementFamilyPdu { protected: /** Identifier for the request */ uint32_t _requestID; diff --git a/src/dis6/simulation_management/SetDataPdu.h b/src/dis6/simulation_management/SetDataPdu.h index 10f04012..0e985aa4 100644 --- a/src/dis6/simulation_management/SetDataPdu.h +++ b/src/dis6/simulation_management/SetDataPdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SetDataPdu : public SimulationManagementFamilyPdu { +class SetDataPdu : public SimulationManagementFamilyPdu { protected: /** ID of request */ uint32_t _requestID; diff --git a/src/dis6/simulation_management/SimulationManagementFamilyPdu.h b/src/dis6/simulation_management/SimulationManagementFamilyPdu.h index f438f73b..cb47575e 100644 --- a/src/dis6/simulation_management/SimulationManagementFamilyPdu.h +++ b/src/dis6/simulation_management/SimulationManagementFamilyPdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SimulationManagementFamilyPdu : public Pdu { +class SimulationManagementFamilyPdu : public Pdu { protected: /** Entity that is sending message */ EntityID _originatingEntityID; diff --git a/src/dis6/simulation_management/StartResumePdu.h b/src/dis6/simulation_management/StartResumePdu.h index b2d5ab09..2d0fc5d7 100644 --- a/src/dis6/simulation_management/StartResumePdu.h +++ b/src/dis6/simulation_management/StartResumePdu.h @@ -2,7 +2,7 @@ #include "dis6/ClockTime.h" #include "dis6/SimulationManagementFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT StartResumePdu : public SimulationManagementFamilyPdu { +class StartResumePdu : public SimulationManagementFamilyPdu { protected: /** UTC time at which the simulation shall start or resume */ ClockTime _realWorldTime; diff --git a/src/dis6/simulation_management/StopFreezePdu.h b/src/dis6/simulation_management/StopFreezePdu.h index d1a4a450..ca617826 100644 --- a/src/dis6/simulation_management/StopFreezePdu.h +++ b/src/dis6/simulation_management/StopFreezePdu.h @@ -2,7 +2,7 @@ #include "dis6/ClockTime.h" #include "dis6/SimulationManagementFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT StopFreezePdu : public SimulationManagementFamilyPdu { +class StopFreezePdu : public SimulationManagementFamilyPdu { protected: /** UTC time at which the simulation shall stop or freeze */ ClockTime _realWorldTime; diff --git a/src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.h b/src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.h index 3515965e..83e5337b 100644 --- a/src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/AcknowledgeReliablePdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT AcknowledgeReliablePdu +class AcknowledgeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** ack flags */ diff --git a/src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.h b/src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.h index 6b0dc60e..46d8e7f5 100644 --- a/src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/ActionRequestReliablePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionRequestReliablePdu +class ActionRequestReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ diff --git a/src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.h b/src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.h index c05c1955..9492c5bb 100644 --- a/src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/ActionResponseReliablePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ActionResponseReliablePdu +class ActionResponseReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ diff --git a/src/dis6/simulation_management_with_reliability/CommentReliablePdu.h b/src/dis6/simulation_management_with_reliability/CommentReliablePdu.h index 81c298bc..1c59af66 100644 --- a/src/dis6/simulation_management_with_reliability/CommentReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/CommentReliablePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT CommentReliablePdu +class CommentReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Fixed datum record count */ diff --git a/src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.h b/src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.h index f811dbd9..1e5bff80 100644 --- a/src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/CreateEntityReliablePdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT CreateEntityReliablePdu +class CreateEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ diff --git a/src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.h b/src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.h index 72b411ca..a5abba9c 100644 --- a/src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/DataQueryReliablePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DataQueryReliablePdu +class DataQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ diff --git a/src/dis6/simulation_management_with_reliability/DataReliablePdu.h b/src/dis6/simulation_management_with_reliability/DataReliablePdu.h index 095b6d7f..fd1c03a2 100644 --- a/src/dis6/simulation_management_with_reliability/DataReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/DataReliablePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DataReliablePdu +class DataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Request ID */ diff --git a/src/dis6/simulation_management_with_reliability/EventReportReliablePdu.h b/src/dis6/simulation_management_with_reliability/EventReportReliablePdu.h index 1598026c..fb994026 100644 --- a/src/dis6/simulation_management_with_reliability/EventReportReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/EventReportReliablePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -18,7 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EventReportReliablePdu +class EventReportReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** Event type */ diff --git a/src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.h b/src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.h index 96d1de13..554862c9 100644 --- a/src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/RecordQueryReliablePdu.h @@ -4,7 +4,7 @@ #include "dis6/FourByteChunk.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RecordQueryReliablePdu +class RecordQueryReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ diff --git a/src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.h b/src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.h index 29177803..f072a381 100644 --- a/src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/RemoveEntityReliablePdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT RemoveEntityReliablePdu +class RemoveEntityReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ diff --git a/src/dis6/simulation_management_with_reliability/SetDataReliablePdu.h b/src/dis6/simulation_management_with_reliability/SetDataReliablePdu.h index c4d65aae..0059fa13 100644 --- a/src/dis6/simulation_management_with_reliability/SetDataReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/SetDataReliablePdu.h @@ -5,7 +5,7 @@ #include "dis6/FixedDatum.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" #include "dis6/VariableDatum.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -18,7 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SetDataReliablePdu +class SetDataReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** level of reliability service used for this transaction */ diff --git a/src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.h b/src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.h index 6c426c60..a4cf7d15 100644 --- a/src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/SetRecordReliablePdu.h @@ -4,7 +4,7 @@ #include "dis6/RecordSet.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -16,7 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SetRecordReliablePdu +class SetRecordReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** request ID */ diff --git a/src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h b/src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h index d83620b6..3c4ff60d 100644 --- a/src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h +++ b/src/dis6/simulation_management_with_reliability/SimulationManagementWithReliabilityFamilyPdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SimulationManagementWithReliabilityFamilyPdu +class SimulationManagementWithReliabilityFamilyPdu : public Pdu { protected: /** Object originatig the request */ diff --git a/src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.h b/src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.h index ae6668dd..37fa23c5 100644 --- a/src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/StartResumeReliablePdu.h @@ -2,7 +2,7 @@ #include "dis6/ClockTime.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT StartResumeReliablePdu +class StartResumeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** time in real world for this operation to happen */ diff --git a/src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.h b/src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.h index 0c2eca4e..a918999d 100644 --- a/src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.h +++ b/src/dis6/simulation_management_with_reliability/StopFreezeReliablePdu.h @@ -2,7 +2,7 @@ #include "dis6/ClockTime.h" #include "dis6/SimulationManagementWithReliabilityFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT StopFreezeReliablePdu +class StopFreezeReliablePdu : public SimulationManagementWithReliabilityFamilyPdu { protected: /** time in real world for this operation to happen */ diff --git a/src/dis6/synthetic_environment/ArealObjectStatePdu.h b/src/dis6/synthetic_environment/ArealObjectStatePdu.h index 7c99d1c3..fc3eebcc 100644 --- a/src/dis6/synthetic_environment/ArealObjectStatePdu.h +++ b/src/dis6/synthetic_environment/ArealObjectStatePdu.h @@ -8,7 +8,7 @@ #include "dis6/SixByteChunk.h" #include "dis6/SyntheticEnvironmentFamilyPdu.h" #include "dis6/Vector3Double.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -21,7 +21,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ArealObjectStatePdu +class ArealObjectStatePdu : public SyntheticEnvironmentFamilyPdu { protected: /** Object in synthetic environment */ diff --git a/src/dis6/synthetic_environment/Environment.h b/src/dis6/synthetic_environment/Environment.h index 44ee98cf..fbc45305 100644 --- a/src/dis6/synthetic_environment/Environment.h +++ b/src/dis6/synthetic_environment/Environment.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -13,7 +13,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT Environment { +class Environment { protected: /** Record type */ uint32_t _environmentType; diff --git a/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h index 8c00ef1e..638e4cbb 100644 --- a/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h +++ b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h @@ -6,7 +6,7 @@ #include "dis6/EntityType.h" #include "dis6/Environment.h" #include "dis6/SyntheticEnvironmentFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT EnvironmentalProcessPdu +class EnvironmentalProcessPdu : public SyntheticEnvironmentFamilyPdu { protected: /** Environmental process ID */ diff --git a/src/dis6/synthetic_environment/GridAxisRecord.h b/src/dis6/synthetic_environment/GridAxisRecord.h index 0f52452c..5ead336f 100644 --- a/src/dis6/synthetic_environment/GridAxisRecord.h +++ b/src/dis6/synthetic_environment/GridAxisRecord.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -11,7 +11,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT GridAxisRecord { +class GridAxisRecord { protected: /** type of environmental sample */ uint16_t _sampleType; diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h index 60beec4e..de3af403 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h @@ -4,7 +4,7 @@ #include #include "dis6/GridAxisRecord.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -15,7 +15,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT GridAxisRecordRepresentation0 : public GridAxisRecord { +class GridAxisRecordRepresentation0 : public GridAxisRecord { protected: /** number of bytes of environmental state data */ uint16_t _numberOfBytes; diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h index 0cc1d9de..2e4c117c 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h @@ -4,7 +4,7 @@ #include "dis6/GridAxisRecord.h" #include "dis6/TwoByteChunk.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -15,7 +15,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT GridAxisRecordRepresentation1 : public GridAxisRecord { +class GridAxisRecordRepresentation1 : public GridAxisRecord { protected: /** constant scale factor */ float _fieldScale; diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h index 12a24495..60e6511f 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h @@ -4,7 +4,7 @@ #include "dis6/FourByteChunk.h" #include "dis6/GridAxisRecord.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -15,7 +15,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT GridAxisRecordRepresentation2 : public GridAxisRecord { +class GridAxisRecordRepresentation2 : public GridAxisRecord { protected: /** number of values */ uint16_t _numberOfValues; diff --git a/src/dis6/synthetic_environment/GriddedDataPdu.h b/src/dis6/synthetic_environment/GriddedDataPdu.h index 4ab9f3a5..a53bbee9 100644 --- a/src/dis6/synthetic_environment/GriddedDataPdu.h +++ b/src/dis6/synthetic_environment/GriddedDataPdu.h @@ -7,7 +7,7 @@ #include "dis6/GridAxisRecord.h" #include "dis6/Orientation.h" #include "dis6/SyntheticEnvironmentFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -20,7 +20,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { +class GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { protected: /** environmental simulation application ID */ EntityID _environmentalSimulationApplicationID; diff --git a/src/dis6/synthetic_environment/LinearObjectStatePdu.h b/src/dis6/synthetic_environment/LinearObjectStatePdu.h index 0f8aef64..8fe2c317 100644 --- a/src/dis6/synthetic_environment/LinearObjectStatePdu.h +++ b/src/dis6/synthetic_environment/LinearObjectStatePdu.h @@ -7,7 +7,7 @@ #include "dis6/ObjectType.h" #include "dis6/SimulationAddress.h" #include "dis6/SyntheticEnvironmentFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -20,7 +20,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT LinearObjectStatePdu +class LinearObjectStatePdu : public SyntheticEnvironmentFamilyPdu { protected: /** Object in synthetic environment */ diff --git a/src/dis6/synthetic_environment/LinearSegmentParameter.h b/src/dis6/synthetic_environment/LinearSegmentParameter.h index 999601ae..a6a4caa5 100644 --- a/src/dis6/synthetic_environment/LinearSegmentParameter.h +++ b/src/dis6/synthetic_environment/LinearSegmentParameter.h @@ -3,7 +3,7 @@ #include "dis6/Orientation.h" #include "dis6/SixByteChunk.h" #include "dis6/Vector3Double.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT LinearSegmentParameter { +class LinearSegmentParameter { protected: /** number of segments */ uint8_t _segmentNumber; diff --git a/src/dis6/synthetic_environment/ObjectType.h b/src/dis6/synthetic_environment/ObjectType.h index 6e03ed86..85f45814 100644 --- a/src/dis6/synthetic_environment/ObjectType.h +++ b/src/dis6/synthetic_environment/ObjectType.h @@ -1,6 +1,6 @@ #pragma once -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT ObjectType { +class ObjectType { protected: /** Kind of entity */ uint8_t _entityKind; diff --git a/src/dis6/synthetic_environment/PointObjectStatePdu.h b/src/dis6/synthetic_environment/PointObjectStatePdu.h index 19a9df99..f58a133d 100644 --- a/src/dis6/synthetic_environment/PointObjectStatePdu.h +++ b/src/dis6/synthetic_environment/PointObjectStatePdu.h @@ -6,7 +6,7 @@ #include "dis6/SimulationAddress.h" #include "dis6/SyntheticEnvironmentFamilyPdu.h" #include "dis6/Vector3Double.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,7 +19,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT PointObjectStatePdu +class PointObjectStatePdu : public SyntheticEnvironmentFamilyPdu { protected: /** Object in synthetic environment */ diff --git a/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h index 1b680617..e88ab954 100644 --- a/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h +++ b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,7 +12,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT SyntheticEnvironmentFamilyPdu : public Pdu { +class SyntheticEnvironmentFamilyPdu : public Pdu { protected: public: SyntheticEnvironmentFamilyPdu(); diff --git a/src/dis6/utils/Conversion.cpp b/src/dis6/utils/Conversion.cpp index 5b73270b..212c1ff1 100644 --- a/src/dis6/utils/Conversion.cpp +++ b/src/dis6/utils/Conversion.cpp @@ -1,27 +1,30 @@ -#include -#include +#include "dis6/utils/Conversion.h" -using namespace DIS; +#include "dis6/utils/Masks.h" + +namespace dis { // const uint8_t // Convert::ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; int Convert::MakeArticulationParameterType(int typeclass, int typemetric) { // enforce a ceiling on typemetric - typemetric = typemetric & ARTICULATION_PARAMETER_TYPE_METRIC_MASK; + typemetric = typemetric & kArticulationParameterTypeMetricMask; // shift the typeclass bits to the left by the precision amount of typemetric // and then add the typemetric bits - return ((typeclass << ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS) + + return ((typeclass << kArticulationParameterTypeMetricNumberOfBits) + typemetric); } int Convert::GetArticulationTypeMetric(int parametertype) { // wipe off the typeclass bits and return the typemetric bits - return (parametertype & ARTICULATION_PARAMETER_TYPE_METRIC_MASK); + return (parametertype & kArticulationParameterTypeMetricMask); } int Convert::GetArticulationTypeClass(int parametertype) { // wipe off the typemetric bits and return the typeclass bits - return (parametertype >> ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS); + return (parametertype >> kArticulationParameterTypeMetricNumberOfBits); } + +} // namespace dis diff --git a/src/dis6/utils/Conversion.h b/src/dis6/utils/Conversion.h index 105ca95c..c4487e78 100644 --- a/src/dis6/utils/Conversion.h +++ b/src/dis6/utils/Conversion.h @@ -8,15 +8,13 @@ #include -#include // for library symbols - -namespace DIS { +namespace dis { /// a name-scope for conversion functions. -struct OPENDIS6_EXPORT Convert { +struct Convert { /// the number of bits used to store the type metric value /// within the Articulation Parameter's parameter type value. /// this mask is based on the IEEE Std 1278.1-1995 - static const uint8_t ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; + static const uint8_t kArticulationParameterTypeMetricNumberOfBits = 5; /// make the value needed for the ArticulationParameter's Parameter Type. /// @param typeclass the enumeration for the articulated part. @@ -46,6 +44,6 @@ struct OPENDIS6_EXPORT Convert { /// ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision static int GetArticulationTypeClass(int parametertype); }; -} // namespace DIS +} // namespace dis #endif // _dcl_dis_conversion_h_ diff --git a/src/dis6/utils/DataStream.cpp b/src/dis6/utils/DataStream.cpp index 49cd87b7..38f7074d 100644 --- a/src/dis6/utils/DataStream.cpp +++ b/src/dis6/utils/DataStream.cpp @@ -1,8 +1,6 @@ -#include // for debug output +#include "dis6/util/DataStream.h" -#include - -using namespace DIS; +namespace dis { DataStream::DataStream(Endian stream) : _buffer(), @@ -223,3 +221,5 @@ DataStream& DataStream::operator>>(int16_t& d) { ReadAlgorithm(d); return *this; } + +} // namespace dis diff --git a/src/dis6/utils/DataStream.h b/src/dis6/utils/DataStream.h index adba5b36..0f2c7a7a 100644 --- a/src/dis6/utils/DataStream.h +++ b/src/dis6/utils/DataStream.h @@ -13,19 +13,19 @@ #pragma warning(disable : 4251) #endif +#include #include // for size_t and NULL definition #include // for memcpy #include // for typedef, member #include // for typedef, member -#include // for library symbols -#include // for enum +#include "dis6/utils/Endian.h" // for enum -namespace DIS { +namespace dis { /// a class to support managing a network buffer. /// the clients are responsible for managing the char buffer memory. /// this class explicitly defines operators for expected types. -class OPENDIS6_EXPORT DataStream { +class DataStream { public: /// Setup the internal buffer's Endian type. /// @param stream the Endian type to use for the internal buffer, @@ -72,17 +72,17 @@ class OPENDIS6_EXPORT DataStream { DataStream& operator>>(uint16_t& c); DataStream& operator>>(int16_t& c); - Endian GetStreamEndian() const; - Endian GetMachineEndian() const; + [[nodiscard]] Endian GetStreamEndian() const; + [[nodiscard]] Endian GetMachineEndian() const; - size_t GetWritePos() const; - size_t GetReadPos() const; + [[nodiscard]] size_t GetWritePos() const; + [[nodiscard]] size_t GetReadPos() const; - size_t size() const; + [[nodiscard]] size_t size() const; void clear(); - bool empty() const; + [[nodiscard]] bool empty() const; private: template @@ -102,7 +102,7 @@ class OPENDIS6_EXPORT DataStream { char* ch = reinterpret_cast(&t); DoFlip(ch, sizeof(T)); DoWrite(ch, sizeof(T)); - IncrementPointer(_write_pos); + IncrementPointer(write_pos_); } /// this algorithm should only be used for primitive types, @@ -113,7 +113,7 @@ class OPENDIS6_EXPORT DataStream { DoRead(ch, sizeof(T)); DoFlip(ch, sizeof(T)); memcpy(&t, ch, sizeof(t)); - IncrementPointer(_read_pos); + IncrementPointer(read_pos_); } /// will flip the buffer if the buffer endian is different than the machine's. @@ -123,22 +123,22 @@ class OPENDIS6_EXPORT DataStream { void DoRead(char* ch, size_t bufsize); - typedef std::vector BufferType; + using BufferType = std::vector; // const BufferType& GetBuffer() const; - BufferType _buffer; + BufferType buffer_; /// the location of the read/write. - size_t _read_pos; - size_t _write_pos; + size_t read_pos_; + size_t write_pos_; /// the requirement for the managed buffer - Endian _stream_endian; + Endian stream_endian_; /// the native endian type - Endian _machine_endian; + Endian machine_endian_; }; -} // namespace DIS +} // namespace dis #if _MSC_VER #pragma warning(pop) diff --git a/src/dis6/utils/Endian.h b/src/dis6/utils/Endian.h index abf07433..9d0481c7 100644 --- a/src/dis6/utils/Endian.h +++ b/src/dis6/utils/Endian.h @@ -1,14 +1,13 @@ #ifndef _dcl_dis_endian_h_ #define _dcl_dis_endian_h_ -#include // for library symbols - -namespace DIS { +namespace dis { /// the order of bytes that are on the left -enum OPENDIS6_EXPORT Endian { +enum Endian { LITTLE = 1, BIG = 0, }; -} // namespace DIS + +} // namespace dis #endif // _dcl_dis_endian_h_ diff --git a/src/dis6/utils/IBufferProcessor.h b/src/dis6/utils/IBufferProcessor.h index c84e0d09..9c13c38b 100644 --- a/src/dis6/utils/IBufferProcessor.h +++ b/src/dis6/utils/IBufferProcessor.h @@ -5,15 +5,15 @@ #ifndef _dcl_dis_i_buffer_processor_h_ #define _dcl_dis_i_buffer_processor_h_ -#include +#include "dis6/utils/Endian.h" -namespace DIS { +namespace dis { /// the interface class for handling read operations. class IBufferProcessor { public: - virtual ~IBufferProcessor() {} + virtual ~IBufferProcessor() = default; virtual void Process(const char* buf, uint32_t size, Endian e) = 0; }; -} // namespace DIS +} // namespace dis #endif // _dcl_dis_i_buffer_processor_h_ diff --git a/src/dis6/utils/IncomingMessage.h b/src/dis6/utils/IncomingMessage.h index ca4fece5..d10fe8fb 100644 --- a/src/dis6/utils/IncomingMessage.h +++ b/src/dis6/utils/IncomingMessage.h @@ -7,23 +7,21 @@ #include // for member -#include // for library symbols -#include // for internal type -#include // for base class -#include -#include +#include "dis6/utils/Endian.h" // for internal type +#include "dis6/utils/IBufferProcessor.h" // for base class +#include "dis6/utils/IPduBank.h" +#include "dis6/utils/PDUType.h" -namespace DIS { +namespace dis { class Pdu; class IPacketProcessor; class DataStream; /// A framework for routing the packet to the correct processor. -class OPENDIS6_EXPORT IncomingMessage : public IBufferProcessor { +class IncomingMessage : public IBufferProcessor { public: /// the container type for supporting processors. - typedef std::multimap - PacketProcessorContainer; + typedef std::multimap PacketProcessorContainer; /// the container type for supporting PDU banks. typedef std::multimap PduBankContainer; @@ -84,6 +82,6 @@ class OPENDIS6_EXPORT IncomingMessage : public IBufferProcessor { PduBankContainer::iterator& containerIter); }; -} // namespace DIS +} // namespace dis #endif // _dcl_dis_incoming_message_ diff --git a/src/dis6/utils/Masks.h b/src/dis6/utils/Masks.h index 2c578ffd..51a06d99 100644 --- a/src/dis6/utils/Masks.h +++ b/src/dis6/utils/Masks.h @@ -7,13 +7,11 @@ #include -#include // for library symbols - -namespace DIS { +namespace dis { /// the mask that will leave only the typemetric /// from an integer representing the Articulation Parameter's parameter type. /// this mask is based on the IEEE Std 1278.1-1995 -const uint32_t ARTICULATION_PARAMETER_TYPE_METRIC_MASK = 0x001F; -} // namespace DIS +const uint32_t kArticulationParameterTypeMetricMask = 0x001F; +} // namespace dis #endif // _dcl_dis_masks_h_ diff --git a/src/dis6/utils/PDUBank.h b/src/dis6/utils/PDUBank.h index 84dedc11..9cb73e2a 100644 --- a/src/dis6/utils/PDUBank.h +++ b/src/dis6/utils/PDUBank.h @@ -1,18 +1,18 @@ #pragma once -#include "dis6/Pdu.h" +#include "dis6/common/Pdu.h" #include "dis6/utils/PDUType.h" -namespace DIS { +namespace dis { /// houses instances for the set of known PDU classes to be returned /// when provided with the PDU type's identifier value. -class OPENDIS6_EXPORT PduBank { +class PduBank { public: /// finds the PDU instance corresponding to the identifier /// @param pdu_type the 8-bit PDU type identifier /// @return NULL when the pdu_type is unknown. ///\todo make this parameter just 'uint8_t' since that will be easier to /// generate. - static Pdu* GetStaticPDU(DIS::PDUType pdu_type); + static Pdu* GetStaticPDU(dis::PDUType pdu_type); }; -} // namespace DIS +} // namespace dis diff --git a/src/dis6/utils/PDUType.h b/src/dis6/utils/PDUType.h index 60389377..8c7e90b1 100644 --- a/src/dis6/utils/PDUType.h +++ b/src/dis6/utils/PDUType.h @@ -1,7 +1,7 @@ #ifndef _dtdis_pdu_type_h_ #define _dtdis_pdu_type_h_ -namespace DIS { +namespace dis { enum PDUType { PDU_OTHER = 0, PDU_ENTITY_STATE = 1, diff --git a/src/dis6/utils/PacketFactory.h b/src/dis6/utils/PacketFactory.h index 49d2a146..c2280769 100644 --- a/src/dis6/utils/PacketFactory.h +++ b/src/dis6/utils/PacketFactory.h @@ -4,11 +4,10 @@ #ifndef _dcl_dis_packet_factory_h_ #define _dcl_dis_packet_factory_h_ +#include #include // for member -#include // for library symbols - -namespace DIS { +namespace dis { class Pdu; /// a utility to make functions @@ -18,7 +17,7 @@ BaseT* CreateImplementation() { } /// responsible for mapping an ID value to a Pdu type. -class OPENDIS6_EXPORT PacketFactory { +class PacketFactory { public: /// Create a Pdu. /// @param id the value representing the "type" of the Pdu. The value will be @@ -39,7 +38,7 @@ class OPENDIS6_EXPORT PacketFactory { template bool RegisterPacket(uint8_t id) { FunctionMap::value_type candidate(id, &CreateImplementation); - std::pair result = _fMap.insert(candidate); + std::pair result = f_map_.insert(candidate); return result.second; } @@ -47,24 +46,24 @@ class OPENDIS6_EXPORT PacketFactory { /// @param id The value identifying the type of the Pdu. /// @return 'false' if no support previously existed. 'true' if support was /// removed. - bool UnRegisterPacket(char id) { return (_fMap.erase(id) > 0); } + bool UnRegisterPacket(char id) { return (f_map_.erase(id) > 0); } /// Check to know if the Pdu type is supported. /// @param id The value representing the Pdu type. /// @return 'true' if support for creating a Pdu was found, 'false' if not /// found. - bool IsRegistered(uint8_t id) const; + [[nodiscard]] bool IsRegistered(uint8_t id) const; private: /// the function signature required for creating Pdu instances. - typedef Pdu* (*CREATE_FUNC)(); + using CREATE_FUNC = Pdu* (*)(); /// the type to contain mappings to functions used to create Pdu instances. - typedef std::map FunctionMap; + using FunctionMap = std::map; /// instance of the storage mechanism for creating Pdu instances. - FunctionMap _fMap; + FunctionMap f_map_; }; -} // namespace DIS +} // namespace dis #endif // _dcl_dis_packet_factory_h_ diff --git a/src/dis6/utils/PduFactory.h b/src/dis6/utils/PduFactory.h index 82294acc..5aa947c5 100644 --- a/src/dis6/utils/PduFactory.h +++ b/src/dis6/utils/PduFactory.h @@ -14,7 +14,7 @@ namespace DIS { * @author DMcG */ -class OPENDIS6_EXPORT PduFactory { +class PduFactory { public: PduFactory(void); ~PduFactory(void); diff --git a/src/dis6/utils/StreamUtils.h b/src/dis6/utils/StreamUtils.h index f57e9a2f..f72eb6e5 100644 --- a/src/dis6/utils/StreamUtils.h +++ b/src/dis6/utils/StreamUtils.h @@ -7,22 +7,16 @@ #include // for parameter type -#include // for library symbols - -namespace DIS { +namespace dis { class EntityStatePdu; class EntityID; class DetonationPdu; class EntityType; -} // namespace DIS +} // namespace dis -OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, - const DIS::EntityType& rhs); -OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, - const DIS::EntityID& rhs); -OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, - const DIS::EntityStatePdu& rhs); -OPENDIS6_EXPORT std::ostream& operator<<(std::ostream& lhs, - const DIS::DetonationPdu& rhs); +std::ostream& operator<<(std::ostream& lhs, const dis::EntityType& rhs); +std::ostream& operator<<(std::ostream& lhs, const dis::EntityID& rhs); +std::ostream& operator<<(std::ostream& lhs, const dis::EntityStatePdu& rhs); +std::ostream& operator<<(std::ostream& lhs, const dis::DetonationPdu& rhs); #endif // _dis_stream_utils_h_ diff --git a/src/dis6/warfare/BurstDescriptor.h b/src/dis6/warfare/BurstDescriptor.h index a652d8ad..1ea3e127 100644 --- a/src/dis6/warfare/BurstDescriptor.h +++ b/src/dis6/warfare/BurstDescriptor.h @@ -1,7 +1,7 @@ #pragma once #include "dis6/common/EntityType.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT BurstDescriptor { +class BurstDescriptor { protected: /** What munition was used in the burst */ EntityType _munition; diff --git a/src/dis6/warfare/DetonationPdu.h b/src/dis6/warfare/DetonationPdu.h index 4f437911..6c2261e7 100644 --- a/src/dis6/warfare/DetonationPdu.h +++ b/src/dis6/warfare/DetonationPdu.h @@ -9,7 +9,7 @@ #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" #include "dis6/WarfareFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -20,7 +20,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT DetonationPdu : public WarfareFamilyPdu { +class DetonationPdu : public WarfareFamilyPdu { protected: /** ID of muntion that was fired */ EntityID _munitionID; diff --git a/src/dis6/warfare/FirePdu.h b/src/dis6/warfare/FirePdu.h index 56ff70ff..de015692 100644 --- a/src/dis6/warfare/FirePdu.h +++ b/src/dis6/warfare/FirePdu.h @@ -6,7 +6,7 @@ #include "dis6/Vector3Double.h" #include "dis6/Vector3Float.h" #include "dis6/WarfareFamilyPdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT FirePdu : public WarfareFamilyPdu { +class FirePdu : public WarfareFamilyPdu { protected: /** ID of the munition that is being shot */ EntityID _munitionID; diff --git a/src/dis6/warfare/WarfareFamilyPdu.h b/src/dis6/warfare/WarfareFamilyPdu.h index 962579c7..5769759b 100644 --- a/src/dis6/warfare/WarfareFamilyPdu.h +++ b/src/dis6/warfare/WarfareFamilyPdu.h @@ -2,7 +2,7 @@ #include "dis6/EntityID.h" #include "dis6/Pdu.h" -#include "dis6/opendis6_export.h" + #include "dis6/utils/DataStream.h" namespace DIS { @@ -14,7 +14,7 @@ namespace DIS { // // @author DMcG, jkg -class OPENDIS6_EXPORT WarfareFamilyPdu : public Pdu { +class WarfareFamilyPdu : public Pdu { protected: /** ID of the entity that shot */ EntityID _firingEntityID; From 029eb879bfe637854ad212542913565161b2131a Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Sun, 21 Jan 2024 00:03:03 -0600 Subject: [PATCH 18/22] Lots of clang formatting fixes --- .gitignore | 2 +- CMakeLists.txt | 13 +- src/dis6/common/ArticulationParameter.cpp | 117 ++++++++------- src/dis6/common/ArticulationParameter.h | 6 +- src/dis6/common/ClockTime.cpp | 51 ++++--- src/dis6/common/ClockTime.h | 23 ++- src/dis6/common/EightByteChunk.cpp | 51 +++---- src/dis6/common/EightByteChunk.h | 19 ++- src/dis6/common/EntityID.cpp | 69 +++++---- src/dis6/common/EntityID.h | 29 ++-- src/dis6/common/EntityType.cpp | 137 ++++++++++-------- src/dis6/common/EntityType.h | 53 ++++--- src/dis6/common/EventID.cpp | 36 +++-- src/dis6/common/EventID.h | 4 +- src/dis6/common/FixedDatum.cpp | 26 ++-- src/dis6/common/FixedDatum.h | 4 +- src/dis6/common/FourByteChunk.cpp | 34 ++--- src/dis6/common/FourByteChunk.h | 4 +- src/dis6/common/Orientation.cpp | 36 +++-- src/dis6/common/Orientation.h | 4 +- src/dis6/common/Pdu.cpp | 105 ++++++++------ src/dis6/common/Pdu.h | 53 +++---- src/dis6/common/RecordSet.cpp | 57 +++++--- src/dis6/common/RecordSet.h | 4 +- src/dis6/common/SimulationAddress.cpp | 26 ++-- src/dis6/common/SimulationAddress.h | 4 +- src/dis6/common/SixByteChunk.cpp | 34 ++--- src/dis6/common/SixByteChunk.h | 4 +- src/dis6/common/TwoByteChunk.cpp | 34 ++--- src/dis6/common/TwoByteChunk.h | 4 +- src/dis6/common/VariableDatum.cpp | 55 ++++--- src/dis6/common/VariableDatum.h | 4 +- src/dis6/common/Vector3Double.cpp | 36 +++-- src/dis6/common/Vector3Double.h | 4 +- src/dis6/common/Vector3Float.cpp | 36 +++-- src/dis6/common/Vector3Float.h | 4 +- .../AcousticBeamData.cpp | 4 +- .../distributed_emissions/AcousticBeamData.h | 40 ++--- .../AcousticBeamFundamentalParameter.cpp | 27 ++-- .../AcousticBeamFundamentalParameter.h | 49 ++++--- .../distributed_emissions/AcousticEmitter.h | 29 ++-- .../AcousticEmitterSystem.h | 29 ++-- .../AcousticEmitterSystemData.h | 11 +- src/dis6/distributed_emissions/ApaData.h | 23 +-- src/dis6/distributed_emissions/BeamData.h | 41 +++--- src/dis6/distributed_emissions/CMakeLists.txt | 6 - .../distributed_emissions/DesignatorPdu.cpp | 18 +-- .../distributed_emissions/DesignatorPdu.h | 37 ++--- .../DistributedEmissionsFamilyPdu.h | 13 +- .../distributed_emissions/EmitterSystem.h | 29 ++-- .../UnderwaterAcousticsPdu.cpp | 86 ++++++----- src/dis6/utils/IncomingMessage.cpp | 2 +- src/dis6/utils/PduFactory.cpp | 16 +- src/dis6/utils/PduFactory.h | 2 +- src/dis6/warfare/BurstDescriptor.cpp | 64 ++++---- src/dis6/warfare/BurstDescriptor.h | 13 +- src/dis6/warfare/DetonationPdu.cpp | 98 +++++++------ src/dis6/warfare/WarfareFamilyPdu.cpp | 59 ++++---- src/dis6/warfare/WarfareFamilyPdu.h | 9 +- 59 files changed, 1016 insertions(+), 871 deletions(-) diff --git a/.gitignore b/.gitignore index 0cbac471..c2f63e85 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ CMakeFiles cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake - +.cache diff --git a/CMakeLists.txt b/CMakeLists.txt index 564ef2eb..0657bd15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,8 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + # include GNUInstallDirs Module to get more generic directory handling include(GNUInstallDirs) @@ -19,9 +21,14 @@ add_library(OpenDIS6 "") # Add src/ to the include directories to OpenDIS6 target_include_directories(OpenDIS6 - PUBLIC $ - $ - $) + PUBLIC $ + $ +) +target_include_directories(OpenDIS6 SYSTEM + PUBLIC $ + $ + PRIVATE $ +) # Define OpenDIS7 Library add_library(OpenDIS7 "") diff --git a/src/dis6/common/ArticulationParameter.cpp b/src/dis6/common/ArticulationParameter.cpp index d5ba7256..0d3754d0 100644 --- a/src/dis6/common/ArticulationParameter.cpp +++ b/src/dis6/common/ArticulationParameter.cpp @@ -3,88 +3,97 @@ namespace dis { ArticulationParameter::ArticulationParameter() - : _parameterTypeDesignator(0), - _changeIndicator(0), - _partAttachedTo(0), - _parameterType(0), - _parameterValue(0.0) {} + : parameter_type_designator_(0), + change_indicator_(0), + part_attached_to_(0), + parameter_type_(0), + parameter_value_(0.0) {} -ArticulationParameter::~ArticulationParameter() {} +ArticulationParameter::~ArticulationParameter() = default; -uint8_t ArticulationParameter::getParameterTypeDesignator() const { - return _parameterTypeDesignator; +uint8_t ArticulationParameter::GetParameterTypeDesignator() const { + return parameter_type_designator_; } -void ArticulationParameter::setParameterTypeDesignator(uint8_t pX) { - _parameterTypeDesignator = pX; +void ArticulationParameter::SetParameterTypeDesignator(uint8_t pX) { + parameter_type_designator_ = pX; } -uint8_t ArticulationParameter::getChangeIndicator() const { - return _changeIndicator; +uint8_t ArticulationParameter::GetChangeIndicator() const { + return change_indicator_; } -void ArticulationParameter::setChangeIndicator(uint8_t pX) { - _changeIndicator = pX; +void ArticulationParameter::SetChangeIndicator(uint8_t pX) { + change_indicator_ = pX; } -uint16_t ArticulationParameter::getPartAttachedTo() const { - return _partAttachedTo; +uint16_t ArticulationParameter::GetPartAttachedTo() const { + return part_attached_to_; } -void ArticulationParameter::setPartAttachedTo(uint16_t pX) { - _partAttachedTo = pX; +void ArticulationParameter::SetPartAttachedTo(uint16_t pX) { + part_attached_to_ = pX; } -int ArticulationParameter::getParameterType() const { return _parameterType; } +int ArticulationParameter::GetParameterType() const { return parameter_type_; } -void ArticulationParameter::setParameterType(int pX) { _parameterType = pX; } +void ArticulationParameter::SetParameterType(int pX) { parameter_type_ = pX; } -double ArticulationParameter::getParameterValue() const { - return _parameterValue; +double ArticulationParameter::GetParameterValue() const { + return parameter_value_; } -void ArticulationParameter::setParameterValue(double pX) { - _parameterValue = pX; +void ArticulationParameter::SetParameterValue(double pX) { + parameter_value_ = pX; } -void ArticulationParameter::marshal(DataStream& dataStream) const { - dataStream << _parameterTypeDesignator; - dataStream << _changeIndicator; - dataStream << _partAttachedTo; - dataStream << _parameterType; - dataStream << _parameterValue; +void ArticulationParameter::Marshal(DataStream& dataStream) const { + dataStream << parameter_type_designator_; + dataStream << change_indicator_; + dataStream << part_attached_to_; + dataStream << parameter_type_; + dataStream << parameter_value_; } -void ArticulationParameter::unmarshal(DataStream& dataStream) { - dataStream >> _parameterTypeDesignator; - dataStream >> _changeIndicator; - dataStream >> _partAttachedTo; - dataStream >> _parameterType; - dataStream >> _parameterValue; +void ArticulationParameter::Unmarshal(DataStream& dataStream) { + dataStream >> parameter_type_designator_; + dataStream >> change_indicator_; + dataStream >> part_attached_to_; + dataStream >> parameter_type_; + dataStream >> parameter_value_; } bool ArticulationParameter::operator==(const ArticulationParameter& rhs) const { - bool ivarsEqual = true; - - if (!(_parameterTypeDesignator == rhs._parameterTypeDesignator)) - ivarsEqual = false; - if (!(_changeIndicator == rhs._changeIndicator)) ivarsEqual = false; - if (!(_partAttachedTo == rhs._partAttachedTo)) ivarsEqual = false; - if (!(_parameterType == rhs._parameterType)) ivarsEqual = false; - if (!(_parameterValue == rhs._parameterValue)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(parameter_type_designator_ == rhs.parameter_type_designator_)) { + ivars_equal = false; + } + if (!(change_indicator_ == rhs.change_indicator_)) { + ivars_equal = false; + } + if (!(part_attached_to_ == rhs.part_attached_to_)) { + ivars_equal = false; + } + if (!(parameter_type_ == rhs.parameter_type_)) { + ivars_equal = false; + } + if (!(parameter_value_ == rhs.parameter_value_)) { + ivars_equal = false; + } + + return ivars_equal; } -int ArticulationParameter::getMarshalledSize() const { - int marshalSize = 0; +int ArticulationParameter::GetMarshalledSize() const { + int marshal_size = 0; - marshalSize = marshalSize + 1; // _parameterTypeDesignator - marshalSize = marshalSize + 1; // _changeIndicator - marshalSize = marshalSize + 2; // _partAttachedTo - marshalSize = marshalSize + 4; // _parameterType - marshalSize = marshalSize + 8; // _parameterValue - return marshalSize; + marshal_size = marshal_size + 1; // _parameterTypeDesignator + marshal_size = marshal_size + 1; // _changeIndicator + marshal_size = marshal_size + 2; // _partAttachedTo + marshal_size = marshal_size + 4; // _parameterType + marshal_size = marshal_size + 8; // _parameterValue + return marshal_size; } } // namespace dis diff --git a/src/dis6/common/ArticulationParameter.h b/src/dis6/common/ArticulationParameter.h index b41ddc2b..efd1fc48 100644 --- a/src/dis6/common/ArticulationParameter.h +++ b/src/dis6/common/ArticulationParameter.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DIS6_COMMON_ARTICULATIONPARAMETER_H_ +#define DIS6_COMMON_ARTICULATIONPARAMETER_H_ #include @@ -53,8 +54,11 @@ class ArticulationParameter { bool operator==(const ArticulationParameter& rhs) const; }; + } // namespace dis +#endif // DIS6_COMMON_ARTICULATIONPARAMETER_H_ + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/ClockTime.cpp b/src/dis6/common/ClockTime.cpp index 4c008bf9..43c9b0e6 100644 --- a/src/dis6/common/ClockTime.cpp +++ b/src/dis6/common/ClockTime.cpp @@ -1,46 +1,51 @@ #include "dis6/common/ClockTime.h" -using namespace DIS; +namespace dis { +ClockTime::ClockTime() : hour_(0), time_past_hour_(0) {} -ClockTime::ClockTime() : _hour(0), _timePastHour(0) {} +ClockTime::~ClockTime() = default; -ClockTime::~ClockTime() {} +int ClockTime::GetHour() const { return hour_; } -int ClockTime::getHour() const { return _hour; } +void ClockTime::SetHour(int pX) { hour_ = pX; } -void ClockTime::setHour(int pX) { _hour = pX; } +uint32_t ClockTime::GetTimePastHour() const { return time_past_hour_; } -uint32_t ClockTime::getTimePastHour() const { return _timePastHour; } +void ClockTime::SetTimePastHour(uint32_t pX) { time_past_hour_ = pX; } -void ClockTime::setTimePastHour(uint32_t pX) { _timePastHour = pX; } - -void ClockTime::marshal(DataStream& dataStream) const { - dataStream << _hour; - dataStream << _timePastHour; +void ClockTime::Marshal(DataStream& dataStream) const { + dataStream << hour_; + dataStream << time_past_hour_; } -void ClockTime::unmarshal(DataStream& dataStream) { - dataStream >> _hour; - dataStream >> _timePastHour; +void ClockTime::Unmarshal(DataStream& dataStream) { + dataStream >> hour_; + dataStream >> time_past_hour_; } bool ClockTime::operator==(const ClockTime& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - if (!(_hour == rhs._hour)) ivarsEqual = false; - if (!(_timePastHour == rhs._timePastHour)) ivarsEqual = false; + if (!(hour_ == rhs.hour_)) { + ivars_equal = false; + } + if (!(time_past_hour_ == rhs.time_past_hour_)) { + ivars_equal = false; + } - return ivarsEqual; + return ivars_equal; } -int ClockTime::getMarshalledSize() const { - int marshalSize = 0; +int ClockTime::GetMarshalledSize() const { + int marshal_size = 0; - marshalSize = marshalSize + 4; // _hour - marshalSize = marshalSize + 4; // _timePastHour - return marshalSize; + marshal_size = marshal_size + 4; // hour_ + marshal_size = marshal_size + 4; // time_past_hour_ + return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/ClockTime.h b/src/dis6/common/ClockTime.h index de8025ba..e016495a 100644 --- a/src/dis6/common/ClockTime.h +++ b/src/dis6/common/ClockTime.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.8. Time measurements that exceed one hour. Hours is the number of // hours since January 1, 1970, UTC @@ -15,29 +14,29 @@ namespace DIS { class ClockTime { protected: /** Hours in UTC */ - int _hour; + int hour_; // NOLINT /** Time past the hour */ - uint32_t _timePastHour; + uint32_t time_past_hour_; // NOLINT public: ClockTime(); virtual ~ClockTime(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - int getHour() const; - void setHour(int pX); + [[nodiscard]] int GetHour() const; + void SetHour(int pX); - uint32_t getTimePastHour() const; - void setTimePastHour(uint32_t pX); + [[nodiscard]] uint32_t GetTimePastHour() const; + void SetTimePastHour(uint32_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const ClockTime& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/EightByteChunk.cpp b/src/dis6/common/EightByteChunk.cpp index 08efea27..6ea0f29e 100644 --- a/src/dis6/common/EightByteChunk.cpp +++ b/src/dis6/common/EightByteChunk.cpp @@ -1,59 +1,60 @@ #include "dis6/common/EightByteChunk.h" -using namespace DIS; - +namespace dis { EightByteChunk::EightByteChunk() { // Initialize fixed length array - for (int lengthotherParameters = 0; lengthotherParameters < 8; - lengthotherParameters++) { - _otherParameters[lengthotherParameters] = 0; + for (char& other_parameter : other_parameters_) { + other_parameter = 0; } } -EightByteChunk::~EightByteChunk() {} +EightByteChunk::~EightByteChunk() = default; -char* EightByteChunk::getOtherParameters() { return _otherParameters; } +char* EightByteChunk::GetOtherParameters() { return other_parameters_; } -const char* EightByteChunk::getOtherParameters() const { - return _otherParameters; +const char* EightByteChunk::GetOtherParameters() const { + return other_parameters_; } -void EightByteChunk::setOtherParameters(const char* x) { +void EightByteChunk::SetOtherParameters(const char* x) { for (int i = 0; i < 8; i++) { - _otherParameters[i] = x[i]; + other_parameters_[i] = x[i]; } } -void EightByteChunk::marshal(DataStream& dataStream) const { - for (size_t idx = 0; idx < 8; idx++) { - dataStream << _otherParameters[idx]; +void EightByteChunk::Marshal(DataStream& dataStream) const { + for (char const other_parameter : other_parameters_) { + dataStream << other_parameter; } } -void EightByteChunk::unmarshal(DataStream& dataStream) { - for (size_t idx = 0; idx < 8; idx++) { - dataStream >> _otherParameters[idx]; +void EightByteChunk::Unmarshal(DataStream& dataStream) { + for (char& other_parameter : other_parameters_) { + dataStream >> other_parameter; } } bool EightByteChunk::operator==(const EightByteChunk& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; for (uint8_t idx = 0; idx < 8; idx++) { - if (!(_otherParameters[idx] == rhs._otherParameters[idx])) - ivarsEqual = false; + if (!(other_parameters_[idx] == rhs.other_parameters_[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } -int EightByteChunk::getMarshalledSize() const { - int marshalSize = 0; +int EightByteChunk::GetMarshalledSize() const { + int marshal_size = 0; - marshalSize = marshalSize + 8 * 1; // _otherParameters - return marshalSize; + marshal_size = marshal_size + 8 * 1; // other_parameters_ + return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/EightByteChunk.h b/src/dis6/common/EightByteChunk.h index ee14168e..8f996cf2 100644 --- a/src/dis6/common/EightByteChunk.h +++ b/src/dis6/common/EightByteChunk.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // 64 bit piece of data // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -14,24 +13,24 @@ namespace DIS { class EightByteChunk { protected: /** Eight bytes of arbitrary data */ - char _otherParameters[8]; + char other_parameters_[8]; // NOLINT public: EightByteChunk(); virtual ~EightByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - char* getOtherParameters(); - const char* getOtherParameters() const; - void setOtherParameters(const char* pX); + char* GetOtherParameters(); + [[nodiscard]] const char* GetOtherParameters() const; + void SetOtherParameters(const char* pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const EightByteChunk& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/EntityID.cpp b/src/dis6/common/EntityID.cpp index 0cbaeed9..e2310f19 100644 --- a/src/dis6/common/EntityID.cpp +++ b/src/dis6/common/EntityID.cpp @@ -1,54 +1,61 @@ #include "dis6/common/EntityID.h" -using namespace DIS; +namespace dis { +EntityID::EntityID() : site_(0), application_(0), entity_(0) {} -EntityID::EntityID() : _site(0), _application(0), _entity(0) {} +EntityID::~EntityID() = default; -EntityID::~EntityID() {} +uint16_t EntityID::GetSite() const { return site_; } -uint16_t EntityID::getSite() const { return _site; } +void EntityID::SetSite(uint16_t pX) { site_ = pX; } -void EntityID::setSite(uint16_t pX) { _site = pX; } +uint16_t EntityID::GetApplication() const { return application_; } -uint16_t EntityID::getApplication() const { return _application; } +void EntityID::SetApplication(uint16_t pX) { application_ = pX; } -void EntityID::setApplication(uint16_t pX) { _application = pX; } +uint16_t EntityID::GetEntity() const { return entity_; } -uint16_t EntityID::getEntity() const { return _entity; } +void EntityID::SetEntity(uint16_t pX) { entity_ = pX; } -void EntityID::setEntity(uint16_t pX) { _entity = pX; } - -void EntityID::marshal(DataStream& dataStream) const { - dataStream << _site; - dataStream << _application; - dataStream << _entity; +void EntityID::Marshal(DataStream& dataStream) const { + dataStream << site_; + dataStream << application_; + dataStream << entity_; } -void EntityID::unmarshal(DataStream& dataStream) { - dataStream >> _site; - dataStream >> _application; - dataStream >> _entity; +void EntityID::Unmarshal(DataStream& dataStream) { + dataStream >> site_; + dataStream >> application_; + dataStream >> entity_; } bool EntityID::operator==(const EntityID& rhs) const { - bool ivarsEqual = true; - - if (!(_site == rhs._site)) ivarsEqual = false; - if (!(_application == rhs._application)) ivarsEqual = false; - if (!(_entity == rhs._entity)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(site_ == rhs.site_)) { + ivars_equal = false; + } + if (!(application_ == rhs.application_)) { + ivars_equal = false; + } + if (!(entity_ == rhs.entity_)) { + ivars_equal = false; + } + + return ivars_equal; } -int EntityID::getMarshalledSize() const { - int marshalSize = 0; +int EntityID::GetMarshalledSize() const { + int marshal_size = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _entity - return marshalSize; + marshal_size = marshal_size + 2; // site_ + marshal_size = marshal_size + 2; // application_ + marshal_size = marshal_size + 2; // entity_ + return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/EntityID.h b/src/dis6/common/EntityID.h index e9599fa7..842de79d 100644 --- a/src/dis6/common/EntityID.h +++ b/src/dis6/common/EntityID.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Each entity in a given DIS simulation application shall be given an entity // identifier number unique to all other entities in that application. This // identifier number is valid for the duration of the exercise; however, entity @@ -27,35 +26,35 @@ namespace DIS { class EntityID { protected: /** The site ID */ - uint16_t _site; + uint16_t site_; // NOLINT /** The application ID */ - uint16_t _application; + uint16_t application_; // NOLINT /** the entity ID */ - uint16_t _entity; + uint16_t entity_; // NOLINT public: EntityID(); virtual ~EntityID(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint16_t getSite() const; - void setSite(uint16_t pX); + [[nodiscard]] uint16_t GetSite() const; + void SetSite(uint16_t pX); - uint16_t getApplication() const; - void setApplication(uint16_t pX); + [[nodiscard]] uint16_t GetApplication() const; + void SetApplication(uint16_t pX); - uint16_t getEntity() const; - void setEntity(uint16_t pX); + [[nodiscard]] uint16_t GetEntity() const; + void SetEntity(uint16_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const EntityID& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/EntityType.cpp b/src/dis6/common/EntityType.cpp index 5c4f438a..ebb4d425 100644 --- a/src/dis6/common/EntityType.cpp +++ b/src/dis6/common/EntityType.cpp @@ -1,93 +1,108 @@ #include "dis6/common/EntityType.h" -using namespace DIS; - +namespace dis { EntityType::EntityType() : _entityKind(0), - _domain(0), - _country(0), - _category(0), - _subcategory(0), - _specific(0), - _extra(0) {} + domain_(0), + country_(0), + category_(0), + subcategory_(0), + specific_(0), + extra_(0) {} -EntityType::~EntityType() {} +EntityType::~EntityType() = default; -uint8_t EntityType::getEntityKind() const { return _entityKind; } +uint8_t EntityType::GetEntityKind() { return _entityKind; } -void EntityType::setEntityKind(uint8_t pX) { _entityKind = pX; } +void EntityType::SetEntityKind(uint8_t pX) { _entityKind = pX; } -uint8_t EntityType::getDomain() const { return _domain; } +uint8_t EntityType::GetDomain() const { return domain_; } -void EntityType::setDomain(uint8_t pX) { _domain = pX; } +void EntityType::SetDomain(uint8_t pX) { domain_ = pX; } -uint16_t EntityType::getCountry() const { return _country; } +uint16_t EntityType::GetCountry() const { return country_; } -void EntityType::setCountry(uint16_t pX) { _country = pX; } +void EntityType::SetCountry(uint16_t pX) { country_ = pX; } -uint8_t EntityType::getCategory() const { return _category; } +uint8_t EntityType::GetCategory() const { return category_; } -void EntityType::setCategory(uint8_t pX) { _category = pX; } +void EntityType::SetCategory(uint8_t pX) { category_ = pX; } -uint8_t EntityType::getSubcategory() const { return _subcategory; } +uint8_t EntityType::GetSubcategory() const { return subcategory_; } -void EntityType::setSubcategory(uint8_t pX) { _subcategory = pX; } +void EntityType::SetSubcategory(uint8_t pX) { subcategory_ = pX; } -uint8_t EntityType::getSpecific() const { return _specific; } +uint8_t EntityType::GetSpecific() const { return specific_; } -void EntityType::setSpecific(uint8_t pX) { _specific = pX; } +void EntityType::SetSpecific(uint8_t pX) { specific_ = pX; } -uint8_t EntityType::getExtra() const { return _extra; } +uint8_t EntityType::GetExtra() const { return extra_; } -void EntityType::setExtra(uint8_t pX) { _extra = pX; } +void EntityType::SetExtra(uint8_t pX) { extra_ = pX; } -void EntityType::marshal(DataStream& dataStream) const { - dataStream << _entityKind; - dataStream << _domain; - dataStream << _country; - dataStream << _category; - dataStream << _subcategory; - dataStream << _specific; - dataStream << _extra; +void EntityType::Marshal(DataStream& dataStream) const { + dataStream << entity_kind_; + dataStream << domain_; + dataStream << country_; + dataStream << category_; + dataStream << subcategory_; + dataStream << specific_; + dataStream << extra_; } -void EntityType::unmarshal(DataStream& dataStream) { - dataStream >> _entityKind; - dataStream >> _domain; - dataStream >> _country; - dataStream >> _category; - dataStream >> _subcategory; - dataStream >> _specific; - dataStream >> _extra; +void EntityType::Unmarshal(DataStream& dataStream) { + dataStream >> entity_kind_; + dataStream >> domain_; + dataStream >> country_; + dataStream >> category_; + dataStream >> subcategory_; + dataStream >> specific_; + dataStream >> extra_; } bool EntityType::operator==(const EntityType& rhs) const { - bool ivarsEqual = true; - - if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; - if (!(_domain == rhs._domain)) ivarsEqual = false; - if (!(_country == rhs._country)) ivarsEqual = false; - if (!(_category == rhs._category)) ivarsEqual = false; - if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; - if (!(_specific == rhs._specific)) ivarsEqual = false; - if (!(_extra == rhs._extra)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_entityKind == rhs.entity_kind_)) { + ivars_equal = false; + } + if (!(_domain == rhs.domain_)) { + ivars_equal = false; + } + if (!(_country == rhs.country_)) { + ivars_equal = false; + } + if (!(_category == rhs.category_)) { + ivars_equal = false; + } + if (!(_subcategory == rhs.subcategory_)) { + ivars_equal = false; + } + if (!(_specific == rhs.specific_)) { + ivars_equal = false; + } + if (!(_extra == rhs.extra_)) { + ivars_equal = false; + } + + return ivars_equal; } -int EntityType::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - marshalSize = marshalSize + 1; // _specific - marshalSize = marshalSize + 1; // _extra - return marshalSize; +int EntityType::GetMarshalledSize() const { + int marshal_size = 0; + + marshal_size = marshal_size + 1; // _entityKind + marshal_size = marshal_size + 1; // _domain + marshal_size = marshal_size + 2; // _country + marshal_size = marshal_size + 1; // _category + marshal_size = marshal_size + 1; // _subcategory + marshal_size = marshal_size + 1; // _specific + marshal_size = marshal_size + 1; // _extra + return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/EntityType.h b/src/dis6/common/EntityType.h index ac2e37da..6f587f06 100644 --- a/src/dis6/common/EntityType.h +++ b/src/dis6/common/EntityType.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.16. Identifies the type of entity, including kind of entity, // domain (surface, subsurface, air, etc) country, category, etc. @@ -15,58 +14,58 @@ namespace DIS { class EntityType { protected: /** Kind of entity */ - uint8_t _entityKind; + uint8_t entity_kind_; // NOLINT /** Domain of entity (air, surface, subsurface, space, etc) */ - uint8_t _domain; + uint8_t domain_; // NOLINT /** country to which the design of the entity is attributed */ - uint16_t _country; + uint16_t country_; // NOLINT /** category of entity */ - uint8_t _category; + uint8_t category_; // NOLINT /** subcategory of entity */ - uint8_t _subcategory; + uint8_t subcategory_; // NOLINT /** specific info based on subcategory field */ - uint8_t _specific; + uint8_t specific_; // NOLINT - uint8_t _extra; + uint8_t extra_; // NOLINT public: EntityType(); virtual ~EntityType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint8_t getEntityKind() const; - void setEntityKind(uint8_t pX); + [[nodiscard]] static uint8_t GetEntityKind(); + void SetEntityKind(uint8_t pX); - uint8_t getDomain() const; - void setDomain(uint8_t pX); + [[nodiscard]] uint8_t GetDomain() const; + void SetDomain(uint8_t pX); - uint16_t getCountry() const; - void setCountry(uint16_t pX); + [[nodiscard]] uint16_t GetCountry() const; + void SetCountry(uint16_t pX); - uint8_t getCategory() const; - void setCategory(uint8_t pX); + [[nodiscard]] uint8_t GetCategory() const; + void SetCategory(uint8_t pX); - uint8_t getSubcategory() const; - void setSubcategory(uint8_t pX); + [[nodiscard]] uint8_t GetSubcategory() const; + void SetSubcategory(uint8_t pX); - uint8_t getSpecific() const; - void setSpecific(uint8_t pX); + [[nodiscard]] uint8_t GetSpecific() const; + void SetSpecific(uint8_t pX); - uint8_t getExtra() const; - void setExtra(uint8_t pX); + [[nodiscard]] uint8_t GetExtra() const; + void SetExtra(uint8_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const EntityType& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/EventID.cpp b/src/dis6/common/EventID.cpp index d2b08926..96e9d17d 100644 --- a/src/dis6/common/EventID.cpp +++ b/src/dis6/common/EventID.cpp @@ -4,7 +4,7 @@ using namespace DIS; EventID::EventID() : _site(0), _application(0), _eventNumber(0) {} -EventID::~EventID() {} +EventID::~EventID() = default; uint16_t EventID::getSite() const { return _site; } @@ -18,35 +18,41 @@ uint16_t EventID::getEventNumber() const { return _eventNumber; } void EventID::setEventNumber(uint16_t pX) { _eventNumber = pX; } -void EventID::marshal(DataStream& dataStream) const { +void EventID::Marshal(DataStream& dataStream) const { dataStream << _site; dataStream << _application; dataStream << _eventNumber; } -void EventID::unmarshal(DataStream& dataStream) { +void EventID::Unmarshal(DataStream& dataStream) { dataStream >> _site; dataStream >> _application; dataStream >> _eventNumber; } bool EventID::operator==(const EventID& rhs) const { - bool ivarsEqual = true; - - if (!(_site == rhs._site)) ivarsEqual = false; - if (!(_application == rhs._application)) ivarsEqual = false; - if (!(_eventNumber == rhs._eventNumber)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_site == rhs._site)) { + ivars_equal = false; + } + if (!(_application == rhs._application)) { + ivars_equal = false; + } + if (!(_eventNumber == rhs._eventNumber)) { + ivars_equal = false; + } + + return ivars_equal; } int EventID::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - marshalSize = marshalSize + 2; // _eventNumber - return marshalSize; + marshal_size = marshal_size + 2; // _site + marshal_size = marshal_size + 2; // _application + marshal_size = marshal_size + 2; // _eventNumber + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/EventID.h b/src/dis6/common/EventID.h index 220187ec..5765c0bd 100644 --- a/src/dis6/common/EventID.h +++ b/src/dis6/common/EventID.h @@ -27,8 +27,8 @@ class EventID { EventID(); virtual ~EventID(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint16_t getSite() const; void setSite(uint16_t pX); diff --git a/src/dis6/common/FixedDatum.cpp b/src/dis6/common/FixedDatum.cpp index 7cf9e05a..bbbacd5f 100644 --- a/src/dis6/common/FixedDatum.cpp +++ b/src/dis6/common/FixedDatum.cpp @@ -4,7 +4,7 @@ using namespace DIS; FixedDatum::FixedDatum() : _fixedDatumID(0), _fixedDatumValue(0) {} -FixedDatum::~FixedDatum() {} +FixedDatum::~FixedDatum() = default; uint32_t FixedDatum::getFixedDatumID() const { return _fixedDatumID; } @@ -14,31 +14,35 @@ uint32_t FixedDatum::getFixedDatumValue() const { return _fixedDatumValue; } void FixedDatum::setFixedDatumValue(uint32_t pX) { _fixedDatumValue = pX; } -void FixedDatum::marshal(DataStream& dataStream) const { +void FixedDatum::Marshal(DataStream& dataStream) const { dataStream << _fixedDatumID; dataStream << _fixedDatumValue; } -void FixedDatum::unmarshal(DataStream& dataStream) { +void FixedDatum::Unmarshal(DataStream& dataStream) { dataStream >> _fixedDatumID; dataStream >> _fixedDatumValue; } bool FixedDatum::operator==(const FixedDatum& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - if (!(_fixedDatumID == rhs._fixedDatumID)) ivarsEqual = false; - if (!(_fixedDatumValue == rhs._fixedDatumValue)) ivarsEqual = false; + if (!(_fixedDatumID == rhs._fixedDatumID)) { + ivars_equal = false; + } + if (!(_fixedDatumValue == rhs._fixedDatumValue)) { + ivars_equal = false; + } - return ivarsEqual; + return ivars_equal; } int FixedDatum::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 4; // _fixedDatumID - marshalSize = marshalSize + 4; // _fixedDatumValue - return marshalSize; + marshal_size = marshal_size + 4; // _fixedDatumID + marshal_size = marshal_size + 4; // _fixedDatumValue + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/FixedDatum.h b/src/dis6/common/FixedDatum.h index 7125ab8a..667f676c 100644 --- a/src/dis6/common/FixedDatum.h +++ b/src/dis6/common/FixedDatum.h @@ -23,8 +23,8 @@ class FixedDatum { FixedDatum(); virtual ~FixedDatum(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint32_t getFixedDatumID() const; void setFixedDatumID(uint32_t pX); diff --git a/src/dis6/common/FourByteChunk.cpp b/src/dis6/common/FourByteChunk.cpp index be7428a8..2ae30654 100644 --- a/src/dis6/common/FourByteChunk.cpp +++ b/src/dis6/common/FourByteChunk.cpp @@ -4,13 +4,12 @@ using namespace DIS; FourByteChunk::FourByteChunk() { // Initialize fixed length array - for (int lengthotherParameters = 0; lengthotherParameters < 4; - lengthotherParameters++) { - _otherParameters[lengthotherParameters] = 0; + for (char& _otherParameter : _otherParameters) { + _otherParameter = 0; } } -FourByteChunk::~FourByteChunk() {} +FourByteChunk::~FourByteChunk() = default; char* FourByteChunk::getOtherParameters() { return _otherParameters; } @@ -24,34 +23,35 @@ void FourByteChunk::setOtherParameters(const char* x) { } } -void FourByteChunk::marshal(DataStream& dataStream) const { - for (size_t idx = 0; idx < 4; idx++) { - dataStream << _otherParameters[idx]; +void FourByteChunk::Marshal(DataStream& dataStream) const { + for (char _otherParameter : _otherParameters) { + dataStream << _otherParameter; } } -void FourByteChunk::unmarshal(DataStream& dataStream) { - for (size_t idx = 0; idx < 4; idx++) { - dataStream >> _otherParameters[idx]; +void FourByteChunk::Unmarshal(DataStream& dataStream) { + for (char& _otherParameter : _otherParameters) { + dataStream >> _otherParameter; } } bool FourByteChunk::operator==(const FourByteChunk& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; for (uint8_t idx = 0; idx < 4; idx++) { - if (!(_otherParameters[idx] == rhs._otherParameters[idx])) - ivarsEqual = false; + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int FourByteChunk::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 4 * 1; // _otherParameters - return marshalSize; + marshal_size = marshal_size + 4 * 1; // _otherParameters + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/FourByteChunk.h b/src/dis6/common/FourByteChunk.h index 53f66afc..a0e22d5a 100644 --- a/src/dis6/common/FourByteChunk.h +++ b/src/dis6/common/FourByteChunk.h @@ -20,8 +20,8 @@ class FourByteChunk { FourByteChunk(); virtual ~FourByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); char* getOtherParameters(); const char* getOtherParameters() const; diff --git a/src/dis6/common/Orientation.cpp b/src/dis6/common/Orientation.cpp index 7966c48e..104587c9 100644 --- a/src/dis6/common/Orientation.cpp +++ b/src/dis6/common/Orientation.cpp @@ -4,7 +4,7 @@ using namespace DIS; Orientation::Orientation() : _psi(0.0), _theta(0.0), _phi(0.0) {} -Orientation::~Orientation() {} +Orientation::~Orientation() = default; float Orientation::getPsi() const { return _psi; } @@ -18,35 +18,41 @@ float Orientation::getPhi() const { return _phi; } void Orientation::setPhi(float pX) { _phi = pX; } -void Orientation::marshal(DataStream& dataStream) const { +void Orientation::Marshal(DataStream& dataStream) const { dataStream << _psi; dataStream << _theta; dataStream << _phi; } -void Orientation::unmarshal(DataStream& dataStream) { +void Orientation::Unmarshal(DataStream& dataStream) { dataStream >> _psi; dataStream >> _theta; dataStream >> _phi; } bool Orientation::operator==(const Orientation& rhs) const { - bool ivarsEqual = true; - - if (!(_psi == rhs._psi)) ivarsEqual = false; - if (!(_theta == rhs._theta)) ivarsEqual = false; - if (!(_phi == rhs._phi)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_psi == rhs._psi)) { + ivars_equal = false; + } + if (!(_theta == rhs._theta)) { + ivars_equal = false; + } + if (!(_phi == rhs._phi)) { + ivars_equal = false; + } + + return ivars_equal; } int Orientation::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 4; // _psi - marshalSize = marshalSize + 4; // _theta - marshalSize = marshalSize + 4; // _phi - return marshalSize; + marshal_size = marshal_size + 4; // _psi + marshal_size = marshal_size + 4; // _theta + marshal_size = marshal_size + 4; // _phi + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/Orientation.h b/src/dis6/common/Orientation.h index 6088dae5..3cd23924 100644 --- a/src/dis6/common/Orientation.h +++ b/src/dis6/common/Orientation.h @@ -24,8 +24,8 @@ class Orientation { Orientation(); virtual ~Orientation(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); float getPsi() const; void setPsi(float pX); diff --git a/src/dis6/common/Pdu.cpp b/src/dis6/common/Pdu.cpp index 5c8476f0..53131254 100644 --- a/src/dis6/common/Pdu.cpp +++ b/src/dis6/common/Pdu.cpp @@ -1,47 +1,46 @@ #include "dis6/common/Pdu.h" -using namespace DIS; - +namespace dis { Pdu::Pdu() - : _protocolVersion(6), + : protocol_version_(6), _exerciseID(0), _pduType(0), - _protocolFamily(0), - _timestamp(0), - _length(0), - _padding(0) {} + protocol_family_(0), + timestamp_(0), + length_(0), + padding_(0) {} -Pdu::~Pdu() {} +Pdu::~Pdu() = default; -uint8_t Pdu::getProtocolVersion() const { return _protocolVersion; } +uint8_t Pdu::GetProtocolVersion() { return _protocolVersion; } -void Pdu::setProtocolVersion(uint8_t pX) { _protocolVersion = pX; } +void Pdu::SetProtocolVersion(uint8_t pX) { protocol_version_ = pX; } -uint8_t Pdu::getExerciseID() const { return _exerciseID; } +uint8_t Pdu::GetExerciseId() { return _exerciseID; } -void Pdu::setExerciseID(uint8_t pX) { _exerciseID = pX; } +void Pdu::SetExerciseId(uint8_t pX) { _exerciseID = pX; } -uint8_t Pdu::getPduType() const { return _pduType; } +uint8_t Pdu::GetPduType() { return _pduType; } -void Pdu::setPduType(uint8_t pX) { _pduType = pX; } +void Pdu::SetPduType(uint8_t pX) { _pduType = pX; } uint8_t Pdu::getProtocolFamily() const { return _protocolFamily; } -void Pdu::setProtocolFamily(uint8_t pX) { _protocolFamily = pX; } +void Pdu::SetProtocolFamily(uint8_t pX) { _protocolFamily = pX; } -uint32_t Pdu::getTimestamp() const { return _timestamp; } +uint32_t Pdu::GetTimestamp() const { return _timestamp; } -void Pdu::setTimestamp(uint32_t pX) { _timestamp = pX; } +void Pdu::SetTimestamp(uint32_t pX) { _timestamp = pX; } -uint16_t Pdu::getLength() const { return this->getMarshalledSize(); } +uint16_t Pdu::GetLength() const { return this->getMarshalledSize(); } -void Pdu::setLength(uint16_t pX) { _length = pX; } +void Pdu::SetLength(uint16_t pX) { _length = pX; } -int16_t Pdu::getPadding() const { return _padding; } +int16_t Pdu::GetPadding() const { return _padding; } -void Pdu::setPadding(int16_t pX) { _padding = pX; } +void Pdu::SetPadding(int16_t pX) { _padding = pX; } -void Pdu::marshal(DataStream& dataStream) const { +void Pdu::Marshal(DataStream& dataStream) const { dataStream << _protocolVersion; dataStream << _exerciseID; dataStream << _pduType; @@ -51,7 +50,7 @@ void Pdu::marshal(DataStream& dataStream) const { dataStream << _padding; } -void Pdu::unmarshal(DataStream& dataStream) { +void Pdu::Unmarshal(DataStream& dataStream) { dataStream >> _protocolVersion; dataStream >> _exerciseID; dataStream >> _pduType; @@ -62,32 +61,48 @@ void Pdu::unmarshal(DataStream& dataStream) { } bool Pdu::operator==(const Pdu& rhs) const { - bool ivarsEqual = true; - - if (!(_protocolVersion == rhs._protocolVersion)) ivarsEqual = false; - if (!(_exerciseID == rhs._exerciseID)) ivarsEqual = false; - if (!(_pduType == rhs._pduType)) ivarsEqual = false; - if (!(_protocolFamily == rhs._protocolFamily)) ivarsEqual = false; - if (!(_timestamp == rhs._timestamp)) ivarsEqual = false; - if (!(_length == rhs._length)) ivarsEqual = false; - if (!(_padding == rhs._padding)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_protocolVersion == rhs._protocolVersion)) { + ivars_equal = false; + } + if (!(_exerciseID == rhs._exerciseID)) { + ivars_equal = false; + } + if (!(_pduType == rhs._pduType)) { + ivars_equal = false; + } + if (!(_protocolFamily == rhs._protocolFamily)) { + ivars_equal = false; + } + if (!(_timestamp == rhs._timestamp)) { + ivars_equal = false; + } + if (!(_length == rhs._length)) { + ivars_equal = false; + } + if (!(_padding == rhs._padding)) { + ivars_equal = false; + } + + return ivars_equal; } -int Pdu::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _protocolVersion - marshalSize = marshalSize + 1; // _exerciseID - marshalSize = marshalSize + 1; // _pduType - marshalSize = marshalSize + 1; // _protocolFamily - marshalSize = marshalSize + 4; // _timestamp - marshalSize = marshalSize + 2; // _length - marshalSize = marshalSize + 2; // _padding - return marshalSize; +static int Pdu::GetMarshalledSize() { + int marshal_size = 0; + + marshal_size = marshal_size + 1; // _protocolVersion + marshal_size = marshal_size + 1; // _exerciseID + marshal_size = marshal_size + 1; // _pduType + marshal_size = marshal_size + 1; // _protocolFamily + marshal_size = marshal_size + 4; // _timestamp + marshal_size = marshal_size + 2; // _length + marshal_size = marshal_size + 2; // _padding + return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/Pdu.h b/src/dis6/common/Pdu.h index 87606e97..b2057841 100644 --- a/src/dis6/common/Pdu.h +++ b/src/dis6/common/Pdu.h @@ -1,9 +1,10 @@ #pragma once +#include #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // The superclass for all PDUs. This incorporates the PduHeader record, // section 5.2.29. @@ -15,59 +16,59 @@ namespace DIS { class Pdu { protected: /** The version of the protocol. 5=DIS-1995, 6=DIS-1998. */ - uint8_t _protocolVersion; + uint8_t protocol_version_; /** Exercise ID */ - uint8_t _exerciseID; + uint8_t exercise_id_; /** Type of pdu, unique for each PDU class */ - uint8_t _pduType; + uint8_t pdu_type_; /** value that refers to the protocol family, eg SimulationManagement, et */ - uint8_t _protocolFamily; + uint8_t protocol_family_; /** Timestamp value */ - uint32_t _timestamp; + uint32_t timestamp_; /** Length, in bytes, of the PDU */ - uint16_t _length; + uint16_t length_; /** zero-filled array of padding */ - int16_t _padding; + int16_t padding_; public: Pdu(); virtual ~Pdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint8_t getProtocolVersion() const; - void setProtocolVersion(uint8_t pX); + [[nodiscard]] static uint8_t GetProtocolVersion(); + void SetProtocolVersion(uint8_t pX); - uint8_t getExerciseID() const; - void setExerciseID(uint8_t pX); + [[nodiscard]] static uint8_t GetExerciseId(); + void SetExerciseId(uint8_t pX); - uint8_t getPduType() const; - void setPduType(uint8_t pX); + [[nodiscard]] static uint8_t GetPduType(); + void SetPduType(uint8_t pX); - uint8_t getProtocolFamily() const; - void setProtocolFamily(uint8_t pX); + [[nodiscard]] uint8_t GetProtocolFamily() const; + void SetProtocolFamily(uint8_t pX); - uint32_t getTimestamp() const; - void setTimestamp(uint32_t pX); + [[nodiscard]] uint32_t GetTimestamp() const; + void SetTimestamp(uint32_t pX); - uint16_t getLength() const; - void setLength(uint16_t pX); + [[nodiscard]] uint16_t GetLength() const; + void SetLength(uint16_t pX); - int16_t getPadding() const; - void setPadding(int16_t pX); + [[nodiscard]] int16_t GetPadding() const; + void SetPadding(int16_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const Pdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/RecordSet.cpp b/src/dis6/common/RecordSet.cpp index 526f1df2..c6367047 100644 --- a/src/dis6/common/RecordSet.cpp +++ b/src/dis6/common/RecordSet.cpp @@ -10,7 +10,7 @@ RecordSet::RecordSet() _recordValues(0), _pad4(0) {} -RecordSet::~RecordSet() {} +RecordSet::~RecordSet() = default; uint32_t RecordSet::getRecordID() const { return _recordID; } @@ -40,7 +40,7 @@ uint8_t RecordSet::getPad4() const { return _pad4; } void RecordSet::setPad4(uint8_t pX) { _pad4 = pX; } -void RecordSet::marshal(DataStream& dataStream) const { +void RecordSet::Marshal(DataStream& dataStream) const { dataStream << _recordID; dataStream << _recordSetSerialNumber; dataStream << _recordLength; @@ -49,7 +49,7 @@ void RecordSet::marshal(DataStream& dataStream) const { dataStream << _pad4; } -void RecordSet::unmarshal(DataStream& dataStream) { +void RecordSet::Unmarshal(DataStream& dataStream) { dataStream >> _recordID; dataStream >> _recordSetSerialNumber; dataStream >> _recordLength; @@ -59,29 +59,40 @@ void RecordSet::unmarshal(DataStream& dataStream) { } bool RecordSet::operator==(const RecordSet& rhs) const { - bool ivarsEqual = true; - - if (!(_recordID == rhs._recordID)) ivarsEqual = false; - if (!(_recordSetSerialNumber == rhs._recordSetSerialNumber)) - ivarsEqual = false; - if (!(_recordLength == rhs._recordLength)) ivarsEqual = false; - if (!(_recordCount == rhs._recordCount)) ivarsEqual = false; - if (!(_recordValues == rhs._recordValues)) ivarsEqual = false; - if (!(_pad4 == rhs._pad4)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_recordID == rhs._recordID)) { + ivars_equal = false; + } + if (!(_recordSetSerialNumber == rhs._recordSetSerialNumber)) { + ivars_equal = false; + } + if (!(_recordLength == rhs._recordLength)) { + ivars_equal = false; + } + if (!(_recordCount == rhs._recordCount)) { + ivars_equal = false; + } + if (!(_recordValues == rhs._recordValues)) { + ivars_equal = false; + } + if (!(_pad4 == rhs._pad4)) { + ivars_equal = false; + } + + return ivars_equal; } int RecordSet::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _recordID - marshalSize = marshalSize + 4; // _recordSetSerialNumber - marshalSize = marshalSize + 2; // _recordLength - marshalSize = marshalSize + 2; // _recordCount - marshalSize = marshalSize + 2; // _recordValues - marshalSize = marshalSize + 1; // _pad4 - return marshalSize; + int marshal_size = 0; + + marshal_size = marshal_size + 4; // _recordID + marshal_size = marshal_size + 4; // _recordSetSerialNumber + marshal_size = marshal_size + 2; // _recordLength + marshal_size = marshal_size + 2; // _recordCount + marshal_size = marshal_size + 2; // _recordValues + marshal_size = marshal_size + 1; // _pad4 + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/RecordSet.h b/src/dis6/common/RecordSet.h index e3b804ec..496ab2ed 100644 --- a/src/dis6/common/RecordSet.h +++ b/src/dis6/common/RecordSet.h @@ -35,8 +35,8 @@ class RecordSet { RecordSet(); virtual ~RecordSet(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint32_t getRecordID() const; void setRecordID(uint32_t pX); diff --git a/src/dis6/common/SimulationAddress.cpp b/src/dis6/common/SimulationAddress.cpp index 29fd6431..da6c2cd8 100644 --- a/src/dis6/common/SimulationAddress.cpp +++ b/src/dis6/common/SimulationAddress.cpp @@ -4,7 +4,7 @@ using namespace DIS; SimulationAddress::SimulationAddress() : _site(0), _application(0) {} -SimulationAddress::~SimulationAddress() {} +SimulationAddress::~SimulationAddress() = default; uint16_t SimulationAddress::getSite() const { return _site; } @@ -14,31 +14,35 @@ uint16_t SimulationAddress::getApplication() const { return _application; } void SimulationAddress::setApplication(uint16_t pX) { _application = pX; } -void SimulationAddress::marshal(DataStream& dataStream) const { +void SimulationAddress::Marshal(DataStream& dataStream) const { dataStream << _site; dataStream << _application; } -void SimulationAddress::unmarshal(DataStream& dataStream) { +void SimulationAddress::Unmarshal(DataStream& dataStream) { dataStream >> _site; dataStream >> _application; } bool SimulationAddress::operator==(const SimulationAddress& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - if (!(_site == rhs._site)) ivarsEqual = false; - if (!(_application == rhs._application)) ivarsEqual = false; + if (!(_site == rhs._site)) { + ivars_equal = false; + } + if (!(_application == rhs._application)) { + ivars_equal = false; + } - return ivarsEqual; + return ivars_equal; } int SimulationAddress::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 2; // _site - marshalSize = marshalSize + 2; // _application - return marshalSize; + marshal_size = marshal_size + 2; // _site + marshal_size = marshal_size + 2; // _application + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/SimulationAddress.h b/src/dis6/common/SimulationAddress.h index 504e3e62..f6794eac 100644 --- a/src/dis6/common/SimulationAddress.h +++ b/src/dis6/common/SimulationAddress.h @@ -24,8 +24,8 @@ class SimulationAddress { SimulationAddress(); virtual ~SimulationAddress(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint16_t getSite() const; void setSite(uint16_t pX); diff --git a/src/dis6/common/SixByteChunk.cpp b/src/dis6/common/SixByteChunk.cpp index 3ad0d925..eba727bf 100644 --- a/src/dis6/common/SixByteChunk.cpp +++ b/src/dis6/common/SixByteChunk.cpp @@ -4,13 +4,12 @@ using namespace DIS; SixByteChunk::SixByteChunk() { // Initialize fixed length array - for (int lengthotherParameters = 0; lengthotherParameters < 6; - lengthotherParameters++) { - _otherParameters[lengthotherParameters] = 0; + for (char& _otherParameter : _otherParameters) { + _otherParameter = 0; } } -SixByteChunk::~SixByteChunk() {} +SixByteChunk::~SixByteChunk() = default; char* SixByteChunk::getOtherParameters() { return _otherParameters; } @@ -24,34 +23,35 @@ void SixByteChunk::setOtherParameters(const char* x) { } } -void SixByteChunk::marshal(DataStream& dataStream) const { - for (size_t idx = 0; idx < 6; idx++) { - dataStream << _otherParameters[idx]; +void SixByteChunk::Marshal(DataStream& dataStream) const { + for (char _otherParameter : _otherParameters) { + dataStream << _otherParameter; } } -void SixByteChunk::unmarshal(DataStream& dataStream) { - for (size_t idx = 0; idx < 6; idx++) { - dataStream >> _otherParameters[idx]; +void SixByteChunk::Unmarshal(DataStream& dataStream) { + for (char& _otherParameter : _otherParameters) { + dataStream >> _otherParameter; } } bool SixByteChunk::operator==(const SixByteChunk& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; for (uint8_t idx = 0; idx < 6; idx++) { - if (!(_otherParameters[idx] == rhs._otherParameters[idx])) - ivarsEqual = false; + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int SixByteChunk::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 6 * 1; // _otherParameters - return marshalSize; + marshal_size = marshal_size + 6 * 1; // _otherParameters + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/SixByteChunk.h b/src/dis6/common/SixByteChunk.h index 0fc25cde..d8a95f2d 100644 --- a/src/dis6/common/SixByteChunk.h +++ b/src/dis6/common/SixByteChunk.h @@ -20,8 +20,8 @@ class SixByteChunk { SixByteChunk(); virtual ~SixByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); char* getOtherParameters(); const char* getOtherParameters() const; diff --git a/src/dis6/common/TwoByteChunk.cpp b/src/dis6/common/TwoByteChunk.cpp index 592f9ead..3e056759 100644 --- a/src/dis6/common/TwoByteChunk.cpp +++ b/src/dis6/common/TwoByteChunk.cpp @@ -4,13 +4,12 @@ using namespace DIS; TwoByteChunk::TwoByteChunk() { // Initialize fixed length array - for (int lengthotherParameters = 0; lengthotherParameters < 2; - lengthotherParameters++) { - _otherParameters[lengthotherParameters] = 0; + for (char& _otherParameter : _otherParameters) { + _otherParameter = 0; } } -TwoByteChunk::~TwoByteChunk() {} +TwoByteChunk::~TwoByteChunk() = default; char* TwoByteChunk::getOtherParameters() { return _otherParameters; } @@ -24,34 +23,35 @@ void TwoByteChunk::setOtherParameters(const char* x) { } } -void TwoByteChunk::marshal(DataStream& dataStream) const { - for (size_t idx = 0; idx < 2; idx++) { - dataStream << _otherParameters[idx]; +void TwoByteChunk::Marshal(DataStream& dataStream) const { + for (char _otherParameter : _otherParameters) { + dataStream << _otherParameter; } } -void TwoByteChunk::unmarshal(DataStream& dataStream) { - for (size_t idx = 0; idx < 2; idx++) { - dataStream >> _otherParameters[idx]; +void TwoByteChunk::Unmarshal(DataStream& dataStream) { + for (char& _otherParameter : _otherParameters) { + dataStream >> _otherParameter; } } bool TwoByteChunk::operator==(const TwoByteChunk& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; for (uint8_t idx = 0; idx < 2; idx++) { - if (!(_otherParameters[idx] == rhs._otherParameters[idx])) - ivarsEqual = false; + if (!(_otherParameters[idx] == rhs._otherParameters[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int TwoByteChunk::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 2 * 1; // _otherParameters - return marshalSize; + marshal_size = marshal_size + 2 * 1; // _otherParameters + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/TwoByteChunk.h b/src/dis6/common/TwoByteChunk.h index 0b05ed65..cc5c1986 100644 --- a/src/dis6/common/TwoByteChunk.h +++ b/src/dis6/common/TwoByteChunk.h @@ -20,8 +20,8 @@ class TwoByteChunk { TwoByteChunk(); virtual ~TwoByteChunk(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); char* getOtherParameters(); const char* getOtherParameters() const; diff --git a/src/dis6/common/VariableDatum.cpp b/src/dis6/common/VariableDatum.cpp index ec1ae1f1..8bcc647c 100644 --- a/src/dis6/common/VariableDatum.cpp +++ b/src/dis6/common/VariableDatum.cpp @@ -41,13 +41,17 @@ void VariableDatum::setVariableDatums(const char* x, const uint32_t length) { // Figure out _arrayLength (including padding to force whole 8 byte chunks) uint32_t chunks = length / 8; - int remainder = length % 8; - if (remainder > 0) chunks++; + int const remainder = length % 8; + if (remainder > 0) { + chunks++; + } _arrayLength = chunks * 8; // .resize() might (theoretically) throw. want to catch? : what to do? zombie // datum? - if (_variableDatums.size() < length) _variableDatums.resize(length); + if (_variableDatums.size() < length) { + _variableDatums.resize(length); + } for (auto i = 0; i < length; i++) { _variableDatums[i] = x[i]; @@ -57,7 +61,7 @@ void VariableDatum::setVariableDatums(const char* x, const uint32_t length) { } } -void VariableDatum::marshal(DataStream& dataStream) const { +void VariableDatum::Marshal(DataStream& dataStream) const { dataStream << _variableDatumID; dataStream << _variableDatumLength; @@ -66,19 +70,22 @@ void VariableDatum::marshal(DataStream& dataStream) const { } } -void VariableDatum::unmarshal(DataStream& dataStream) { +void VariableDatum::Unmarshal(DataStream& dataStream) { dataStream >> _variableDatumID; dataStream >> _variableDatumLength; - int byteLength = _variableDatumLength / 8; - int chunks = byteLength / 8; - if (byteLength % 8 > 0) chunks++; + int const byte_length = _variableDatumLength / 8; + int chunks = byte_length / 8; + if (byte_length % 8 > 0) { + chunks++; + } _arrayLength = chunks * 8; // .resize() might (theoretically) throw. want to catch? : what to do? zombie // datum? - if (_variableDatums.size() < _arrayLength) + if (_variableDatums.size() < _arrayLength) { _variableDatums.resize(_arrayLength); + } for (uint32_t idx = 0; idx < _arrayLength; idx++) { dataStream >> _variableDatums[idx]; @@ -89,33 +96,37 @@ void VariableDatum::unmarshal(DataStream& dataStream) { } bool VariableDatum::operator==(const VariableDatum& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - if (!(_variableDatumID == rhs._variableDatumID)) ivarsEqual = false; - if (!(_variableDatumLength == rhs._variableDatumLength)) ivarsEqual = false; - if (!(_variableDatums.size() == rhs._variableDatums.size())) - ivarsEqual = false; - else { + if (!(_variableDatumID == rhs._variableDatumID)) { + ivars_equal = false; + } + if (!(_variableDatumLength == rhs._variableDatumLength)) { + ivars_equal = false; + } + if (!(_variableDatums.size() == rhs._variableDatums.size())) { + ivars_equal = false; + } else { for (std::size_t idx = 0; idx < _variableDatums.size(); idx++) { if (!(_variableDatums[idx] == rhs._variableDatums[idx])) { - ivarsEqual = false; + ivars_equal = false; break; } } } - return ivarsEqual; + return ivars_equal; } uint32_t VariableDatum::getMarshalledSize() const { - uint32_t marshalSize = 0; + uint32_t marshal_size = 0; - marshalSize = marshalSize + 4; // _variableDatumID - marshalSize = marshalSize + 4; // _variableDatumLength + marshal_size = marshal_size + 4; // _variableDatumID + marshal_size = marshal_size + 4; // _variableDatumLength - marshalSize = marshalSize + _arrayLength; + marshal_size = marshal_size + _arrayLength; - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/VariableDatum.h b/src/dis6/common/VariableDatum.h index dc23e8de..a6cb61a4 100644 --- a/src/dis6/common/VariableDatum.h +++ b/src/dis6/common/VariableDatum.h @@ -33,8 +33,8 @@ class VariableDatum { VariableDatum(); virtual ~VariableDatum(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint32_t getVariableDatumID() const; void setVariableDatumID(uint32_t pX); diff --git a/src/dis6/common/Vector3Double.cpp b/src/dis6/common/Vector3Double.cpp index 9838d548..412b44f9 100644 --- a/src/dis6/common/Vector3Double.cpp +++ b/src/dis6/common/Vector3Double.cpp @@ -4,7 +4,7 @@ using namespace DIS; Vector3Double::Vector3Double() : _x(0.0), _y(0.0), _z(0.0) {} -Vector3Double::~Vector3Double() {} +Vector3Double::~Vector3Double() = default; double Vector3Double::getX() const { return _x; } @@ -18,35 +18,41 @@ double Vector3Double::getZ() const { return _z; } void Vector3Double::setZ(double pX) { _z = pX; } -void Vector3Double::marshal(DataStream& dataStream) const { +void Vector3Double::Marshal(DataStream& dataStream) const { dataStream << _x; dataStream << _y; dataStream << _z; } -void Vector3Double::unmarshal(DataStream& dataStream) { +void Vector3Double::Unmarshal(DataStream& dataStream) { dataStream >> _x; dataStream >> _y; dataStream >> _z; } bool Vector3Double::operator==(const Vector3Double& rhs) const { - bool ivarsEqual = true; - - if (!(_x == rhs._x)) ivarsEqual = false; - if (!(_y == rhs._y)) ivarsEqual = false; - if (!(_z == rhs._z)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_x == rhs._x)) { + ivars_equal = false; + } + if (!(_y == rhs._y)) { + ivars_equal = false; + } + if (!(_z == rhs._z)) { + ivars_equal = false; + } + + return ivars_equal; } int Vector3Double::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 8; // _x - marshalSize = marshalSize + 8; // _y - marshalSize = marshalSize + 8; // _z - return marshalSize; + marshal_size = marshal_size + 8; // _x + marshal_size = marshal_size + 8; // _y + marshal_size = marshal_size + 8; // _z + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/Vector3Double.h b/src/dis6/common/Vector3Double.h index 29c96784..f4366780 100644 --- a/src/dis6/common/Vector3Double.h +++ b/src/dis6/common/Vector3Double.h @@ -26,8 +26,8 @@ class Vector3Double { Vector3Double(); virtual ~Vector3Double(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); double getX() const; void setX(double pX); diff --git a/src/dis6/common/Vector3Float.cpp b/src/dis6/common/Vector3Float.cpp index 1d7d7fd0..5bbf39de 100644 --- a/src/dis6/common/Vector3Float.cpp +++ b/src/dis6/common/Vector3Float.cpp @@ -4,7 +4,7 @@ using namespace DIS; Vector3Float::Vector3Float() : _x(0.0), _y(0.0), _z(0.0) {} -Vector3Float::~Vector3Float() {} +Vector3Float::~Vector3Float() = default; float Vector3Float::getX() const { return _x; } @@ -18,35 +18,41 @@ float Vector3Float::getZ() const { return _z; } void Vector3Float::setZ(float pX) { _z = pX; } -void Vector3Float::marshal(DataStream& dataStream) const { +void Vector3Float::Marshal(DataStream& dataStream) const { dataStream << _x; dataStream << _y; dataStream << _z; } -void Vector3Float::unmarshal(DataStream& dataStream) { +void Vector3Float::Unmarshal(DataStream& dataStream) { dataStream >> _x; dataStream >> _y; dataStream >> _z; } bool Vector3Float::operator==(const Vector3Float& rhs) const { - bool ivarsEqual = true; - - if (!(_x == rhs._x)) ivarsEqual = false; - if (!(_y == rhs._y)) ivarsEqual = false; - if (!(_z == rhs._z)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_x == rhs._x)) { + ivars_equal = false; + } + if (!(_y == rhs._y)) { + ivars_equal = false; + } + if (!(_z == rhs._z)) { + ivars_equal = false; + } + + return ivars_equal; } int Vector3Float::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 4; // _x - marshalSize = marshalSize + 4; // _y - marshalSize = marshalSize + 4; // _z - return marshalSize; + marshal_size = marshal_size + 4; // _x + marshal_size = marshal_size + 4; // _y + marshal_size = marshal_size + 4; // _z + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/common/Vector3Float.h b/src/dis6/common/Vector3Float.h index 643f5512..270a5954 100644 --- a/src/dis6/common/Vector3Float.h +++ b/src/dis6/common/Vector3Float.h @@ -26,8 +26,8 @@ class Vector3Float { Vector3Float(); virtual ~Vector3Float(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); float getX() const; void setX(float pX); diff --git a/src/dis6/distributed_emissions/AcousticBeamData.cpp b/src/dis6/distributed_emissions/AcousticBeamData.cpp index 03bbd939..d0bc2d69 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamData.cpp @@ -1,6 +1,6 @@ #include "dis6/distribued_emissions/AcousticBeamData.h" -using namespace DIS; +namespace dis { AcousticBeamData::AcousticBeamData() : _beamDataLength(0), @@ -75,6 +75,8 @@ int AcousticBeamData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/AcousticBeamData.h b/src/dis6/distributed_emissions/AcousticBeamData.h index ed7bbcc5..76c7476c 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.h +++ b/src/dis6/distributed_emissions/AcousticBeamData.h @@ -1,10 +1,11 @@ #pragma once +#include + #include "dis6/distributed_emissions/AcousticBeamFundamentalParameter.h" -#include "dis6/distributed_emissions/opendis6_export.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Used in UA PDU // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -15,42 +16,43 @@ namespace DIS { class AcousticBeamData { protected: /** beam data length */ - uint16_t _beamDataLength; + uint16_t beam_data_length_; /** beamIDNumber */ - uint8_t _beamIDNumber; + uint8_t beam_id_number_; /** padding */ - uint16_t _pad2; + uint16_t pad2_; /** fundamental data parameters */ - AcousticBeamFundamentalParameter _fundamentalDataParameters; + AcousticBeamFundamentalParameter fundamental_data_parameters_; public: AcousticBeamData(); virtual ~AcousticBeamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint16_t getBeamDataLength() const; - void setBeamDataLength(uint16_t pX); + [[nodiscard]] uint16_t GetBeamDataLength() const; + void SetBeamDataLength(uint16_t pX); - uint8_t getBeamIDNumber() const; - void setBeamIDNumber(uint8_t pX); + [[nodiscard]] uint8_t GetBeamIdNumber() const; + void SetBeamIdNumber(uint8_t pX); - uint16_t getPad2() const; - void setPad2(uint16_t pX); + [[nodiscard]] uint16_t GetPad2() const; + void SetPad2(uint16_t pX); - AcousticBeamFundamentalParameter& getFundamentalDataParameters(); - const AcousticBeamFundamentalParameter& getFundamentalDataParameters() const; - void setFundamentalDataParameters(const AcousticBeamFundamentalParameter& pX); + AcousticBeamFundamentalParameter& GetFundamentalDataParameters(); + [[nodiscard]] const AcousticBeamFundamentalParameter& + GetFundamentalDataParameters() const; + void SetFundamentalDataParameters(const AcousticBeamFundamentalParameter& pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const AcousticBeamData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp index aefb2b1f..714266de 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp @@ -2,31 +2,32 @@ using namespace DIS; -AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter() - : _activeEmissionParameterIndex(0), - _scanPattern(0), - _beamCenterAzimuth(0.0), - _azimuthalBeamwidth(0.0), +dis::AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter() + : active_emission_parameter_index_(0), + scan_pattern_(0), + beam_center_azimuth_(0.0), + azimuthal_beamwidth_(0.0), _beamCenterDE(0.0), - _deBeamwidth(0.0) {} + de_beamwidth_(0.0) {} -AcousticBeamFundamentalParameter::~AcousticBeamFundamentalParameter() {} +dis::AcousticBeamFundamentalParameter::~AcousticBeamFundamentalParameter() = + default; -uint16_t AcousticBeamFundamentalParameter::getActiveEmissionParameterIndex() - const { +uint16_t +dis::AcousticBeamFundamentalParameter::GetActiveEmissionParameterIndex() { return _activeEmissionParameterIndex; } -void AcousticBeamFundamentalParameter::setActiveEmissionParameterIndex( +void dis::AcousticBeamFundamentalParameter::SetActiveEmissionParameterIndex( uint16_t pX) { - _activeEmissionParameterIndex = pX; + active_emission_parameter_index_ = pX; } -uint16_t AcousticBeamFundamentalParameter::getScanPattern() const { +uint16_t dis::AcousticBeamFundamentalParameter::GetScanPattern() { return _scanPattern; } -void AcousticBeamFundamentalParameter::setScanPattern(uint16_t pX) { +void dis::AcousticBeamFundamentalParameter::setScanPattern(uint16_t pX) { _scanPattern = pX; } diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h index 85b012e9..d74f9b3b 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h @@ -1,9 +1,10 @@ #pragma once -#include "dis6/distributed_emissions/opendis6_export.h" +#include + #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Used in UaPdu // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -14,53 +15,53 @@ namespace DIS { class AcousticBeamFundamentalParameter { protected: /** parameter index */ - uint16_t _activeEmissionParameterIndex; + uint16_t active_emission_parameter_index_; /** scan pattern */ - uint16_t _scanPattern; + uint16_t scan_pattern_; /** beam center azimuth */ - float _beamCenterAzimuth; + float beam_center_azimuth_; /** azimuthal beamwidth */ - float _azimuthalBeamwidth; + float azimuthal_beamwidth_; /** beam center */ - float _beamCenterDE; + float beam_center_de_; /** DE beamwidth (vertical beamwidth) */ - float _deBeamwidth; + float de_beamwidth_; public: AcousticBeamFundamentalParameter(); virtual ~AcousticBeamFundamentalParameter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint16_t getActiveEmissionParameterIndex() const; - void setActiveEmissionParameterIndex(uint16_t pX); + [[nodiscard]] static uint16_t GetActiveEmissionParameterIndex(); + void SetActiveEmissionParameterIndex(uint16_t pX); - uint16_t getScanPattern() const; - void setScanPattern(uint16_t pX); + [[nodiscard]] static uint16_t GetScanPattern(); + void SetScanPattern(uint16_t pX); - float getBeamCenterAzimuth() const; - void setBeamCenterAzimuth(float pX); + [[nodiscard]] float GetBeamCenterAzimuth() const; + void SetBeamCenterAzimuth(float pX); - float getAzimuthalBeamwidth() const; - void setAzimuthalBeamwidth(float pX); + [[nodiscard]] float GetAzimuthalBeamwidth() const; + void SetAzimuthalBeamwidth(float pX); - float getBeamCenterDE() const; - void setBeamCenterDE(float pX); + [[nodiscard]] float GetBeamCenterDe() const; + void SetBeamCenterDe(float pX); - float getDeBeamwidth() const; - void setDeBeamwidth(float pX); + [[nodiscard]] float GetDeBeamwidth() const; + void SetDeBeamwidth(float pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const AcousticBeamFundamentalParameter& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/AcousticEmitter.h b/src/dis6/distributed_emissions/AcousticEmitter.h index 0708e50d..1378a389 100644 --- a/src/dis6/distributed_emissions/AcousticEmitter.h +++ b/src/dis6/distributed_emissions/AcousticEmitter.h @@ -1,9 +1,10 @@ #pragma once +#include #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.35. information about a specific UA emmtter // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -14,35 +15,35 @@ namespace DIS { class AcousticEmitter { protected: /** the system for a particular UA emitter, and an enumeration */ - uint16_t _acousticName; + uint16_t acoustic_name_; /** The function of the acoustic system */ - uint8_t _function; + uint8_t function_; /** The UA emitter identification number relative to a specific system */ - uint8_t _acousticIdNumber; + uint8_t acoustic_id_number_; public: AcousticEmitter(); virtual ~AcousticEmitter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint16_t getAcousticName() const; - void setAcousticName(uint16_t pX); + [[nodiscard]] uint16_t GetAcousticName() const; + void SetAcousticName(uint16_t pX); - uint8_t getFunction() const; - void setFunction(uint8_t pX); + [[nodiscard]] uint8_t GetFunction() const; + void SetFunction(uint8_t pX); - uint8_t getAcousticIdNumber() const; - void setAcousticIdNumber(uint8_t pX); + [[nodiscard]] uint8_t GetAcousticIdNumber() const; + void SetAcousticIdNumber(uint8_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const AcousticEmitter& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/AcousticEmitterSystem.h b/src/dis6/distributed_emissions/AcousticEmitterSystem.h index 16ca5ffe..284fdcdf 100644 --- a/src/dis6/distributed_emissions/AcousticEmitterSystem.h +++ b/src/dis6/distributed_emissions/AcousticEmitterSystem.h @@ -1,9 +1,10 @@ #pragma once +#include #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // 5.3.35: Information about a particular UA emitter shall be represented using // an Acoustic Emitter System record. This record shall consist of three fields: // Acoustic Name, Function, and Acoustic ID Number @@ -16,10 +17,10 @@ namespace DIS { class AcousticEmitterSystem { protected: /** This field shall specify the system for a particular UA emitter. */ - uint16_t _acousticName; + uint16_t acoustic_name_; /** This field shall describe the function of the acoustic system. */ - uint8_t _acousticFunction; + uint8_t acoustic_function_; /** This field shall specify the UA emitter identification number relative to * a specific system. This field shall be represented by an 8-bit unsigned @@ -27,29 +28,29 @@ class AcousticEmitterSystem { * entity, even if in some instances two or more of the systems may be * identical UA emitter types. Numbering of systems shall begin with the * value 1. */ - uint8_t _acousticID; + uint8_t acoustic_id_; public: AcousticEmitterSystem(); virtual ~AcousticEmitterSystem(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint16_t getAcousticName() const; - void setAcousticName(uint16_t pX); + [[nodiscard]] uint16_t GetAcousticName() const; + void SetAcousticName(uint16_t pX); - uint8_t getAcousticFunction() const; - void setAcousticFunction(uint8_t pX); + [[nodiscard]] uint8_t GetAcousticFunction() const; + void SetAcousticFunction(uint8_t pX); - uint8_t getAcousticID() const; - void setAcousticID(uint8_t pX); + [[nodiscard]] uint8_t GetAcousticId() const; + void SetAcousticId(uint8_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const AcousticEmitterSystem& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/AcousticEmitterSystemData.h b/src/dis6/distributed_emissions/AcousticEmitterSystemData.h index bf9f1b33..8ae4956e 100644 --- a/src/dis6/distributed_emissions/AcousticEmitterSystemData.h +++ b/src/dis6/distributed_emissions/AcousticEmitterSystemData.h @@ -2,13 +2,12 @@ #include -#include "dis6/AcousticBeamData.h" -#include "dis6/AcousticEmitterSystem.h" -#include "dis6/Vector3Float.h" - +#include "dis6/common/Vector3Float.h" +#include "dis6/distributed_emissions/AcousticBeamData.h" +#include "dis6/distributed_emissions/AcousticEmitterSystem.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Used in the UA pdu; ties together an emmitter and a location. This requires // manual cleanup; the beam data should not be attached to each emitter system. @@ -70,7 +69,7 @@ class AcousticEmitterSystemData { bool operator==(const AcousticEmitterSystemData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/ApaData.h b/src/dis6/distributed_emissions/ApaData.h index fae3ff2c..2786bcd1 100644 --- a/src/dis6/distributed_emissions/ApaData.h +++ b/src/dis6/distributed_emissions/ApaData.h @@ -1,9 +1,10 @@ #pragma once +#include #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Used in UA PDU // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -14,29 +15,29 @@ namespace DIS { class ApaData { protected: /** Index of APA parameter */ - uint16_t _parameterIndex; + uint16_t parameter_index_; /** Index of APA parameter */ - int16_t _parameterValue; + int16_t parameter_value_; public: ApaData(); virtual ~ApaData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint16_t getParameterIndex() const; - void setParameterIndex(uint16_t pX); + [[nodiscard]] uint16_t GetParameterIndex() const; + void SetParameterIndex(uint16_t pX); - int16_t getParameterValue() const; - void setParameterValue(int16_t pX); + [[nodiscard]] int16_t GetParameterValue() const; + void SetParameterValue(int16_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const ApaData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/BeamData.h b/src/dis6/distributed_emissions/BeamData.h index 324abeb6..cf52c80f 100644 --- a/src/dis6/distributed_emissions/BeamData.h +++ b/src/dis6/distributed_emissions/BeamData.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.39. Specification of the data necessary to describe the scan // volume of an emitter. @@ -16,49 +15,49 @@ class BeamData { protected: /** Specifies the beam azimuth an elevation centers and corresponding * half-angles to describe the scan volume */ - float _beamAzimuthCenter; + float beam_azimuth_center_; /** Specifies the beam azimuth sweep to determine scan volume */ - float _beamAzimuthSweep; + float beam_azimuth_sweep_; /** Specifies the beam elevation center to determine scan volume */ - float _beamElevationCenter; + float beam_elevation_center_; /** Specifies the beam elevation sweep to determine scan volume */ - float _beamElevationSweep; + float beam_elevation_sweep_; /** allows receiver to synchronize its regenerated scan pattern to that of * the emmitter. Specifies the percentage of time a scan is through its * pattern from its origion. */ - float _beamSweepSync; + float beam_sweep_sync_; public: BeamData(); virtual ~BeamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - float getBeamAzimuthCenter() const; - void setBeamAzimuthCenter(float pX); + [[nodiscard]] float GetBeamAzimuthCenter() const; + void SetBeamAzimuthCenter(float pX); - float getBeamAzimuthSweep() const; - void setBeamAzimuthSweep(float pX); + [[nodiscard]] float GetBeamAzimuthSweep() const; + void SetBeamAzimuthSweep(float pX); - float getBeamElevationCenter() const; - void setBeamElevationCenter(float pX); + [[nodiscard]] float GetBeamElevationCenter() const; + void SetBeamElevationCenter(float pX); - float getBeamElevationSweep() const; - void setBeamElevationSweep(float pX); + [[nodiscard]] float GetBeamElevationSweep() const; + void SetBeamElevationSweep(float pX); - float getBeamSweepSync() const; - void setBeamSweepSync(float pX); + [[nodiscard]] float GetBeamSweepSync() const; + void SetBeamSweepSync(float pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const BeamData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/CMakeLists.txt b/src/dis6/distributed_emissions/CMakeLists.txt index 91371173..f5cd4e99 100644 --- a/src/dis6/distributed_emissions/CMakeLists.txt +++ b/src/dis6/distributed_emissions/CMakeLists.txt @@ -32,12 +32,6 @@ set(distributed_emissions_src UnderwaterAcousticsPdu.cpp ) -list(TRANSFORM distributed_emissions_src PREPEND "${CMAKE_CURRENT_LIST_DIR}/") - -include(GenerateExportHeader) -generate_export_header(OpenDIS6) -list(APPEND distributed_emissions_hdr "${CMAKE_CURRENT_BINARY_DIR}/opendis6_export.h") - target_sources(OpenDIS6 PRIVATE ${distributed_emissions_src}) install(FILES ${distributed_emissions_hdr} diff --git a/src/dis6/distributed_emissions/DesignatorPdu.cpp b/src/dis6/distributed_emissions/DesignatorPdu.cpp index 1f56570e..f5fb32e8 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.cpp +++ b/src/dis6/distributed_emissions/DesignatorPdu.cpp @@ -2,24 +2,20 @@ using namespace DIS; -DesignatorPdu::DesignatorPdu() - : DistributedEmissionsFamilyPdu(), - _designatingEntityID(), - _codeName(0), - _designatedEntityID(), +dis::DesignatorPdu::DesignatorPdu() + : _codeName(0), + _designatorCode(0), _designatorPower(0.0), _designatorWavelength(0.0), - _designatorSpotWrtDesignated(), - _designatorSpotLocation(), + _deadReckoningAlgorithm(0), _padding1(0), - _padding2(0), - _entityLinearAcceleration() { - setPduType(24); + _padding2(0) { + SetPduType(24); } -DesignatorPdu::~DesignatorPdu() {} +dis::DesignatorPdu::~DesignatorPdu() = default; EntityID& DesignatorPdu::getDesignatingEntityID() { return _designatingEntityID; diff --git a/src/dis6/distributed_emissions/DesignatorPdu.h b/src/dis6/distributed_emissions/DesignatorPdu.h index 588b0003..ab8b87c0 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.h +++ b/src/dis6/distributed_emissions/DesignatorPdu.h @@ -1,13 +1,14 @@ #pragma once -#include "dis6/EntityID.h" -#include "dis6/Vector3Double.h" -#include "dis6/Vector3Float.h" +#include + +#include "dis6/common/EntityID.h" +#include "dis6/common/Vector3Double.h" +#include "dis6/common/Vector3Float.h" #include "dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h" -#include "dis6/distributed_emissions/opendis6_export.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.7.2. Handles designating operations. COMPLETE // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -39,10 +40,10 @@ class DesignatorPdu : public DistributedEmissionsFamilyPdu { float _designatorWavelength; /** designtor spot wrt the designated entity */ - Vector3Float _designatorSpotWrtDesignated; + DIS::Vector3Float _designatorSpotWrtDesignated; /** designtor spot wrt the designated entity */ - Vector3Double _designatorSpotLocation; + DIS::Vector3Double _designatorSpotLocation; /** Dead reckoning algorithm */ char _deadReckoningAlgorithm; @@ -54,7 +55,7 @@ class DesignatorPdu : public DistributedEmissionsFamilyPdu { char _padding2; /** linear accelleration of entity */ - Vector3Float _entityLinearAcceleration; + DIS::Vector3Float _entityLinearAcceleration; public: DesignatorPdu(); @@ -83,13 +84,13 @@ class DesignatorPdu : public DistributedEmissionsFamilyPdu { float getDesignatorWavelength() const; void setDesignatorWavelength(float pX); - Vector3Float& getDesignatorSpotWrtDesignated(); - const Vector3Float& getDesignatorSpotWrtDesignated() const; - void setDesignatorSpotWrtDesignated(const Vector3Float& pX); + DIS::Vector3Float& getDesignatorSpotWrtDesignated(); + const DIS::Vector3Float& getDesignatorSpotWrtDesignated() const; + void setDesignatorSpotWrtDesignated(const DIS::Vector3Float& pX); - Vector3Double& getDesignatorSpotLocation(); - const Vector3Double& getDesignatorSpotLocation() const; - void setDesignatorSpotLocation(const Vector3Double& pX); + DIS::Vector3Double& getDesignatorSpotLocation(); + const DIS::Vector3Double& getDesignatorSpotLocation() const; + void setDesignatorSpotLocation(const DIS::Vector3Double& pX); char getDeadReckoningAlgorithm() const; void setDeadReckoningAlgorithm(char pX); @@ -100,15 +101,15 @@ class DesignatorPdu : public DistributedEmissionsFamilyPdu { char getPadding2() const; void setPadding2(char pX); - Vector3Float& getEntityLinearAcceleration(); - const Vector3Float& getEntityLinearAcceleration() const; - void setEntityLinearAcceleration(const Vector3Float& pX); + DIS::Vector3Float& getEntityLinearAcceleration(); + const DIS::Vector3Float& getEntityLinearAcceleration() const; + void setEntityLinearAcceleration(const DIS::Vector3Float& pX); virtual int getMarshalledSize() const; bool operator==(const DesignatorPdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h index ccda1981..de7b137c 100644 --- a/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h +++ b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h @@ -1,10 +1,9 @@ #pragma once -#include "dis6/Pdu.h" - +#include "dis6/common/Pdu.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.7. Electromagnetic Emissions. Abstract superclass for distirubted // emissions PDU @@ -19,14 +18,14 @@ class DistributedEmissionsFamilyPdu : public Pdu { DistributedEmissionsFamilyPdu(); virtual ~DistributedEmissionsFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const DistributedEmissionsFamilyPdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/EmitterSystem.h b/src/dis6/distributed_emissions/EmitterSystem.h index d014adba..86958269 100644 --- a/src/dis6/distributed_emissions/EmitterSystem.h +++ b/src/dis6/distributed_emissions/EmitterSystem.h @@ -1,9 +1,10 @@ #pragma once +#include #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.11. This field shall specify information about a particular // emitter system @@ -15,35 +16,35 @@ namespace DIS { class EmitterSystem { protected: /** Name of the emitter, 16 bit enumeration */ - uint16_t _emitterName; + uint16_t emitter_name_; /** function of the emitter, 8 bit enumeration */ - uint8_t _function; + uint8_t function_; /** emitter ID, 8 bit enumeration */ - uint8_t _emitterIdNumber; + uint8_t emitter_id_number_; public: EmitterSystem(); virtual ~EmitterSystem(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - uint16_t getEmitterName() const; - void setEmitterName(uint16_t pX); + [[nodiscard]] uint16_t GetEmitterName() const; + void SetEmitterName(uint16_t pX); - uint8_t getFunction() const; - void setFunction(uint8_t pX); + [[nodiscard]] uint8_t GetFunction() const; + void SetFunction(uint8_t pX); - uint8_t getEmitterIdNumber() const; - void setEmitterIdNumber(uint8_t pX); + [[nodiscard]] uint8_t GetEmitterIdNumber() const; + void SetEmitterIdNumber(uint8_t pX); - virtual int getMarshalledSize() const; + [[nodiscard]] virtual int GetMarshalledSize() const; bool operator==(const EmitterSystem& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp index e38f6a68..db83bb7d 100644 --- a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp +++ b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp @@ -22,23 +22,23 @@ UnderwaterAcousticsPdu::~UnderwaterAcousticsPdu() { _emitterSystems.clear(); } -EntityID& UnderwaterAcousticsPdu::getEmittingEntityID() { +EntityID& UnderwaterAcousticsPdu::GetEmittingEntityId() { return _emittingEntityID; } -const EntityID& UnderwaterAcousticsPdu::getEmittingEntityID() const { +const EntityID& UnderwaterAcousticsPdu::GetEmittingEntityId() const { return _emittingEntityID; } -void UnderwaterAcousticsPdu::setEmittingEntityID(const EntityID& pX) { +void UnderwaterAcousticsPdu::SetEmittingEntityId(const EntityID& pX) { _emittingEntityID = pX; } -EventID& UnderwaterAcousticsPdu::getEventID() { return _eventID; } +EventID& UnderwaterAcousticsPdu::GetEventId() { return _eventID; } -const EventID& UnderwaterAcousticsPdu::getEventID() const { return _eventID; } +const EventID& UnderwaterAcousticsPdu::GetEventId() const { return _eventID; } -void UnderwaterAcousticsPdu::setEventID(const EventID& pX) { _eventID = pX; } +void UnderwaterAcousticsPdu::SetEventId(const EventID& pX) { _eventID = pX; } char UnderwaterAcousticsPdu::getStateChangeIndicator() const { return _stateChangeIndicator; @@ -80,46 +80,46 @@ uint8_t UnderwaterAcousticsPdu::getNumberOfUAEmitterSystems() const { return _emitterSystems.size(); } -std::vector& UnderwaterAcousticsPdu::getShaftRPMs() { +std::vector& UnderwaterAcousticsPdu::GetShaftRpMs() { return _shaftRPMs; } -const std::vector& UnderwaterAcousticsPdu::getShaftRPMs() const { +const std::vector& UnderwaterAcousticsPdu::GetShaftRpMs() const { return _shaftRPMs; } -void UnderwaterAcousticsPdu::setShaftRPMs(const std::vector& pX) { +void UnderwaterAcousticsPdu::SetShaftRpMs(const std::vector& pX) { _shaftRPMs = pX; } -std::vector& UnderwaterAcousticsPdu::getApaData() { return _apaData; } +std::vector& UnderwaterAcousticsPdu::GetApaData() { return _apaData; } -const std::vector& UnderwaterAcousticsPdu::getApaData() const { +const std::vector& UnderwaterAcousticsPdu::GetApaData() const { return _apaData; } -void UnderwaterAcousticsPdu::setApaData(const std::vector& pX) { +void UnderwaterAcousticsPdu::SetApaData(const std::vector& pX) { _apaData = pX; } std::vector& -UnderwaterAcousticsPdu::getEmitterSystems() { +UnderwaterAcousticsPdu::GetEmitterSystems() { return _emitterSystems; } const std::vector& -UnderwaterAcousticsPdu::getEmitterSystems() const { +UnderwaterAcousticsPdu::GetEmitterSystems() const { return _emitterSystems; } -void UnderwaterAcousticsPdu::setEmitterSystems( +void UnderwaterAcousticsPdu::SetEmitterSystems( const std::vector& pX) { _emitterSystems = pX; } -void UnderwaterAcousticsPdu::marshal(DataStream& dataStream) const { +void UnderwaterAcousticsPdu::Marshal(DataStream& dataStream) const { DistributedEmissionsFamilyPdu::marshal( - dataStream); // Marshal information in superclass first + data_stream); // Marshal information in superclass first _emittingEntityID.marshal(dataStream); _eventID.marshal(dataStream); dataStream << _stateChangeIndicator; @@ -146,9 +146,9 @@ void UnderwaterAcousticsPdu::marshal(DataStream& dataStream) const { } } -void UnderwaterAcousticsPdu::unmarshal(DataStream& dataStream) { +void UnderwaterAcousticsPdu::Unmarshal(DataStream& dataStream) { DistributedEmissionsFamilyPdu::unmarshal( - dataStream); // unmarshal information in superclass first + data_stream); // unmarshal information in superclass first _emittingEntityID.unmarshal(dataStream); _eventID.unmarshal(dataStream); dataStream >> _stateChangeIndicator; @@ -183,18 +183,28 @@ void UnderwaterAcousticsPdu::unmarshal(DataStream& dataStream) { bool UnderwaterAcousticsPdu::operator==( const UnderwaterAcousticsPdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; ivarsEqual = DistributedEmissionsFamilyPdu::operator==(rhs); - if (!(_emittingEntityID == rhs._emittingEntityID)) ivarsEqual = false; - if (!(_eventID == rhs._eventID)) ivarsEqual = false; - if (!(_stateChangeIndicator == rhs._stateChangeIndicator)) ivarsEqual = false; - if (!(_pad == rhs._pad)) ivarsEqual = false; - if (!(_passiveParameterIndex == rhs._passiveParameterIndex)) - ivarsEqual = false; - if (!(_propulsionPlantConfiguration == rhs._propulsionPlantConfiguration)) - ivarsEqual = false; + if (!(_emittingEntityID == rhs._emittingEntityID)) { + ivars_equal = false; + } + if (!(_eventID == rhs._eventID)) { + ivars_equal = false; + } + if (!(_stateChangeIndicator == rhs._stateChangeIndicator)) { + ivars_equal = false; + } + if (!(_pad == rhs._pad)) { + ivars_equal = false; + } + if (!(_passiveParameterIndex == rhs._passiveParameterIndex)) { + ivars_equal = false; + } + if (!(_propulsionPlantConfiguration == rhs._propulsionPlantConfiguration)) { + ivars_equal = false; + } for (size_t idx = 0; idx < _shaftRPMs.size(); idx++) { if (!(_shaftRPMs[idx] == rhs._shaftRPMs[idx])) ivarsEqual = false; @@ -208,23 +218,23 @@ bool UnderwaterAcousticsPdu::operator==( if (!(_emitterSystems[idx] == rhs._emitterSystems[idx])) ivarsEqual = false; } - return ivarsEqual; + return ivars_equal; } int UnderwaterAcousticsPdu::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; marshalSize = DistributedEmissionsFamilyPdu::getMarshalledSize(); marshalSize = marshalSize + _emittingEntityID.getMarshalledSize(); // _emittingEntityID marshalSize = marshalSize + _eventID.getMarshalledSize(); // _eventID - marshalSize = marshalSize + 1; // _stateChangeIndicator - marshalSize = marshalSize + 1; // _pad - marshalSize = marshalSize + 2; // _passiveParameterIndex - marshalSize = marshalSize + 1; // _propulsionPlantConfiguration - marshalSize = marshalSize + 1; // _numberOfShafts - marshalSize = marshalSize + 1; // _numberOfAPAs - marshalSize = marshalSize + 1; // _numberOfUAEmitterSystems + marshal_size = marshal_size + 1; // _stateChangeIndicator + marshal_size = marshal_size + 1; // _pad + marshal_size = marshal_size + 2; // _passiveParameterIndex + marshal_size = marshal_size + 1; // _propulsionPlantConfiguration + marshal_size = marshal_size + 1; // _numberOfShafts + marshal_size = marshal_size + 1; // _numberOfAPAs + marshal_size = marshal_size + 1; // _numberOfUAEmitterSystems for (uint64_t idx = 0; idx < _shaftRPMs.size(); idx++) { ShaftRPMs listElement = _shaftRPMs[idx]; @@ -241,7 +251,7 @@ int UnderwaterAcousticsPdu::getMarshalledSize() const { marshalSize = marshalSize + listElement.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/utils/IncomingMessage.cpp b/src/dis6/utils/IncomingMessage.cpp index 6e5b5f9c..ea23a6bb 100644 --- a/src/dis6/utils/IncomingMessage.cpp +++ b/src/dis6/utils/IncomingMessage.cpp @@ -11,7 +11,7 @@ using namespace DIS; // the DIS specification says the type is known for all PDUs at the 3rd byte of // the PDU buffer. -const uint32_t PDU_TYPE_POSITION = 2; +const uint32_t kPduTypePosition = 2; IncomingMessage::IncomingMessage() : _processors(), _pduBanks() {} diff --git a/src/dis6/utils/PduFactory.cpp b/src/dis6/utils/PduFactory.cpp index d28e4d1d..e217595f 100644 --- a/src/dis6/utils/PduFactory.cpp +++ b/src/dis6/utils/PduFactory.cpp @@ -20,9 +20,7 @@ using namespace DIS; -PduFactory::PduFactory(void) {} - -PduFactory::~PduFactory(void) {} +PduFactory::PduFactory() = default; /** * Converts data read from the wire--a byte array--to a DIS PDU language @@ -34,17 +32,17 @@ PduFactory::~PduFactory(void) {} * returns NULL. The caller should check for this. */ -Pdu* PduFactory::createPdu(const char* data) { - int dataLength = 1500; // MTU, might fail for some very large PDUs - int pduType = data[2]; +Pdu* PduFactory::CreatePdu(const char* data) { + int const data_length = 1500; // MTU, might fail for some very large PDUs + int const pdu_type = data[2]; // std::cout << "Decoding PDU of type " << (int)pduType << std::endl; - DataStream dataStream(data, dataLength, DIS::BIG); + DataStream data_stream(data, dataLength, DIS::BIG); Pdu* pdu = NULL; - switch (pduType) { + switch (pdu_type) { case PDU_ENTITY_STATE: pdu = new EntityStatePdu(); pdu->unmarshal(dataStream); @@ -111,7 +109,7 @@ Pdu* PduFactory::createPdu(const char* data) { break; default: - std::cout << "Received Unrecognized PDU of type " << (int)pduType + std::cout << "Received Unrecognized PDU of type " << pdu_type << " change PduFactory.cpp to add new PDUs" << std::endl; break; } diff --git a/src/dis6/utils/PduFactory.h b/src/dis6/utils/PduFactory.h index 5aa947c5..d6ce6947 100644 --- a/src/dis6/utils/PduFactory.h +++ b/src/dis6/utils/PduFactory.h @@ -17,7 +17,7 @@ namespace DIS { class PduFactory { public: PduFactory(void); - ~PduFactory(void); + ~PduFactory(void) = default; /** Returns a PDU of the appropriate concrete subclass. Returns NULL * for failures or unrecognized PDU types. diff --git a/src/dis6/warfare/BurstDescriptor.cpp b/src/dis6/warfare/BurstDescriptor.cpp index bbd43328..09f9ee74 100644 --- a/src/dis6/warfare/BurstDescriptor.cpp +++ b/src/dis6/warfare/BurstDescriptor.cpp @@ -3,15 +3,17 @@ using namespace DIS; BurstDescriptor::BurstDescriptor() - : _munition(), _warhead(0), _fuse(0), _quantity(0), _rate(0) {} + : _warhead(0), _fuse(0), _quantity(0), _rate(0) {} -BurstDescriptor::~BurstDescriptor() {} +BurstDescriptor::~BurstDescriptor() = default; -EntityType& BurstDescriptor::getMunition() { return _munition; } +dis::EntityType& BurstDescriptor::getMunition() { return _munition; } -const EntityType& BurstDescriptor::getMunition() const { return _munition; } +const dis::EntityType& BurstDescriptor::getMunition() const { + return _munition; +} -void BurstDescriptor::setMunition(const EntityType& pX) { _munition = pX; } +void BurstDescriptor::setMunition(const dis::EntityType& pX) { _munition = pX; } uint16_t BurstDescriptor::getWarhead() const { return _warhead; } @@ -29,16 +31,16 @@ uint16_t BurstDescriptor::getRate() const { return _rate; } void BurstDescriptor::setRate(uint16_t pX) { _rate = pX; } -void BurstDescriptor::marshal(DataStream& dataStream) const { - _munition.marshal(dataStream); +void BurstDescriptor::Marshal(DataStream& dataStream) const { + _munition.Marshal(dataStream); dataStream << _warhead; dataStream << _fuse; dataStream << _quantity; dataStream << _rate; } -void BurstDescriptor::unmarshal(DataStream& dataStream) { - _munition.unmarshal(dataStream); +void BurstDescriptor::Unmarshal(DataStream& dataStream) { + _munition.Unmarshal(dataStream); dataStream >> _warhead; dataStream >> _fuse; dataStream >> _quantity; @@ -46,26 +48,36 @@ void BurstDescriptor::unmarshal(DataStream& dataStream) { } bool BurstDescriptor::operator==(const BurstDescriptor& rhs) const { - bool ivarsEqual = true; - - if (!(_munition == rhs._munition)) ivarsEqual = false; - if (!(_warhead == rhs._warhead)) ivarsEqual = false; - if (!(_fuse == rhs._fuse)) ivarsEqual = false; - if (!(_quantity == rhs._quantity)) ivarsEqual = false; - if (!(_rate == rhs._rate)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_munition == rhs._munition)) { + ivars_equal = false; + } + if (!(_warhead == rhs._warhead)) { + ivars_equal = false; + } + if (!(_fuse == rhs._fuse)) { + ivars_equal = false; + } + if (!(_quantity == rhs._quantity)) { + ivars_equal = false; + } + if (!(_rate == rhs._rate)) { + ivars_equal = false; + } + + return ivars_equal; } int BurstDescriptor::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + _munition.getMarshalledSize(); // _munition - marshalSize = marshalSize + 2; // _warhead - marshalSize = marshalSize + 2; // _fuse - marshalSize = marshalSize + 2; // _quantity - marshalSize = marshalSize + 2; // _rate - return marshalSize; + int marshal_size = 0; + + marshal_size = marshal_size + _munition.GetMarshalledSize(); // _munition + marshal_size = marshal_size + 2; // _warhead + marshal_size = marshal_size + 2; // _fuse + marshal_size = marshal_size + 2; // _quantity + marshal_size = marshal_size + 2; // _rate + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/warfare/BurstDescriptor.h b/src/dis6/warfare/BurstDescriptor.h index 1ea3e127..b48c4fac 100644 --- a/src/dis6/warfare/BurstDescriptor.h +++ b/src/dis6/warfare/BurstDescriptor.h @@ -1,7 +1,6 @@ #pragma once #include "dis6/common/EntityType.h" - #include "dis6/utils/DataStream.h" namespace DIS { @@ -17,7 +16,7 @@ namespace DIS { class BurstDescriptor { protected: /** What munition was used in the burst */ - EntityType _munition; + dis::EntityType _munition; /** type of warhead */ uint16_t _warhead; @@ -35,12 +34,12 @@ class BurstDescriptor { BurstDescriptor(); virtual ~BurstDescriptor(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); - EntityType& getMunition(); - const EntityType& getMunition() const; - void setMunition(const EntityType& pX); + dis::EntityType& getMunition(); + const dis::EntityType& getMunition() const; + void setMunition(const dis::EntityType& pX); uint16_t getWarhead() const; void setWarhead(uint16_t pX); diff --git a/src/dis6/warfare/DetonationPdu.cpp b/src/dis6/warfare/DetonationPdu.cpp index 1c8bb1e1..10675a01 100644 --- a/src/dis6/warfare/DetonationPdu.cpp +++ b/src/dis6/warfare/DetonationPdu.cpp @@ -18,57 +18,57 @@ DetonationPdu::DetonationPdu() DetonationPdu::~DetonationPdu() { _articulationParameters.clear(); } -EntityID& DetonationPdu::getMunitionID() { return _munitionID; } +EntityID& DetonationPdu::GetMunitionId() { return _munitionID; } -const EntityID& DetonationPdu::getMunitionID() const { return _munitionID; } +const EntityID& DetonationPdu::GetMunitionId() const { return _munitionID; } -void DetonationPdu::setMunitionID(const EntityID& pX) { _munitionID = pX; } +void DetonationPdu::SetMunitionId(const EntityID& pX) { _munitionID = pX; } -EventID& DetonationPdu::getEventID() { return _eventID; } +EventID& DetonationPdu::GetEventId() { return _eventID; } -const EventID& DetonationPdu::getEventID() const { return _eventID; } +const EventID& DetonationPdu::GetEventId() const { return _eventID; } -void DetonationPdu::setEventID(const EventID& pX) { _eventID = pX; } +void DetonationPdu::SetEventId(const EventID& pX) { _eventID = pX; } -Vector3Float& DetonationPdu::getVelocity() { return _velocity; } +Vector3Float& DetonationPdu::GetVelocity() { return _velocity; } -const Vector3Float& DetonationPdu::getVelocity() const { return _velocity; } +const Vector3Float& DetonationPdu::GetVelocity() const { return _velocity; } -void DetonationPdu::setVelocity(const Vector3Float& pX) { _velocity = pX; } +void DetonationPdu::SetVelocity(const Vector3Float& pX) { _velocity = pX; } -Vector3Double& DetonationPdu::getLocationInWorldCoordinates() { +Vector3Double& DetonationPdu::GetLocationInWorldCoordinates() { return _locationInWorldCoordinates; } -const Vector3Double& DetonationPdu::getLocationInWorldCoordinates() const { +const Vector3Double& DetonationPdu::GetLocationInWorldCoordinates() const { return _locationInWorldCoordinates; } -void DetonationPdu::setLocationInWorldCoordinates(const Vector3Double& pX) { +void DetonationPdu::SetLocationInWorldCoordinates(const Vector3Double& pX) { _locationInWorldCoordinates = pX; } -BurstDescriptor& DetonationPdu::getBurstDescriptor() { +BurstDescriptor& DetonationPdu::GetBurstDescriptor() { return _burstDescriptor; } -const BurstDescriptor& DetonationPdu::getBurstDescriptor() const { +const BurstDescriptor& DetonationPdu::GetBurstDescriptor() const { return _burstDescriptor; } -void DetonationPdu::setBurstDescriptor(const BurstDescriptor& pX) { +void DetonationPdu::SetBurstDescriptor(const BurstDescriptor& pX) { _burstDescriptor = pX; } -Vector3Float& DetonationPdu::getLocationInEntityCoordinates() { +Vector3Float& DetonationPdu::GetLocationInEntityCoordinates() { return _locationInEntityCoordinates; } -const Vector3Float& DetonationPdu::getLocationInEntityCoordinates() const { +const Vector3Float& DetonationPdu::GetLocationInEntityCoordinates() const { return _locationInEntityCoordinates; } -void DetonationPdu::setLocationInEntityCoordinates(const Vector3Float& pX) { +void DetonationPdu::SetLocationInEntityCoordinates(const Vector3Float& pX) { _locationInEntityCoordinates = pX; } @@ -84,23 +84,23 @@ int16_t DetonationPdu::getPad() const { return _pad; } void DetonationPdu::setPad(int16_t pX) { _pad = pX; } -std::vector& DetonationPdu::getArticulationParameters() { +std::vector& DetonationPdu::GetArticulationParameters() { return _articulationParameters; } const std::vector& -DetonationPdu::getArticulationParameters() const { +DetonationPdu::GetArticulationParameters() const { return _articulationParameters; } -void DetonationPdu::setArticulationParameters( +void DetonationPdu::SetArticulationParameters( const std::vector& pX) { _articulationParameters = pX; } -void DetonationPdu::marshal(DataStream& dataStream) const { +void DetonationPdu::Marshal(DataStream& dataStream) const { WarfareFamilyPdu::marshal( - dataStream); // Marshal information in superclass first + data_stream); // Marshal information in superclass first _munitionID.marshal(dataStream); _eventID.marshal(dataStream); _velocity.marshal(dataStream); @@ -117,9 +117,9 @@ void DetonationPdu::marshal(DataStream& dataStream) const { } } -void DetonationPdu::unmarshal(DataStream& dataStream) { +void DetonationPdu::Unmarshal(DataStream& dataStream) { WarfareFamilyPdu::unmarshal( - dataStream); // unmarshal information in superclass first + data_stream); // unmarshal information in superclass first _munitionID.unmarshal(dataStream); _eventID.unmarshal(dataStream); _velocity.unmarshal(dataStream); @@ -139,31 +139,45 @@ void DetonationPdu::unmarshal(DataStream& dataStream) { } bool DetonationPdu::operator==(const DetonationPdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; ivarsEqual = WarfareFamilyPdu::operator==(rhs); - if (!(_munitionID == rhs._munitionID)) ivarsEqual = false; - if (!(_eventID == rhs._eventID)) ivarsEqual = false; - if (!(_velocity == rhs._velocity)) ivarsEqual = false; - if (!(_locationInWorldCoordinates == rhs._locationInWorldCoordinates)) - ivarsEqual = false; - if (!(_burstDescriptor == rhs._burstDescriptor)) ivarsEqual = false; - if (!(_locationInEntityCoordinates == rhs._locationInEntityCoordinates)) - ivarsEqual = false; - if (!(_detonationResult == rhs._detonationResult)) ivarsEqual = false; - if (!(_pad == rhs._pad)) ivarsEqual = false; + if (!(_munitionID == rhs._munitionID)) { + ivars_equal = false; + } + if (!(_eventID == rhs._eventID)) { + ivars_equal = false; + } + if (!(_velocity == rhs._velocity)) { + ivars_equal = false; + } + if (!(_locationInWorldCoordinates == rhs._locationInWorldCoordinates)) { + ivars_equal = false; + } + if (!(_burstDescriptor == rhs._burstDescriptor)) { + ivars_equal = false; + } + if (!(_locationInEntityCoordinates == rhs._locationInEntityCoordinates)) { + ivars_equal = false; + } + if (!(_detonationResult == rhs._detonationResult)) { + ivars_equal = false; + } + if (!(_pad == rhs._pad)) { + ivars_equal = false; + } for (size_t idx = 0; idx < _articulationParameters.size(); idx++) { if (!(_articulationParameters[idx] == rhs._articulationParameters[idx])) ivarsEqual = false; } - return ivarsEqual; + return ivars_equal; } int DetonationPdu::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; marshalSize = WarfareFamilyPdu::getMarshalledSize(); marshalSize = marshalSize + _munitionID.getMarshalledSize(); // _munitionID @@ -177,16 +191,16 @@ int DetonationPdu::getMarshalledSize() const { marshalSize = marshalSize + _locationInEntityCoordinates .getMarshalledSize(); // _locationInEntityCoordinates - marshalSize = marshalSize + 1; // _detonationResult - marshalSize = marshalSize + 1; // _numberOfArticulationParameters - marshalSize = marshalSize + 2; // _pad + marshal_size = marshal_size + 1; // _detonationResult + marshal_size = marshal_size + 1; // _numberOfArticulationParameters + marshal_size = marshal_size + 2; // _pad for (uint64_t idx = 0; idx < _articulationParameters.size(); idx++) { ArticulationParameter listElement = _articulationParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/warfare/WarfareFamilyPdu.cpp b/src/dis6/warfare/WarfareFamilyPdu.cpp index c9226a08..26e228d1 100644 --- a/src/dis6/warfare/WarfareFamilyPdu.cpp +++ b/src/dis6/warfare/WarfareFamilyPdu.cpp @@ -1,13 +1,9 @@ -#include "dis6/WarfareFamilyPdu.h" +#include "dis6/warfare/WarfareFamilyPdu.h" -using namespace DIS; +namespace dis { +WarfareFamilyPdu::WarfareFamilyPdu() { SetProtocolFamily(2); } -WarfareFamilyPdu::WarfareFamilyPdu() - : Pdu(), _firingEntityID(), _targetEntityID() { - setProtocolFamily(2); -} - -WarfareFamilyPdu::~WarfareFamilyPdu() {} +WarfareFamilyPdu::~WarfareFamilyPdu() = default; EntityID& WarfareFamilyPdu::getFiringEntityID() { return _firingEntityID; } @@ -29,40 +25,45 @@ void WarfareFamilyPdu::setTargetEntityID(const EntityID& pX) { _targetEntityID = pX; } -void WarfareFamilyPdu::marshal(DataStream& dataStream) const { - Pdu::marshal(dataStream); // Marshal information in superclass first - _firingEntityID.marshal(dataStream); - _targetEntityID.marshal(dataStream); +void WarfareFamilyPdu::Marshal(DataStream& dataStream) const { + Pdu::marshal(data_stream); // Marshal information in superclass first + _firingEntityID.Marshal(dataStream); + _targetEntityID.Marshal(dataStream); } -void WarfareFamilyPdu::unmarshal(DataStream& dataStream) { - Pdu::unmarshal(dataStream); // unmarshal information in superclass first - _firingEntityID.unmarshal(dataStream); - _targetEntityID.unmarshal(dataStream); +void WarfareFamilyPdu::Unmarshal(DataStream& dataStream) { + Pdu::unmarshal(data_stream); // unmarshal information in superclass first + _firingEntityID.Unmarshal(dataStream); + _targetEntityID.Unmarshal(dataStream); } bool WarfareFamilyPdu::operator==(const WarfareFamilyPdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = Pdu::operator==(rhs); + ivars_equal = Pdu::operator==(rhs); - if (!(_firingEntityID == rhs._firingEntityID)) ivarsEqual = false; - if (!(_targetEntityID == rhs._targetEntityID)) ivarsEqual = false; + if (!(_firingEntityID == rhs._firingEntityID)) { + ivars_equal = false; + } + if (!(_targetEntityID == rhs._targetEntityID)) { + ivars_equal = false; + } - return ivarsEqual; + return ivars_equal; } -int WarfareFamilyPdu::getMarshalledSize() const { - int marshalSize = 0; +int WarfareFamilyPdu::GetMarshalledSize() const { + int marshal_size = 0; - marshalSize = Pdu::getMarshalledSize(); - marshalSize = - marshalSize + _firingEntityID.getMarshalledSize(); // _firingEntityID - marshalSize = - marshalSize + _targetEntityID.getMarshalledSize(); // _targetEntityID - return marshalSize; + marshal_size = getMarshalledSize(); + marshal_size = + marshal_size + _firingEntityID.GetMarshalledSize(); // _firingEntityID + marshal_size = + marshal_size + _targetEntityID.GetMarshalledSize(); // _targetEntityID + return marshal_size; } +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/warfare/WarfareFamilyPdu.h b/src/dis6/warfare/WarfareFamilyPdu.h index 5769759b..2ceef55e 100644 --- a/src/dis6/warfare/WarfareFamilyPdu.h +++ b/src/dis6/warfare/WarfareFamilyPdu.h @@ -1,11 +1,10 @@ #pragma once -#include "dis6/EntityID.h" -#include "dis6/Pdu.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/Pdu.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.4. abstract superclass for fire and detonation pdus that have // shared information. COMPLETE @@ -41,7 +40,7 @@ class WarfareFamilyPdu : public Pdu { bool operator==(const WarfareFamilyPdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without From 9696d47dd344ce5cd8648d480c407148b8d13f39 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Sun, 21 Jan 2024 00:36:44 -0600 Subject: [PATCH 19/22] More clang cleanup --- src/dis6/common/EntityType.cpp | 4 +- src/dis6/common/FourByteChunk.cpp | 12 +- src/dis6/common/Pdu.cpp | 28 ++-- src/dis6/common/Pdu.h | 2 +- src/dis6/common/SixByteChunk.cpp | 12 +- src/dis6/common/TwoByteChunk.cpp | 12 +- .../AcousticBeamFundamentalParameter.cpp | 31 ++-- .../AcousticBeamFundamentalParameter.h | 8 +- .../distributed_emissions/DesignatorPdu.cpp | 79 +++++---- .../ArealObjectStatePdu.cpp | 147 +++++++++-------- .../ArealObjectStatePdu.h | 44 +++-- .../synthetic_environment/Environment.cpp | 62 ++++--- src/dis6/synthetic_environment/Environment.h | 5 +- .../EnvironmentalProcessPdu.cpp | 109 +++++++------ .../EnvironmentalProcessPdu.h | 32 ++-- .../synthetic_environment/GridAxisRecord.cpp | 28 ++-- .../synthetic_environment/GridAxisRecord.h | 5 +- .../GridAxisRecordRepresentation0.cpp | 24 +-- .../GridAxisRecordRepresentation0.h | 7 +- .../GridAxisRecordRepresentation1.cpp | 47 +++--- .../GridAxisRecordRepresentation1.h | 9 +- .../GridAxisRecordRepresentation2.cpp | 32 ++-- .../GridAxisRecordRepresentation2.h | 9 +- .../synthetic_environment/GriddedDataPdu.cpp | 151 +++++++++-------- .../synthetic_environment/GriddedDataPdu.h | 31 ++-- .../LinearObjectStatePdu.cpp | 123 +++++++------- .../LinearObjectStatePdu.h | 34 ++-- .../LinearSegmentParameter.cpp | 83 ++++++---- .../LinearSegmentParameter.h | 11 +- src/dis6/synthetic_environment/ObjectType.cpp | 52 +++--- src/dis6/synthetic_environment/ObjectType.h | 9 +- .../PointObjectStatePdu.cpp | 153 ++++++++++-------- .../PointObjectStatePdu.h | 36 ++--- .../SyntheticEnvironmentFamilyPdu.cpp | 29 ++-- .../SyntheticEnvironmentFamilyPdu.h | 9 +- src/dis6/utils/Conversion.cpp | 3 - 36 files changed, 781 insertions(+), 691 deletions(-) diff --git a/src/dis6/common/EntityType.cpp b/src/dis6/common/EntityType.cpp index ebb4d425..d9a4874c 100644 --- a/src/dis6/common/EntityType.cpp +++ b/src/dis6/common/EntityType.cpp @@ -12,7 +12,7 @@ EntityType::EntityType() EntityType::~EntityType() = default; -uint8_t EntityType::GetEntityKind() { return _entityKind; } +uint8_t EntityType::GetEntityKind() { return GetEntityKind; } void EntityType::SetEntityKind(uint8_t pX) { _entityKind = pX; } @@ -63,7 +63,7 @@ void EntityType::Unmarshal(DataStream& dataStream) { bool EntityType::operator==(const EntityType& rhs) const { bool ivars_equal = true; - if (!(_entityKind == rhs.entity_kind_)) { + if (!(GetEntityKind == rhs.entity_kind_)) { ivars_equal = false; } if (!(_domain == rhs.domain_)) { diff --git a/src/dis6/common/FourByteChunk.cpp b/src/dis6/common/FourByteChunk.cpp index 2ae30654..c35d33b5 100644 --- a/src/dis6/common/FourByteChunk.cpp +++ b/src/dis6/common/FourByteChunk.cpp @@ -4,8 +4,8 @@ using namespace DIS; FourByteChunk::FourByteChunk() { // Initialize fixed length array - for (char& _otherParameter : _otherParameters) { - _otherParameter = 0; + for (char& other_parameter : _otherParameters) { + other_parameter = 0; } } @@ -24,14 +24,14 @@ void FourByteChunk::setOtherParameters(const char* x) { } void FourByteChunk::Marshal(DataStream& dataStream) const { - for (char _otherParameter : _otherParameters) { - dataStream << _otherParameter; + for (char const other_parameter : _otherParameters) { + dataStream << other_parameter; } } void FourByteChunk::Unmarshal(DataStream& dataStream) { - for (char& _otherParameter : _otherParameters) { - dataStream >> _otherParameter; + for (char const& other_parameter : _otherParameters) { + dataStream >> other_parameter; } } diff --git a/src/dis6/common/Pdu.cpp b/src/dis6/common/Pdu.cpp index 53131254..210d8a17 100644 --- a/src/dis6/common/Pdu.cpp +++ b/src/dis6/common/Pdu.cpp @@ -24,38 +24,38 @@ uint8_t Pdu::GetPduType() { return _pduType; } void Pdu::SetPduType(uint8_t pX) { _pduType = pX; } -uint8_t Pdu::getProtocolFamily() const { return _protocolFamily; } +uint8_t Pdu::GetProtocolFamily() { return _protocolFamily; } -void Pdu::SetProtocolFamily(uint8_t pX) { _protocolFamily = pX; } +void Pdu::SetProtocolFamily(uint8_t pX) { protocol_family_ = pX; } -uint32_t Pdu::GetTimestamp() const { return _timestamp; } +uint32_t Pdu::GetTimestamp() const { return timestamp_; } -void Pdu::SetTimestamp(uint32_t pX) { _timestamp = pX; } +void Pdu::SetTimestamp(uint32_t pX) { timestamp_ = pX; } -uint16_t Pdu::GetLength() const { return this->getMarshalledSize(); } +uint16_t Pdu::GetLength() const { return this->GetMarshalledSize(); } -void Pdu::SetLength(uint16_t pX) { _length = pX; } +void Pdu::SetLength(uint16_t pX) { length_ = pX; } -int16_t Pdu::GetPadding() const { return _padding; } +int16_t Pdu::GetPadding() const { return padding_; } -void Pdu::SetPadding(int16_t pX) { _padding = pX; } +void Pdu::SetPadding(int16_t pX) { padding_ = pX; } void Pdu::Marshal(DataStream& dataStream) const { dataStream << _protocolVersion; - dataStream << _exerciseID; + dataStream << (GetExerciseId != nullptr); dataStream << _pduType; dataStream << _protocolFamily; - dataStream << _timestamp; + dataStream << timestamp_; dataStream << this->getLength(); - dataStream << _padding; + dataStream << padding_; } void Pdu::Unmarshal(DataStream& dataStream) { - dataStream >> _protocolVersion; + dataStream >> protocol_version_; dataStream >> _exerciseID; dataStream >> _pduType; - dataStream >> _protocolFamily; - dataStream >> _timestamp; + dataStream >> protocol_family_; + dataStream >> timestamp_; dataStream >> _length; dataStream >> _padding; } diff --git a/src/dis6/common/Pdu.h b/src/dis6/common/Pdu.h index b2057841..e8603299 100644 --- a/src/dis6/common/Pdu.h +++ b/src/dis6/common/Pdu.h @@ -52,7 +52,7 @@ class Pdu { [[nodiscard]] static uint8_t GetPduType(); void SetPduType(uint8_t pX); - [[nodiscard]] uint8_t GetProtocolFamily() const; + [[nodiscard]] static uint8_t GetProtocolFamily(); void SetProtocolFamily(uint8_t pX); [[nodiscard]] uint32_t GetTimestamp() const; diff --git a/src/dis6/common/SixByteChunk.cpp b/src/dis6/common/SixByteChunk.cpp index eba727bf..fc793acc 100644 --- a/src/dis6/common/SixByteChunk.cpp +++ b/src/dis6/common/SixByteChunk.cpp @@ -4,8 +4,8 @@ using namespace DIS; SixByteChunk::SixByteChunk() { // Initialize fixed length array - for (char& _otherParameter : _otherParameters) { - _otherParameter = 0; + for (char& other_parameter : _otherParameters) { + other_parameter = 0; } } @@ -24,14 +24,14 @@ void SixByteChunk::setOtherParameters(const char* x) { } void SixByteChunk::Marshal(DataStream& dataStream) const { - for (char _otherParameter : _otherParameters) { - dataStream << _otherParameter; + for (char const other_parameter : _otherParameters) { + dataStream << other_parameter; } } void SixByteChunk::Unmarshal(DataStream& dataStream) { - for (char& _otherParameter : _otherParameters) { - dataStream >> _otherParameter; + for (char const& other_parameter : _otherParameters) { + dataStream >> other_parameter; } } diff --git a/src/dis6/common/TwoByteChunk.cpp b/src/dis6/common/TwoByteChunk.cpp index 3e056759..9dca460f 100644 --- a/src/dis6/common/TwoByteChunk.cpp +++ b/src/dis6/common/TwoByteChunk.cpp @@ -4,8 +4,8 @@ using namespace DIS; TwoByteChunk::TwoByteChunk() { // Initialize fixed length array - for (char& _otherParameter : _otherParameters) { - _otherParameter = 0; + for (char& other_parameter : _otherParameters) { + other_parameter = 0; } } @@ -24,14 +24,14 @@ void TwoByteChunk::setOtherParameters(const char* x) { } void TwoByteChunk::Marshal(DataStream& dataStream) const { - for (char _otherParameter : _otherParameters) { - dataStream << _otherParameter; + for (char const other_parameter : _otherParameters) { + dataStream << other_parameter; } } void TwoByteChunk::Unmarshal(DataStream& dataStream) { - for (char& _otherParameter : _otherParameters) { - dataStream >> _otherParameter; + for (char const& other_parameter : _otherParameters) { + dataStream >> other_parameter; } } diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp index 714266de..b2ba5b0b 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp @@ -27,44 +27,45 @@ uint16_t dis::AcousticBeamFundamentalParameter::GetScanPattern() { return _scanPattern; } -void dis::AcousticBeamFundamentalParameter::setScanPattern(uint16_t pX) { - _scanPattern = pX; +void dis::AcousticBeamFundamentalParameter::SetScanPattern(uint16_t pX) { + scan_pattern_ = pX; } -float AcousticBeamFundamentalParameter::getBeamCenterAzimuth() const { +float dis::AcousticBeamFundamentalParameter::GetBeamCenterAzimuth() { return _beamCenterAzimuth; } -void AcousticBeamFundamentalParameter::setBeamCenterAzimuth(float pX) { - _beamCenterAzimuth = pX; +void dis::AcousticBeamFundamentalParameter::SetBeamCenterAzimuth(float pX) { + beam_center_azimuth_ = pX; } -float AcousticBeamFundamentalParameter::getAzimuthalBeamwidth() const { +float dis::AcousticBeamFundamentalParameter::GetAzimuthalBeamwidth() { return _azimuthalBeamwidth; } -void AcousticBeamFundamentalParameter::setAzimuthalBeamwidth(float pX) { - _azimuthalBeamwidth = pX; +void dis::AcousticBeamFundamentalParameter::SetAzimuthalBeamwidth(float pX) { + azimuthal_beamwidth_ = pX; } -float AcousticBeamFundamentalParameter::getBeamCenterDE() const { +float dis::AcousticBeamFundamentalParameter::GetBeamCenterDe() { return _beamCenterDE; } -void AcousticBeamFundamentalParameter::setBeamCenterDE(float pX) { +void dis::AcousticBeamFundamentalParameter::SetBeamCenterDe(float pX) { _beamCenterDE = pX; } -float AcousticBeamFundamentalParameter::getDeBeamwidth() const { +float dis::AcousticBeamFundamentalParameter::GetDeBeamwidth() { return _deBeamwidth; } -void AcousticBeamFundamentalParameter::setDeBeamwidth(float pX) { - _deBeamwidth = pX; +void dis::AcousticBeamFundamentalParameter::SetDeBeamwidth(float pX) { + de_beamwidth_ = pX; } -void AcousticBeamFundamentalParameter::marshal(DataStream& dataStream) const { - dataStream << _activeEmissionParameterIndex; +void dis::AcousticBeamFundamentalParameter::Marshal( + DataStream& dataStream) const { + dataStream << (_activeEmissionParameterIndex != nullptr); dataStream << _scanPattern; dataStream << _beamCenterAzimuth; dataStream << _azimuthalBeamwidth; diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h index d74f9b3b..0a60bcb0 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h @@ -45,16 +45,16 @@ class AcousticBeamFundamentalParameter { [[nodiscard]] static uint16_t GetScanPattern(); void SetScanPattern(uint16_t pX); - [[nodiscard]] float GetBeamCenterAzimuth() const; + [[nodiscard]] static float GetBeamCenterAzimuth(); void SetBeamCenterAzimuth(float pX); - [[nodiscard]] float GetAzimuthalBeamwidth() const; + [[nodiscard]] static float GetAzimuthalBeamwidth(); void SetAzimuthalBeamwidth(float pX); - [[nodiscard]] float GetBeamCenterDe() const; + [[nodiscard]] static float GetBeamCenterDe(); void SetBeamCenterDe(float pX); - [[nodiscard]] float GetDeBeamwidth() const; + [[nodiscard]] static float GetDeBeamwidth(); void SetDeBeamwidth(float pX); [[nodiscard]] virtual int GetMarshalledSize() const; diff --git a/src/dis6/distributed_emissions/DesignatorPdu.cpp b/src/dis6/distributed_emissions/DesignatorPdu.cpp index f5fb32e8..8a410cd1 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.cpp +++ b/src/dis6/distributed_emissions/DesignatorPdu.cpp @@ -17,106 +17,115 @@ dis::DesignatorPdu::DesignatorPdu() dis::DesignatorPdu::~DesignatorPdu() = default; -EntityID& DesignatorPdu::getDesignatingEntityID() { +dis::EntityID& dis::DesignatorPdu::getDesignatingEntityID() { return _designatingEntityID; } -const EntityID& DesignatorPdu::getDesignatingEntityID() const { +const dis::EntityID& dis::DesignatorPdu::getDesignatingEntityID() const { return _designatingEntityID; } -void DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { +void dis::DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { _designatingEntityID = pX; } -uint16_t DesignatorPdu::getCodeName() const { return _codeName; } +uint16_t dis::DesignatorPdu::getCodeName() const { return _codeName; } -void DesignatorPdu::setCodeName(uint16_t pX) { _codeName = pX; } +void dis::DesignatorPdu::setCodeName(uint16_t pX) { _codeName = pX; } -EntityID& DesignatorPdu::getDesignatedEntityID() { return _designatedEntityID; } +dis::EntityID& dis::DesignatorPdu::getDesignatedEntityID() { + return _designatedEntityID; +} -const EntityID& DesignatorPdu::getDesignatedEntityID() const { +const dis::EntityID& dis::DesignatorPdu::getDesignatedEntityID() const { return _designatedEntityID; } -void DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { +void dis::DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { _designatedEntityID = pX; } -uint16_t DesignatorPdu::getDesignatorCode() const { return _designatorCode; } +uint16_t dis::DesignatorPdu::getDesignatorCode() const { + return _designatorCode; +} -void DesignatorPdu::setDesignatorCode(uint16_t pX) { _designatorCode = pX; } +void dis::DesignatorPdu::setDesignatorCode(uint16_t pX) { + _designatorCode = pX; +} -float DesignatorPdu::getDesignatorPower() const { return _designatorPower; } +float dis::DesignatorPdu::getDesignatorPower() const { + return _designatorPower; +} -void DesignatorPdu::setDesignatorPower(float pX) { _designatorPower = pX; } +void dis::DesignatorPdu::setDesignatorPower(float pX) { _designatorPower = pX; } -float DesignatorPdu::getDesignatorWavelength() const { +float dis::DesignatorPdu::getDesignatorWavelength() const { return _designatorWavelength; } -void DesignatorPdu::setDesignatorWavelength(float pX) { +void dis::DesignatorPdu::setDesignatorWavelength(float pX) { _designatorWavelength = pX; } -Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() { +Vector3Float& dis::DesignatorPdu::getDesignatorSpotWrtDesignated() { return _designatorSpotWrtDesignated; } -const Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() const { +const Vector3Float& dis::DesignatorPdu::getDesignatorSpotWrtDesignated() const { return _designatorSpotWrtDesignated; } -void DesignatorPdu::setDesignatorSpotWrtDesignated(const Vector3Float& pX) { +void dis::DesignatorPdu::setDesignatorSpotWrtDesignated( + const Vector3Float& pX) { _designatorSpotWrtDesignated = pX; } -Vector3Double& DesignatorPdu::getDesignatorSpotLocation() { +Vector3Double& dis::DesignatorPdu::getDesignatorSpotLocation() { return _designatorSpotLocation; } -const Vector3Double& DesignatorPdu::getDesignatorSpotLocation() const { +const Vector3Double& dis::DesignatorPdu::getDesignatorSpotLocation() const { return _designatorSpotLocation; } -void DesignatorPdu::setDesignatorSpotLocation(const Vector3Double& pX) { +void dis::DesignatorPdu::setDesignatorSpotLocation(const Vector3Double& pX) { _designatorSpotLocation = pX; } -char DesignatorPdu::getDeadReckoningAlgorithm() const { +char dis::DesignatorPdu::getDeadReckoningAlgorithm() const { return _deadReckoningAlgorithm; } -void DesignatorPdu::setDeadReckoningAlgorithm(char pX) { +void dis::DesignatorPdu::setDeadReckoningAlgorithm(char pX) { _deadReckoningAlgorithm = pX; } -uint16_t DesignatorPdu::getPadding1() const { return _padding1; } +uint16_t dis::DesignatorPdu::getPadding1() const { return _padding1; } -void DesignatorPdu::setPadding1(uint16_t pX) { _padding1 = pX; } +void dis::DesignatorPdu::setPadding1(uint16_t pX) { _padding1 = pX; } -char DesignatorPdu::getPadding2() const { return _padding2; } +char dis::DesignatorPdu::getPadding2() const { return _padding2; } -void DesignatorPdu::setPadding2(char pX) { _padding2 = pX; } +void dis::DesignatorPdu::setPadding2(char pX) { _padding2 = pX; } -Vector3Float& DesignatorPdu::getEntityLinearAcceleration() { +Vector3Float& dis::DesignatorPdu::getEntityLinearAcceleration() { return _entityLinearAcceleration; } -const Vector3Float& DesignatorPdu::getEntityLinearAcceleration() const { +const Vector3Float& dis::DesignatorPdu::getEntityLinearAcceleration() const { return _entityLinearAcceleration; } -void DesignatorPdu::setEntityLinearAcceleration(const Vector3Float& pX) { +void dis::DesignatorPdu::setEntityLinearAcceleration(const Vector3Float& pX) { _entityLinearAcceleration = pX; } -void DesignatorPdu::marshal(DataStream& dataStream) const { +void dis::DesignatorPdu::Marshal(DataStream& dataStream) const { DistributedEmissionsFamilyPdu::marshal( - dataStream); // Marshal information in superclass first - _designatingEntityID.marshal(dataStream); + data_stream); // Marshal information in superclass first + _designatingEntityID.Marshal(dataStream); dataStream << _codeName; - _designatedEntityID.marshal(dataStream); + _designatedEntityID.Marshal(dataStream); dataStream << _designatorCode; dataStream << _designatorPower; dataStream << _designatorWavelength; @@ -128,9 +137,9 @@ void DesignatorPdu::marshal(DataStream& dataStream) const { _entityLinearAcceleration.marshal(dataStream); } -void DesignatorPdu::unmarshal(DataStream& dataStream) { +void dis::DesignatorPdu::Unmarshal(DataStream& dataStream) { DistributedEmissionsFamilyPdu::unmarshal( - dataStream); // unmarshal information in superclass first + data_stream); // unmarshal information in superclass first _designatingEntityID.unmarshal(dataStream); dataStream >> _codeName; _designatedEntityID.unmarshal(dataStream); diff --git a/src/dis6/synthetic_environment/ArealObjectStatePdu.cpp b/src/dis6/synthetic_environment/ArealObjectStatePdu.cpp index 43bf0242..1c8befde 100644 --- a/src/dis6/synthetic_environment/ArealObjectStatePdu.cpp +++ b/src/dis6/synthetic_environment/ArealObjectStatePdu.cpp @@ -1,69 +1,59 @@ -#include "dis6/ArealObjectStatePdu.h" +#include "dis6/synthetic_environment/ArealObjectStatePdu.h" using namespace DIS; ArealObjectStatePdu::ArealObjectStatePdu() - : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), + : _updateNumber(0), _forceID(0), _modifications(0), - _objectType(), - _objectAppearance(), - _numberOfPoints(0), - _requesterID(), - _receivingID() { - setPduType(45); + + _numberOfPoints(0) { + SetPduType(45); } ArealObjectStatePdu::~ArealObjectStatePdu() { _objectLocation.clear(); } -EntityID& ArealObjectStatePdu::getObjectID() { return _objectID; } +dis::EntityID& ArealObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& ArealObjectStatePdu::getObjectID() const { return _objectID; } +const dis::EntityID& ArealObjectStatePdu::getObjectID() const { + return _objectID; +} -void ArealObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } +void ArealObjectStatePdu::setObjectID(const dis::EntityID& pX) { + _objectID = pX; +} -EntityID& ArealObjectStatePdu::getReferencedObjectID() { +dis::EntityID& ArealObjectStatePdu::getReferencedObjectID() { return _referencedObjectID; } -const EntityID& ArealObjectStatePdu::getReferencedObjectID() const { +const dis::EntityID& ArealObjectStatePdu::getReferencedObjectID() const { return _referencedObjectID; } -void ArealObjectStatePdu::setReferencedObjectID(const EntityID& pX) { +void ArealObjectStatePdu::setReferencedObjectID(const dis::EntityID& pX) { _referencedObjectID = pX; } -uint16_t ArealObjectStatePdu::getUpdateNumber() const { - return _updateNumber; -} +uint16_t ArealObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void ArealObjectStatePdu::setUpdateNumber(uint16_t pX) { - _updateNumber = pX; -} +void ArealObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } uint8_t ArealObjectStatePdu::getForceID() const { return _forceID; } void ArealObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -uint8_t ArealObjectStatePdu::getModifications() const { - return _modifications; -} +uint8_t ArealObjectStatePdu::getModifications() const { return _modifications; } -void ArealObjectStatePdu::setModifications(uint8_t pX) { - _modifications = pX; -} +void ArealObjectStatePdu::setModifications(uint8_t pX) { _modifications = pX; } -EntityType& ArealObjectStatePdu::getObjectType() { return _objectType; } +dis::EntityType& ArealObjectStatePdu::getObjectType() { return _objectType; } -const EntityType& ArealObjectStatePdu::getObjectType() const { +const dis::EntityType& ArealObjectStatePdu::getObjectType() const { return _objectType; } -void ArealObjectStatePdu::setObjectType(const EntityType& pX) { +void ArealObjectStatePdu::setObjectType(const dis::EntityType& pX) { _objectType = pX; } @@ -131,12 +121,11 @@ void ArealObjectStatePdu::marshal(DataStream& dataStream) const { dataStream << _modifications; _objectType.marshal(dataStream); _objectAppearance.marshal(dataStream); - dataStream << (uint16_t)_objectLocation.size(); + dataStream << static_cast(_objectLocation.size()); _requesterID.marshal(dataStream); _receivingID.marshal(dataStream); - for (size_t idx = 0; idx < _objectLocation.size(); idx++) { - Vector3Double x = _objectLocation[idx]; + for (auto x : _objectLocation) { x.marshal(dataStream); } } @@ -164,50 +153,72 @@ void ArealObjectStatePdu::unmarshal(DataStream& dataStream) { } bool ArealObjectStatePdu::operator==(const ArealObjectStatePdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + ivars_equal = SyntheticEnvironmentFamilyPdu::operator==(rhs); - if (!(_objectID == rhs._objectID)) ivarsEqual = false; - if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; - if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; - if (!(_forceID == rhs._forceID)) ivarsEqual = false; - if (!(_modifications == rhs._modifications)) ivarsEqual = false; - if (!(_objectType == rhs._objectType)) ivarsEqual = false; - if (!(_objectAppearance == rhs._objectAppearance)) ivarsEqual = false; - if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; - if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; + if (!(_objectID == rhs._objectID)) { + ivars_equal = false; + } + if (!(_referencedObjectID == rhs._referencedObjectID)) { + ivars_equal = false; + } + if (!(_updateNumber == rhs._updateNumber)) { + ivars_equal = false; + } + if (!(_forceID == rhs._forceID)) { + ivars_equal = false; + } + if (!(_modifications == rhs._modifications)) { + ivars_equal = false; + } + if (!(_objectType == rhs._objectType)) { + ivars_equal = false; + } + if (!(_objectAppearance == rhs._objectAppearance)) { + ivars_equal = false; + } + if (!(_requesterID == rhs._requesterID)) { + ivars_equal = false; + } + if (!(_receivingID == rhs._receivingID)) { + ivars_equal = false; + } for (size_t idx = 0; idx < _objectLocation.size(); idx++) { - if (!(_objectLocation[idx] == rhs._objectLocation[idx])) ivarsEqual = false; + if (!(_objectLocation[idx] == rhs._objectLocation[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int ArealObjectStatePdu::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + - _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _modifications - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - marshalSize = - marshalSize + _objectAppearance.getMarshalledSize(); // _objectAppearance - marshalSize = marshalSize + 2; // _numberOfPoints - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - - for (uint64_t idx = 0; idx < _objectLocation.size(); idx++) { - Vector3Double listElement = _objectLocation[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + int marshal_size = 0; + + marshal_size = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshal_size = marshal_size + _objectID.getMarshalledSize(); // _objectID + marshal_size = + marshal_size + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshal_size = marshal_size + 2; // _updateNumber + marshal_size = marshal_size + 1; // _forceID + marshal_size = marshal_size + 1; // _modifications + marshal_size = marshal_size + _objectType.getMarshalledSize(); // _objectType + marshal_size = marshal_size + + _objectAppearance.getMarshalledSize(); // _objectAppearance + marshal_size = marshal_size + 2; // _numberOfPoints + marshal_size = + marshal_size + _requesterID.getMarshalledSize(); // _requesterID + marshal_size = + marshal_size + _receivingID.getMarshalledSize(); // _receivingID + + for (auto listElement : _objectLocation) { + marshal_size = marshal_size + listElement.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/ArealObjectStatePdu.h b/src/dis6/synthetic_environment/ArealObjectStatePdu.h index fc3eebcc..c9e6fe85 100644 --- a/src/dis6/synthetic_environment/ArealObjectStatePdu.h +++ b/src/dis6/synthetic_environment/ArealObjectStatePdu.h @@ -2,13 +2,12 @@ #include -#include "dis6/EntityID.h" -#include "dis6/EntityType.h" -#include "dis6/SimulationAddress.h" -#include "dis6/SixByteChunk.h" -#include "dis6/SyntheticEnvironmentFamilyPdu.h" -#include "dis6/Vector3Double.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/EntityType.h" +#include "dis6/common/SimulationAddress.h" +#include "dis6/common/SixByteChunk.h" +#include "dis6/common/Vector3Double.h" +#include "dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -21,14 +20,13 @@ namespace DIS { // // @author DMcG, jkg -class ArealObjectStatePdu - : public SyntheticEnvironmentFamilyPdu { +class ArealObjectStatePdu : public SyntheticEnvironmentFamilyPdu { protected: /** Object in synthetic environment */ - EntityID _objectID; + dis::EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + dis::EntityID _referencedObjectID; /** unique update number of each state transition of an object */ uint16_t _updateNumber; @@ -40,7 +38,7 @@ class ArealObjectStatePdu uint8_t _modifications; /** Object type */ - EntityType _objectType; + dis::EntityType _objectType; /** Object appearance */ SixByteChunk _objectAppearance; @@ -61,16 +59,16 @@ class ArealObjectStatePdu ArealObjectStatePdu(); virtual ~ArealObjectStatePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID& pX); + dis::EntityID& getObjectID(); + const dis::EntityID& getObjectID() const; + void setObjectID(const dis::EntityID& pX); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID& pX); + dis::EntityID& getReferencedObjectID(); + const dis::EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const dis::EntityID& pX); uint16_t getUpdateNumber() const; void setUpdateNumber(uint16_t pX); @@ -81,9 +79,9 @@ class ArealObjectStatePdu uint8_t getModifications() const; void setModifications(uint8_t pX); - EntityType& getObjectType(); - const EntityType& getObjectType() const; - void setObjectType(const EntityType& pX); + dis::EntityType& getObjectType(); + const dis::EntityType& getObjectType() const; + void setObjectType(const dis::EntityType& pX); SixByteChunk& getObjectAppearance(); const SixByteChunk& getObjectAppearance() const; diff --git a/src/dis6/synthetic_environment/Environment.cpp b/src/dis6/synthetic_environment/Environment.cpp index 32d11aa8..a7a8f53d 100644 --- a/src/dis6/synthetic_environment/Environment.cpp +++ b/src/dis6/synthetic_environment/Environment.cpp @@ -1,4 +1,4 @@ -#include "dis6/Environment.h" +#include "dis6/synthetic_environment/Environment.h" using namespace DIS; @@ -10,11 +10,9 @@ Environment::Environment() _geometry(0), _padding2(0) {} -Environment::~Environment() {} +Environment::~Environment() = default; -uint32_t Environment::getEnvironmentType() const { - return _environmentType; -} +uint32_t Environment::getEnvironmentType() const { return _environmentType; } void Environment::setEnvironmentType(uint32_t pX) { _environmentType = pX; } @@ -38,7 +36,7 @@ uint8_t Environment::getPadding2() const { return _padding2; } void Environment::setPadding2(uint8_t pX) { _padding2 = pX; } -void Environment::marshal(DataStream& dataStream) const { +void Environment::Marshal(DataStream& dataStream) const { dataStream << _environmentType; dataStream << _length; dataStream << _index; @@ -47,7 +45,7 @@ void Environment::marshal(DataStream& dataStream) const { dataStream << _padding2; } -void Environment::unmarshal(DataStream& dataStream) { +void Environment::Unmarshal(DataStream& dataStream) { dataStream >> _environmentType; dataStream >> _length; dataStream >> _index; @@ -57,28 +55,40 @@ void Environment::unmarshal(DataStream& dataStream) { } bool Environment::operator==(const Environment& rhs) const { - bool ivarsEqual = true; - - if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; - if (!(_length == rhs._length)) ivarsEqual = false; - if (!(_index == rhs._index)) ivarsEqual = false; - if (!(_padding1 == rhs._padding1)) ivarsEqual = false; - if (!(_geometry == rhs._geometry)) ivarsEqual = false; - if (!(_padding2 == rhs._padding2)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_environmentType == rhs._environmentType)) { + ivars_equal = false; + } + if (!(_length == rhs._length)) { + ivars_equal = false; + } + if (!(_index == rhs._index)) { + ivars_equal = false; + } + if (!(_padding1 == rhs._padding1)) { + ivars_equal = false; + } + if (!(_geometry == rhs._geometry)) { + ivars_equal = false; + } + if (!(_padding2 == rhs._padding2)) { + ivars_equal = false; + } + + return ivars_equal; } int Environment::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 4; // _environmentType - marshalSize = marshalSize + 1; // _length - marshalSize = marshalSize + 1; // _index - marshalSize = marshalSize + 1; // _padding1 - marshalSize = marshalSize + 1; // _geometry - marshalSize = marshalSize + 1; // _padding2 - return marshalSize; + int marshal_size = 0; + + marshal_size = marshal_size + 4; // _environmentType + marshal_size = marshal_size + 1; // _length + marshal_size = marshal_size + 1; // _index + marshal_size = marshal_size + 1; // _padding1 + marshal_size = marshal_size + 1; // _geometry + marshal_size = marshal_size + 1; // _padding2 + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/Environment.h b/src/dis6/synthetic_environment/Environment.h index fbc45305..e803a813 100644 --- a/src/dis6/synthetic_environment/Environment.h +++ b/src/dis6/synthetic_environment/Environment.h @@ -1,6 +1,5 @@ #pragma once - #include "dis6/utils/DataStream.h" namespace DIS { @@ -37,8 +36,8 @@ class Environment { Environment(); virtual ~Environment(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint32_t getEnvironmentType() const; void setEnvironmentType(uint32_t pX); diff --git a/src/dis6/synthetic_environment/EnvironmentalProcessPdu.cpp b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.cpp index 31dadb60..6aea47aa 100644 --- a/src/dis6/synthetic_environment/EnvironmentalProcessPdu.cpp +++ b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.cpp @@ -1,53 +1,48 @@ -#include "dis6/EnvironmentalProcessPdu.h" +#include "dis6/synthetic_environment/EnvironmentalProcessPdu.h" using namespace DIS; EnvironmentalProcessPdu::EnvironmentalProcessPdu() - : SyntheticEnvironmentFamilyPdu(), - _environementalProcessID(), - _environmentType(), - _modelType(0), + : _modelType(0), _environmentStatus(0), _numberOfEnvironmentRecords(0), _sequenceNumber(0) { - setPduType(41); + SetPduType(41); } EnvironmentalProcessPdu::~EnvironmentalProcessPdu() { _environmentRecords.clear(); } -EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() { +dis::EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() { return _environementalProcessID; } -const EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() const { +const dis::EntityID& EnvironmentalProcessPdu::getEnvironementalProcessID() + const { return _environementalProcessID; } -void EnvironmentalProcessPdu::setEnvironementalProcessID(const EntityID& pX) { +void EnvironmentalProcessPdu::setEnvironementalProcessID( + const dis::EntityID& pX) { _environementalProcessID = pX; } -EntityType& EnvironmentalProcessPdu::getEnvironmentType() { +dis::EntityType& EnvironmentalProcessPdu::getEnvironmentType() { return _environmentType; } -const EntityType& EnvironmentalProcessPdu::getEnvironmentType() const { +const dis::EntityType& EnvironmentalProcessPdu::getEnvironmentType() const { return _environmentType; } -void EnvironmentalProcessPdu::setEnvironmentType(const EntityType& pX) { +void EnvironmentalProcessPdu::setEnvironmentType(const dis::EntityType& pX) { _environmentType = pX; } -uint8_t EnvironmentalProcessPdu::getModelType() const { - return _modelType; -} +uint8_t EnvironmentalProcessPdu::getModelType() const { return _modelType; } -void EnvironmentalProcessPdu::setModelType(uint8_t pX) { - _modelType = pX; -} +void EnvironmentalProcessPdu::setModelType(uint8_t pX) { _modelType = pX; } uint8_t EnvironmentalProcessPdu::getEnvironmentStatus() const { return _environmentStatus; @@ -86,15 +81,14 @@ void EnvironmentalProcessPdu::setEnvironmentRecords( void EnvironmentalProcessPdu::marshal(DataStream& dataStream) const { SyntheticEnvironmentFamilyPdu::marshal( dataStream); // Marshal information in superclass first - _environementalProcessID.marshal(dataStream); - _environmentType.marshal(dataStream); + _environementalProcessID.Marshal(dataStream); + _environmentType.Marshal(dataStream); dataStream << _modelType; dataStream << _environmentStatus; - dataStream << (uint8_t)_environmentRecords.size(); + dataStream << static_cast(_environmentRecords.size()); dataStream << _sequenceNumber; - for (size_t idx = 0; idx < _environmentRecords.size(); idx++) { - Environment x = _environmentRecords[idx]; + for (const auto& x : _environmentRecords) { x.marshal(dataStream); } } @@ -102,8 +96,8 @@ void EnvironmentalProcessPdu::marshal(DataStream& dataStream) const { void EnvironmentalProcessPdu::unmarshal(DataStream& dataStream) { SyntheticEnvironmentFamilyPdu::unmarshal( dataStream); // unmarshal information in superclass first - _environementalProcessID.unmarshal(dataStream); - _environmentType.unmarshal(dataStream); + _environementalProcessID.Unmarshal(dataStream); + _environmentType.Unmarshal(dataStream); dataStream >> _modelType; dataStream >> _environmentStatus; dataStream >> _numberOfEnvironmentRecords; @@ -119,45 +113,54 @@ void EnvironmentalProcessPdu::unmarshal(DataStream& dataStream) { bool EnvironmentalProcessPdu::operator==( const EnvironmentalProcessPdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + ivars_equal = SyntheticEnvironmentFamilyPdu::operator==(rhs); - if (!(_environementalProcessID == rhs._environementalProcessID)) - ivarsEqual = false; - if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; - if (!(_modelType == rhs._modelType)) ivarsEqual = false; - if (!(_environmentStatus == rhs._environmentStatus)) ivarsEqual = false; - if (!(_sequenceNumber == rhs._sequenceNumber)) ivarsEqual = false; + if (!(_environementalProcessID == rhs._environementalProcessID)) { + ivars_equal = false; + } + if (!(_environmentType == rhs._environmentType)) { + ivars_equal = false; + } + if (!(_modelType == rhs._modelType)) { + ivars_equal = false; + } + if (!(_environmentStatus == rhs._environmentStatus)) { + ivars_equal = false; + } + if (!(_sequenceNumber == rhs._sequenceNumber)) { + ivars_equal = false; + } for (size_t idx = 0; idx < _environmentRecords.size(); idx++) { - if (!(_environmentRecords[idx] == rhs._environmentRecords[idx])) - ivarsEqual = false; + if (!(_environmentRecords[idx] == rhs._environmentRecords[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int EnvironmentalProcessPdu::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = - marshalSize + - _environementalProcessID.getMarshalledSize(); // _environementalProcessID - marshalSize = - marshalSize + _environmentType.getMarshalledSize(); // _environmentType - marshalSize = marshalSize + 1; // _modelType - marshalSize = marshalSize + 1; // _environmentStatus - marshalSize = marshalSize + 1; // _numberOfEnvironmentRecords - marshalSize = marshalSize + 2; // _sequenceNumber - - for (uint64_t idx = 0; idx < _environmentRecords.size(); idx++) { - Environment listElement = _environmentRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + int marshal_size = 0; + + marshal_size = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshal_size = + marshal_size + + _environementalProcessID.GetMarshalledSize(); // _environementalProcessID + marshal_size = + marshal_size + _environmentType.GetMarshalledSize(); // _environmentType + marshal_size = marshal_size + 1; // _modelType + marshal_size = marshal_size + 1; // _environmentStatus + marshal_size = marshal_size + 1; // _numberOfEnvironmentRecords + marshal_size = marshal_size + 2; // _sequenceNumber + + for (const auto& list_element : _environmentRecords) { + marshal_size = marshal_size + list_element.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h index 638e4cbb..c7576e20 100644 --- a/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h +++ b/src/dis6/synthetic_environment/EnvironmentalProcessPdu.h @@ -2,11 +2,10 @@ #include -#include "dis6/EntityID.h" -#include "dis6/EntityType.h" -#include "dis6/Environment.h" -#include "dis6/SyntheticEnvironmentFamilyPdu.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/EntityType.h" +#include "dis6/synthetic_environment/Environment.h" +#include "dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,14 +18,13 @@ namespace DIS { // // @author DMcG, jkg -class EnvironmentalProcessPdu - : public SyntheticEnvironmentFamilyPdu { +class EnvironmentalProcessPdu : public SyntheticEnvironmentFamilyPdu { protected: /** Environmental process ID */ - EntityID _environementalProcessID; + dis::EntityID _environementalProcessID; /** Environment type */ - EntityType _environmentType; + dis::EntityType _environmentType; /** model type */ uint8_t _modelType; @@ -48,16 +46,16 @@ class EnvironmentalProcessPdu EnvironmentalProcessPdu(); virtual ~EnvironmentalProcessPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); - EntityID& getEnvironementalProcessID(); - const EntityID& getEnvironementalProcessID() const; - void setEnvironementalProcessID(const EntityID& pX); + dis::EntityID& getEnvironementalProcessID(); + const dis::EntityID& getEnvironementalProcessID() const; + void setEnvironementalProcessID(const dis::EntityID& pX); - EntityType& getEnvironmentType(); - const EntityType& getEnvironmentType() const; - void setEnvironmentType(const EntityType& pX); + dis::EntityType& getEnvironmentType(); + const dis::EntityType& getEnvironmentType() const; + void setEnvironmentType(const dis::EntityType& pX); uint8_t getModelType() const; void setModelType(uint8_t pX); diff --git a/src/dis6/synthetic_environment/GridAxisRecord.cpp b/src/dis6/synthetic_environment/GridAxisRecord.cpp index fb1a4712..475ef253 100644 --- a/src/dis6/synthetic_environment/GridAxisRecord.cpp +++ b/src/dis6/synthetic_environment/GridAxisRecord.cpp @@ -1,10 +1,10 @@ -#include "dis6/GridAxisRecord.h" +#include "dis6/synthetic_environment/GridAxisRecord.h" using namespace DIS; GridAxisRecord::GridAxisRecord() : _sampleType(0), _dataRepresentation(0) {} -GridAxisRecord::~GridAxisRecord() {} +GridAxisRecord::~GridAxisRecord() = default; uint16_t GridAxisRecord::getSampleType() const { return _sampleType; } @@ -18,31 +18,35 @@ void GridAxisRecord::setDataRepresentation(uint16_t pX) { _dataRepresentation = pX; } -void GridAxisRecord::marshal(DataStream& dataStream) const { +void GridAxisRecord::Marshal(DataStream& dataStream) const { dataStream << _sampleType; dataStream << _dataRepresentation; } -void GridAxisRecord::unmarshal(DataStream& dataStream) { +void GridAxisRecord::Unmarshal(DataStream& dataStream) { dataStream >> _sampleType; dataStream >> _dataRepresentation; } bool GridAxisRecord::operator==(const GridAxisRecord& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - if (!(_sampleType == rhs._sampleType)) ivarsEqual = false; - if (!(_dataRepresentation == rhs._dataRepresentation)) ivarsEqual = false; + if (!(_sampleType == rhs._sampleType)) { + ivars_equal = false; + } + if (!(_dataRepresentation == rhs._dataRepresentation)) { + ivars_equal = false; + } - return ivarsEqual; + return ivars_equal; } int GridAxisRecord::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = marshalSize + 2; // _sampleType - marshalSize = marshalSize + 2; // _dataRepresentation - return marshalSize; + marshal_size = marshal_size + 2; // _sampleType + marshal_size = marshal_size + 2; // _dataRepresentation + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/GridAxisRecord.h b/src/dis6/synthetic_environment/GridAxisRecord.h index 5ead336f..2b2513e6 100644 --- a/src/dis6/synthetic_environment/GridAxisRecord.h +++ b/src/dis6/synthetic_environment/GridAxisRecord.h @@ -1,6 +1,5 @@ #pragma once - #include "dis6/utils/DataStream.h" namespace DIS { @@ -23,8 +22,8 @@ class GridAxisRecord { GridAxisRecord(); virtual ~GridAxisRecord(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint16_t getSampleType() const; void setSampleType(uint16_t pX); diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.cpp b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.cpp index bafafe19..f6a8e8b1 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.cpp +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.cpp @@ -1,9 +1,9 @@ -#include "dis6/GridAxisRecordRepresentation0.h" +#include "dis6/synthetic_environment/GridAxisRecordRepresentation0.h" using namespace DIS; GridAxisRecordRepresentation0::GridAxisRecordRepresentation0() - : GridAxisRecord(), _numberOfBytes(0) {} + : _numberOfBytes(0) {} GridAxisRecordRepresentation0::~GridAxisRecordRepresentation0() { _dataValues.clear(); @@ -30,9 +30,9 @@ void GridAxisRecordRepresentation0::setDataValues( void GridAxisRecordRepresentation0::marshal(DataStream& dataStream) const { GridAxisRecord::marshal( dataStream); // Marshal information in superclass first - dataStream << (uint16_t)_dataValues.size(); + dataStream << static_cast(_dataValues.size()); - for (auto& byte : _dataValues) { + for (const auto& byte : _dataValues) { dataStream << byte; } } @@ -52,22 +52,22 @@ void GridAxisRecordRepresentation0::unmarshal(DataStream& dataStream) { bool GridAxisRecordRepresentation0::operator==( const GridAxisRecordRepresentation0& rhs) const { - auto ivarsEqual = true; + auto ivars_equal = true; - ivarsEqual = + ivars_equal = GridAxisRecord::operator==(rhs) && _dataValues == rhs._dataValues; - return ivarsEqual; + return ivars_equal; } int GridAxisRecordRepresentation0::getMarshalledSize() const { - auto marshalSize = 0; + auto marshal_size = 0; - marshalSize = GridAxisRecord::getMarshalledSize(); - marshalSize += 2; // _numberOfBytes - marshalSize += _dataValues.size(); + marshal_size = GridAxisRecord::getMarshalledSize(); + marshal_size += 2; // _numberOfBytes + marshal_size += _dataValues.size(); - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h index de3af403..add54f1b 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation0.h @@ -3,8 +3,7 @@ #include #include -#include "dis6/GridAxisRecord.h" - +#include "dis6/synthetic_environment/GridAxisRecord.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -28,8 +27,8 @@ class GridAxisRecordRepresentation0 : public GridAxisRecord { GridAxisRecordRepresentation0(); virtual ~GridAxisRecordRepresentation0(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint16_t getNumberOfBytes() const; diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.cpp b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.cpp index 56f1bbac..2dcdc222 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.cpp +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.cpp @@ -1,12 +1,9 @@ -#include "dis6/GridAxisRecordRepresentation1.h" +#include "dis6/synthetic_environment/GridAxisRecordRepresentation1.h" using namespace DIS; GridAxisRecordRepresentation1::GridAxisRecordRepresentation1() - : GridAxisRecord(), - _fieldScale(0.0), - _fieldOffset(0.0), - _numberOfValues(0) {} + : _fieldScale(0.0), _fieldOffset(0.0), _numberOfValues(0) {} GridAxisRecordRepresentation1::~GridAxisRecordRepresentation1() { _dataValues.clear(); @@ -51,10 +48,9 @@ void GridAxisRecordRepresentation1::marshal(DataStream& dataStream) const { dataStream); // Marshal information in superclass first dataStream << _fieldScale; dataStream << _fieldOffset; - dataStream << (uint16_t)_dataValues.size(); + dataStream << static_cast(_dataValues.size()); - for (size_t idx = 0; idx < _dataValues.size(); idx++) { - TwoByteChunk x = _dataValues[idx]; + for (const auto& x : _dataValues) { x.marshal(dataStream); } } @@ -76,34 +72,39 @@ void GridAxisRecordRepresentation1::unmarshal(DataStream& dataStream) { bool GridAxisRecordRepresentation1::operator==( const GridAxisRecordRepresentation1& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = GridAxisRecord::operator==(rhs); + ivars_equal = GridAxisRecord::operator==(rhs); - if (!(_fieldScale == rhs._fieldScale)) ivarsEqual = false; - if (!(_fieldOffset == rhs._fieldOffset)) ivarsEqual = false; + if (!(_fieldScale == rhs._fieldScale)) { + ivars_equal = false; + } + if (!(_fieldOffset == rhs._fieldOffset)) { + ivars_equal = false; + } for (size_t idx = 0; idx < _dataValues.size(); idx++) { - if (!(_dataValues[idx] == rhs._dataValues[idx])) ivarsEqual = false; + if (!(_dataValues[idx] == rhs._dataValues[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int GridAxisRecordRepresentation1::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = GridAxisRecord::getMarshalledSize(); - marshalSize = marshalSize + 4; // _fieldScale - marshalSize = marshalSize + 4; // _fieldOffset - marshalSize = marshalSize + 2; // _numberOfValues + marshal_size = GridAxisRecord::getMarshalledSize(); + marshal_size = marshal_size + 4; // _fieldScale + marshal_size = marshal_size + 4; // _fieldOffset + marshal_size = marshal_size + 2; // _numberOfValues - for (uint64_t idx = 0; idx < _dataValues.size(); idx++) { - TwoByteChunk listElement = _dataValues[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + for (const auto& list_element : _dataValues) { + marshal_size = marshal_size + list_element.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h index 2e4c117c..e99a9c92 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation1.h @@ -2,9 +2,8 @@ #include -#include "dis6/GridAxisRecord.h" -#include "dis6/TwoByteChunk.h" - +#include "dis6/common/TwoByteChunk.h" +#include "dis6/synthetic_environment/GridAxisRecord.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -34,8 +33,8 @@ class GridAxisRecordRepresentation1 : public GridAxisRecord { GridAxisRecordRepresentation1(); virtual ~GridAxisRecordRepresentation1(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); float getFieldScale() const; void setFieldScale(float pX); diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.cpp b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.cpp index 8c199064..aecd2ebf 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.cpp +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.cpp @@ -1,9 +1,9 @@ -#include "dis6/GridAxisRecordRepresentation2.h" +#include "dis6/synthetic_environment/GridAxisRecordRepresentation2.h" using namespace DIS; GridAxisRecordRepresentation2::GridAxisRecordRepresentation2() - : GridAxisRecord(), _numberOfValues(0) {} + : _numberOfValues(0) {} GridAxisRecordRepresentation2::~GridAxisRecordRepresentation2() { _dataValues.clear(); @@ -30,10 +30,9 @@ void GridAxisRecordRepresentation2::setDataValues( void GridAxisRecordRepresentation2::marshal(DataStream& dataStream) const { GridAxisRecord::marshal( dataStream); // Marshal information in superclass first - dataStream << (uint16_t)_dataValues.size(); + dataStream << static_cast(_dataValues.size()); - for (size_t idx = 0; idx < _dataValues.size(); idx++) { - FourByteChunk x = _dataValues[idx]; + for (const auto& x : _dataValues) { x.marshal(dataStream); } } @@ -53,29 +52,30 @@ void GridAxisRecordRepresentation2::unmarshal(DataStream& dataStream) { bool GridAxisRecordRepresentation2::operator==( const GridAxisRecordRepresentation2& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = GridAxisRecord::operator==(rhs); + ivars_equal = GridAxisRecord::operator==(rhs); for (size_t idx = 0; idx < _dataValues.size(); idx++) { - if (!(_dataValues[idx] == rhs._dataValues[idx])) ivarsEqual = false; + if (!(_dataValues[idx] == rhs._dataValues[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int GridAxisRecordRepresentation2::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = GridAxisRecord::getMarshalledSize(); - marshalSize = marshalSize + 2; // _numberOfValues + marshal_size = GridAxisRecord::getMarshalledSize(); + marshal_size = marshal_size + 2; // _numberOfValues - for (uint64_t idx = 0; idx < _dataValues.size(); idx++) { - FourByteChunk listElement = _dataValues[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + for (const auto& list_element : _dataValues) { + marshal_size = marshal_size + list_element.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h index 60e6511f..2d1608e8 100644 --- a/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h +++ b/src/dis6/synthetic_environment/GridAxisRecordRepresentation2.h @@ -2,9 +2,8 @@ #include -#include "dis6/FourByteChunk.h" -#include "dis6/GridAxisRecord.h" - +#include "dis6/common/FourByteChunk.h" +#include "dis6/synthetic_environment/GridAxisRecord.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -28,8 +27,8 @@ class GridAxisRecordRepresentation2 : public GridAxisRecord { GridAxisRecordRepresentation2(); virtual ~GridAxisRecordRepresentation2(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint16_t getNumberOfValues() const; diff --git a/src/dis6/synthetic_environment/GriddedDataPdu.cpp b/src/dis6/synthetic_environment/GriddedDataPdu.cpp index 6a0aee29..9c131922 100644 --- a/src/dis6/synthetic_environment/GriddedDataPdu.cpp +++ b/src/dis6/synthetic_environment/GriddedDataPdu.cpp @@ -1,39 +1,36 @@ -#include "dis6/GriddedDataPdu.h" +#include "dis6/synthetic_environment/GriddedDataPdu.h" using namespace DIS; GriddedDataPdu::GriddedDataPdu() - : SyntheticEnvironmentFamilyPdu(), - _environmentalSimulationApplicationID(), - _fieldNumber(0), + : _fieldNumber(0), _pduNumber(0), _pduTotal(0), _coordinateSystem(0), _numberOfGridAxes(0), _constantGrid(0), - _environmentType(), - _orientation(), + _sampleTime(0), _totalValues(0), _vectorDimension(0), _padding1(0), _padding2(0) { - setPduType(42); + SetPduType(42); } GriddedDataPdu::~GriddedDataPdu() { _gridDataList.clear(); } -EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() { +dis::EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() { return _environmentalSimulationApplicationID; } -const EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() +const dis::EntityID& GriddedDataPdu::getEnvironmentalSimulationApplicationID() const { return _environmentalSimulationApplicationID; } void GriddedDataPdu::setEnvironmentalSimulationApplicationID( - const EntityID& pX) { + const dis::EntityID& pX) { _environmentalSimulationApplicationID = pX; } @@ -65,13 +62,15 @@ uint8_t GriddedDataPdu::getConstantGrid() const { return _constantGrid; } void GriddedDataPdu::setConstantGrid(uint8_t pX) { _constantGrid = pX; } -EntityType& GriddedDataPdu::getEnvironmentType() { return _environmentType; } +dis::EntityType& GriddedDataPdu::getEnvironmentType() { + return _environmentType; +} -const EntityType& GriddedDataPdu::getEnvironmentType() const { +const dis::EntityType& GriddedDataPdu::getEnvironmentType() const { return _environmentType; } -void GriddedDataPdu::setEnvironmentType(const EntityType& pX) { +void GriddedDataPdu::setEnvironmentType(const dis::EntityType& pX) { _environmentType = pX; } @@ -93,13 +92,9 @@ uint32_t GriddedDataPdu::getTotalValues() const { return _totalValues; } void GriddedDataPdu::setTotalValues(uint32_t pX) { _totalValues = pX; } -uint8_t GriddedDataPdu::getVectorDimension() const { - return _vectorDimension; -} +uint8_t GriddedDataPdu::getVectorDimension() const { return _vectorDimension; } -void GriddedDataPdu::setVectorDimension(uint8_t pX) { - _vectorDimension = pX; -} +void GriddedDataPdu::setVectorDimension(uint8_t pX) { _vectorDimension = pX; } uint16_t GriddedDataPdu::getPadding1() const { return _padding1; } @@ -124,12 +119,12 @@ void GriddedDataPdu::setGridDataList(const std::vector& pX) { void GriddedDataPdu::marshal(DataStream& dataStream) const { SyntheticEnvironmentFamilyPdu::marshal( dataStream); // Marshal information in superclass first - _environmentalSimulationApplicationID.marshal(dataStream); + _environmentalSimulationApplicationID.Marshal(dataStream); dataStream << _fieldNumber; dataStream << _pduNumber; dataStream << _pduTotal; dataStream << _coordinateSystem; - dataStream << (uint8_t)_gridDataList.size(); + dataStream << static_cast(_gridDataList.size()); dataStream << _constantGrid; _environmentType.marshal(dataStream); _orientation.marshal(dataStream); @@ -139,8 +134,7 @@ void GriddedDataPdu::marshal(DataStream& dataStream) const { dataStream << _padding1; dataStream << _padding2; - for (size_t idx = 0; idx < _gridDataList.size(); idx++) { - GridAxisRecord x = _gridDataList[idx]; + for (auto x : _gridDataList) { x.marshal(dataStream); } } @@ -172,62 +166,89 @@ void GriddedDataPdu::unmarshal(DataStream& dataStream) { } bool GriddedDataPdu::operator==(const GriddedDataPdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + ivars_equal = SyntheticEnvironmentFamilyPdu::operator==(rhs); if (!(_environmentalSimulationApplicationID == - rhs._environmentalSimulationApplicationID)) - ivarsEqual = false; - if (!(_fieldNumber == rhs._fieldNumber)) ivarsEqual = false; - if (!(_pduNumber == rhs._pduNumber)) ivarsEqual = false; - if (!(_pduTotal == rhs._pduTotal)) ivarsEqual = false; - if (!(_coordinateSystem == rhs._coordinateSystem)) ivarsEqual = false; - if (!(_constantGrid == rhs._constantGrid)) ivarsEqual = false; - if (!(_environmentType == rhs._environmentType)) ivarsEqual = false; - if (!(_orientation == rhs._orientation)) ivarsEqual = false; - if (!(_sampleTime == rhs._sampleTime)) ivarsEqual = false; - if (!(_totalValues == rhs._totalValues)) ivarsEqual = false; - if (!(_vectorDimension == rhs._vectorDimension)) ivarsEqual = false; - if (!(_padding1 == rhs._padding1)) ivarsEqual = false; - if (!(_padding2 == rhs._padding2)) ivarsEqual = false; + rhs._environmentalSimulationApplicationID)) { + ivars_equal = false; + } + if (!(_fieldNumber == rhs._fieldNumber)) { + ivars_equal = false; + } + if (!(_pduNumber == rhs._pduNumber)) { + ivars_equal = false; + } + if (!(_pduTotal == rhs._pduTotal)) { + ivars_equal = false; + } + if (!(_coordinateSystem == rhs._coordinateSystem)) { + ivars_equal = false; + } + if (!(_constantGrid == rhs._constantGrid)) { + ivars_equal = false; + } + if (!(_environmentType == rhs._environmentType)) { + ivars_equal = false; + } + if (!(_orientation == rhs._orientation)) { + ivars_equal = false; + } + if (!(_sampleTime == rhs._sampleTime)) { + ivars_equal = false; + } + if (!(_totalValues == rhs._totalValues)) { + ivars_equal = false; + } + if (!(_vectorDimension == rhs._vectorDimension)) { + ivars_equal = false; + } + if (!(_padding1 == rhs._padding1)) { + ivars_equal = false; + } + if (!(_padding2 == rhs._padding2)) { + ivars_equal = false; + } for (size_t idx = 0; idx < _gridDataList.size(); idx++) { - if (!(_gridDataList[idx] == rhs._gridDataList[idx])) ivarsEqual = false; + if (!(_gridDataList[idx] == rhs._gridDataList[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int GriddedDataPdu::getMarshalledSize() const { - int marshalSize = 0; + int marshal_size = 0; - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = - marshalSize + + marshal_size = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshal_size = + marshal_size + _environmentalSimulationApplicationID - .getMarshalledSize(); // _environmentalSimulationApplicationID - marshalSize = marshalSize + 2; // _fieldNumber - marshalSize = marshalSize + 2; // _pduNumber - marshalSize = marshalSize + 2; // _pduTotal - marshalSize = marshalSize + 2; // _coordinateSystem - marshalSize = marshalSize + 1; // _numberOfGridAxes - marshalSize = marshalSize + 1; // _constantGrid - marshalSize = - marshalSize + _environmentType.getMarshalledSize(); // _environmentType - marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation - marshalSize = marshalSize + 8; // _sampleTime - marshalSize = marshalSize + 4; // _totalValues - marshalSize = marshalSize + 1; // _vectorDimension - marshalSize = marshalSize + 2; // _padding1 - marshalSize = marshalSize + 1; // _padding2 - - for (uint64_t idx = 0; idx < _gridDataList.size(); idx++) { - GridAxisRecord listElement = _gridDataList[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + .getMarshalledSize(); // _environmentalSimulationApplicationID + marshal_size = marshal_size + 2; // _fieldNumber + marshal_size = marshal_size + 2; // _pduNumber + marshal_size = marshal_size + 2; // _pduTotal + marshal_size = marshal_size + 2; // _coordinateSystem + marshal_size = marshal_size + 1; // _numberOfGridAxes + marshal_size = marshal_size + 1; // _constantGrid + marshal_size = + marshal_size + _environmentType.getMarshalledSize(); // _environmentType + marshal_size = + marshal_size + _orientation.getMarshalledSize(); // _orientation + marshal_size = marshal_size + 8; // _sampleTime + marshal_size = marshal_size + 4; // _totalValues + marshal_size = marshal_size + 1; // _vectorDimension + marshal_size = marshal_size + 2; // _padding1 + marshal_size = marshal_size + 1; // _padding2 + + for (auto listElement : _gridDataList) { + marshal_size = marshal_size + listElement.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/GriddedDataPdu.h b/src/dis6/synthetic_environment/GriddedDataPdu.h index a53bbee9..d7b22f42 100644 --- a/src/dis6/synthetic_environment/GriddedDataPdu.h +++ b/src/dis6/synthetic_environment/GriddedDataPdu.h @@ -2,12 +2,11 @@ #include -#include "dis6/EntityID.h" -#include "dis6/EntityType.h" -#include "dis6/GridAxisRecord.h" -#include "dis6/Orientation.h" -#include "dis6/SyntheticEnvironmentFamilyPdu.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/EntityType.h" +#include "dis6/common/Orientation.h" +#include "dis6/synthetic_environment/GridAxisRecord.h" +#include "dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -23,7 +22,7 @@ namespace DIS { class GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { protected: /** environmental simulation application ID */ - EntityID _environmentalSimulationApplicationID; + dis::EntityID _environmentalSimulationApplicationID; /** unique identifier for each piece of enviornmental data */ uint16_t _fieldNumber; @@ -44,7 +43,7 @@ class GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { uint8_t _constantGrid; /** type of environment */ - EntityType _environmentType; + dis::EntityType _environmentType; /** orientation of the data grid */ Orientation _orientation; @@ -72,12 +71,12 @@ class GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { GriddedDataPdu(); virtual ~GriddedDataPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); - EntityID& getEnvironmentalSimulationApplicationID(); - const EntityID& getEnvironmentalSimulationApplicationID() const; - void setEnvironmentalSimulationApplicationID(const EntityID& pX); + dis::EntityID& getEnvironmentalSimulationApplicationID(); + const dis::EntityID& getEnvironmentalSimulationApplicationID() const; + void setEnvironmentalSimulationApplicationID(const dis::EntityID& pX); uint16_t getFieldNumber() const; void setFieldNumber(uint16_t pX); @@ -96,9 +95,9 @@ class GriddedDataPdu : public SyntheticEnvironmentFamilyPdu { uint8_t getConstantGrid() const; void setConstantGrid(uint8_t pX); - EntityType& getEnvironmentType(); - const EntityType& getEnvironmentType() const; - void setEnvironmentType(const EntityType& pX); + dis::EntityType& getEnvironmentType(); + const dis::EntityType& getEnvironmentType() const; + void setEnvironmentType(const dis::EntityType& pX); Orientation& getOrientation(); const Orientation& getOrientation() const; diff --git a/src/dis6/synthetic_environment/LinearObjectStatePdu.cpp b/src/dis6/synthetic_environment/LinearObjectStatePdu.cpp index 526f4a15..d2bcefb5 100644 --- a/src/dis6/synthetic_environment/LinearObjectStatePdu.cpp +++ b/src/dis6/synthetic_environment/LinearObjectStatePdu.cpp @@ -1,31 +1,27 @@ -#include "dis6/LinearObjectStatePdu.h" +#include "dis6/synthetic_environment/LinearObjectStatePdu.h" using namespace DIS; LinearObjectStatePdu::LinearObjectStatePdu() - : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), - _forceID(0), - _numberOfSegments(0), - _requesterID(), - _receivingID(), - _objectType() { - setPduType(44); + : _updateNumber(0), _forceID(0), _numberOfSegments(0) { + SetPduType(44); } LinearObjectStatePdu::~LinearObjectStatePdu() { _linearSegmentParameters.clear(); } -EntityID& LinearObjectStatePdu::getObjectID() { return _objectID; } +dis::EntityID& LinearObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& LinearObjectStatePdu::getObjectID() const { return _objectID; } +const dis::EntityID& LinearObjectStatePdu::getObjectID() const { + return _objectID; +} -void LinearObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } +void LinearObjectStatePdu::setObjectID(const dis::EntityID& pX) { + _objectID = pX; +} -EntityID& LinearObjectStatePdu::getReferencedObjectID() { +dis::EntityID& LinearObjectStatePdu::getReferencedObjectID() { return _referencedObjectID; } @@ -33,17 +29,13 @@ const EntityID& LinearObjectStatePdu::getReferencedObjectID() const { return _referencedObjectID; } -void LinearObjectStatePdu::setReferencedObjectID(const EntityID& pX) { +void LinearObjectStatePdu::SetReferencedObjectId(const EntityID& pX) { _referencedObjectID = pX; } -uint16_t LinearObjectStatePdu::getUpdateNumber() const { - return _updateNumber; -} +uint16_t LinearObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void LinearObjectStatePdu::setUpdateNumber(uint16_t pX) { - _updateNumber = pX; -} +void LinearObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } uint8_t LinearObjectStatePdu::getForceID() const { return _forceID; } @@ -88,16 +80,16 @@ void LinearObjectStatePdu::setObjectType(const ObjectType& pX) { } std::vector& -LinearObjectStatePdu::getLinearSegmentParameters() { +LinearObjectStatePdu::GetLinearSegmentParameters() { return _linearSegmentParameters; } const std::vector& -LinearObjectStatePdu::getLinearSegmentParameters() const { +LinearObjectStatePdu::GetLinearSegmentParameters() const { return _linearSegmentParameters; } -void LinearObjectStatePdu::setLinearSegmentParameters( +void LinearObjectStatePdu::SetLinearSegmentParameters( const std::vector& pX) { _linearSegmentParameters = pX; } @@ -109,13 +101,12 @@ void LinearObjectStatePdu::marshal(DataStream& dataStream) const { _referencedObjectID.marshal(dataStream); dataStream << _updateNumber; dataStream << _forceID; - dataStream << (uint8_t)_linearSegmentParameters.size(); + dataStream << static_cast(_linearSegmentParameters.size()); _requesterID.marshal(dataStream); _receivingID.marshal(dataStream); _objectType.marshal(dataStream); - for (size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { - LinearSegmentParameter x = _linearSegmentParameters[idx]; + for (auto x : _linearSegmentParameters) { x.marshal(dataStream); } } @@ -141,47 +132,63 @@ void LinearObjectStatePdu::unmarshal(DataStream& dataStream) { } bool LinearObjectStatePdu::operator==(const LinearObjectStatePdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); + ivars_equal = SyntheticEnvironmentFamilyPdu::operator==(rhs); - if (!(_objectID == rhs._objectID)) ivarsEqual = false; - if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; - if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; - if (!(_forceID == rhs._forceID)) ivarsEqual = false; - if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; - if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; - if (!(_objectType == rhs._objectType)) ivarsEqual = false; + if (!(_objectID == rhs._objectID)) { + ivars_equal = false; + } + if (!(_referencedObjectID == rhs._referencedObjectID)) { + ivars_equal = false; + } + if (!(_updateNumber == rhs._updateNumber)) { + ivars_equal = false; + } + if (!(_forceID == rhs._forceID)) { + ivars_equal = false; + } + if (!(_requesterID == rhs._requesterID)) { + ivars_equal = false; + } + if (!(_receivingID == rhs._receivingID)) { + ivars_equal = false; + } + if (!(_objectType == rhs._objectType)) { + ivars_equal = false; + } for (size_t idx = 0; idx < _linearSegmentParameters.size(); idx++) { - if (!(_linearSegmentParameters[idx] == rhs._linearSegmentParameters[idx])) - ivarsEqual = false; + if (!(_linearSegmentParameters[idx] == rhs._linearSegmentParameters[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } int LinearObjectStatePdu::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + - _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _numberOfSegments - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - - for (uint64_t idx = 0; idx < _linearSegmentParameters.size(); - idx++) { - LinearSegmentParameter listElement = _linearSegmentParameters[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + int marshal_size = 0; + + marshal_size = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshal_size = marshal_size + _objectID.getMarshalledSize(); // _objectID + marshal_size = + marshal_size + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshal_size = marshal_size + 2; // _updateNumber + marshal_size = marshal_size + 1; // _forceID + marshal_size = marshal_size + 1; // _numberOfSegments + marshal_size = + marshal_size + _requesterID.getMarshalledSize(); // _requesterID + marshal_size = + marshal_size + _receivingID.getMarshalledSize(); // _receivingID + marshal_size = marshal_size + _objectType.getMarshalledSize(); // _objectType + + for (auto listElement : _linearSegmentParameters) { + marshal_size = marshal_size + listElement.getMarshalledSize(); } - return marshalSize; + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/LinearObjectStatePdu.h b/src/dis6/synthetic_environment/LinearObjectStatePdu.h index 8fe2c317..8d16a64c 100644 --- a/src/dis6/synthetic_environment/LinearObjectStatePdu.h +++ b/src/dis6/synthetic_environment/LinearObjectStatePdu.h @@ -2,12 +2,11 @@ #include -#include "dis6/EntityID.h" -#include "dis6/LinearSegmentParameter.h" -#include "dis6/ObjectType.h" -#include "dis6/SimulationAddress.h" -#include "dis6/SyntheticEnvironmentFamilyPdu.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/SimulationAddress.h" +#include "dis6/synthetic_environment/LinearSegmentParameter.h" +#include "dis6/synthetic_environment/ObjectType.h" +#include "dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -20,14 +19,13 @@ namespace DIS { // // @author DMcG, jkg -class LinearObjectStatePdu - : public SyntheticEnvironmentFamilyPdu { +class LinearObjectStatePdu : public SyntheticEnvironmentFamilyPdu { protected: /** Object in synthetic environment */ - EntityID _objectID; + dis::EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + dis::EntityID _referencedObjectID; /** unique update number of each state transition of an object */ uint16_t _updateNumber; @@ -54,16 +52,16 @@ class LinearObjectStatePdu LinearObjectStatePdu(); virtual ~LinearObjectStatePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID& pX); + dis::EntityID& getObjectID(); + const dis::EntityID& getObjectID() const; + void setObjectID(const dis::EntityID& pX); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID& pX); + dis::EntityID& getReferencedObjectID(); + const dis::EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const dis::EntityID& pX); uint16_t getUpdateNumber() const; void setUpdateNumber(uint16_t pX); diff --git a/src/dis6/synthetic_environment/LinearSegmentParameter.cpp b/src/dis6/synthetic_environment/LinearSegmentParameter.cpp index eb801177..1840b039 100644 --- a/src/dis6/synthetic_environment/LinearSegmentParameter.cpp +++ b/src/dis6/synthetic_environment/LinearSegmentParameter.cpp @@ -1,19 +1,17 @@ -#include "dis6/LinearSegmentParameter.h" +#include "dis6/synthetic_environment/LinearSegmentParameter.h" using namespace DIS; LinearSegmentParameter::LinearSegmentParameter() : _segmentNumber(0), - _segmentAppearance(), - _location(), - _orientation(), + _segmentLength(0), _segmentWidth(0), _segmentHeight(0), _segmentDepth(0), _pad1(0) {} -LinearSegmentParameter::~LinearSegmentParameter() {} +LinearSegmentParameter::~LinearSegmentParameter() = default; uint8_t LinearSegmentParameter::getSegmentNumber() const { return _segmentNumber; @@ -91,7 +89,7 @@ uint32_t LinearSegmentParameter::getPad1() const { return _pad1; } void LinearSegmentParameter::setPad1(uint32_t pX) { _pad1 = pX; } -void LinearSegmentParameter::marshal(DataStream& dataStream) const { +void LinearSegmentParameter::Marshal(DataStream& dataStream) const { dataStream << _segmentNumber; _segmentAppearance.marshal(dataStream); _location.marshal(dataStream); @@ -103,7 +101,7 @@ void LinearSegmentParameter::marshal(DataStream& dataStream) const { dataStream << _pad1; } -void LinearSegmentParameter::unmarshal(DataStream& dataStream) { +void LinearSegmentParameter::Unmarshal(DataStream& dataStream) { dataStream >> _segmentNumber; _segmentAppearance.unmarshal(dataStream); _location.unmarshal(dataStream); @@ -117,35 +115,54 @@ void LinearSegmentParameter::unmarshal(DataStream& dataStream) { bool LinearSegmentParameter::operator==( const LinearSegmentParameter& rhs) const { - bool ivarsEqual = true; - - if (!(_segmentNumber == rhs._segmentNumber)) ivarsEqual = false; - if (!(_segmentAppearance == rhs._segmentAppearance)) ivarsEqual = false; - if (!(_location == rhs._location)) ivarsEqual = false; - if (!(_orientation == rhs._orientation)) ivarsEqual = false; - if (!(_segmentLength == rhs._segmentLength)) ivarsEqual = false; - if (!(_segmentWidth == rhs._segmentWidth)) ivarsEqual = false; - if (!(_segmentHeight == rhs._segmentHeight)) ivarsEqual = false; - if (!(_segmentDepth == rhs._segmentDepth)) ivarsEqual = false; - if (!(_pad1 == rhs._pad1)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_segmentNumber == rhs._segmentNumber)) { + ivars_equal = false; + } + if (!(_segmentAppearance == rhs._segmentAppearance)) { + ivars_equal = false; + } + if (!(_location == rhs._location)) { + ivars_equal = false; + } + if (!(_orientation == rhs._orientation)) { + ivars_equal = false; + } + if (!(_segmentLength == rhs._segmentLength)) { + ivars_equal = false; + } + if (!(_segmentWidth == rhs._segmentWidth)) { + ivars_equal = false; + } + if (!(_segmentHeight == rhs._segmentHeight)) { + ivars_equal = false; + } + if (!(_segmentDepth == rhs._segmentDepth)) { + ivars_equal = false; + } + if (!(_pad1 == rhs._pad1)) { + ivars_equal = false; + } + + return ivars_equal; } int LinearSegmentParameter::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _segmentNumber - marshalSize = marshalSize + - _segmentAppearance.getMarshalledSize(); // _segmentAppearance - marshalSize = marshalSize + _location.getMarshalledSize(); // _location - marshalSize = marshalSize + _orientation.getMarshalledSize(); // _orientation - marshalSize = marshalSize + 2; // _segmentLength - marshalSize = marshalSize + 2; // _segmentWidth - marshalSize = marshalSize + 2; // _segmentHeight - marshalSize = marshalSize + 2; // _segmentDepth - marshalSize = marshalSize + 4; // _pad1 - return marshalSize; + int marshal_size = 0; + + marshal_size = marshal_size + 1; // _segmentNumber + marshal_size = marshal_size + + _segmentAppearance.getMarshalledSize(); // _segmentAppearance + marshal_size = marshal_size + _location.getMarshalledSize(); // _location + marshal_size = + marshal_size + _orientation.getMarshalledSize(); // _orientation + marshal_size = marshal_size + 2; // _segmentLength + marshal_size = marshal_size + 2; // _segmentWidth + marshal_size = marshal_size + 2; // _segmentHeight + marshal_size = marshal_size + 2; // _segmentDepth + marshal_size = marshal_size + 4; // _pad1 + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/LinearSegmentParameter.h b/src/dis6/synthetic_environment/LinearSegmentParameter.h index a6a4caa5..dccb9490 100644 --- a/src/dis6/synthetic_environment/LinearSegmentParameter.h +++ b/src/dis6/synthetic_environment/LinearSegmentParameter.h @@ -1,9 +1,8 @@ #pragma once -#include "dis6/Orientation.h" -#include "dis6/SixByteChunk.h" -#include "dis6/Vector3Double.h" - +#include "dis6/common/Orientation.h" +#include "dis6/common/SixByteChunk.h" +#include "dis6/common/Vector3Double.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -47,8 +46,8 @@ class LinearSegmentParameter { LinearSegmentParameter(); virtual ~LinearSegmentParameter(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint8_t getSegmentNumber() const; void setSegmentNumber(uint8_t pX); diff --git a/src/dis6/synthetic_environment/ObjectType.cpp b/src/dis6/synthetic_environment/ObjectType.cpp index 06863e9c..59a55645 100644 --- a/src/dis6/synthetic_environment/ObjectType.cpp +++ b/src/dis6/synthetic_environment/ObjectType.cpp @@ -1,11 +1,11 @@ -#include "dis6/ObjectType.h" +#include "dis6/synthetic_environment/ObjectType.h" using namespace DIS; ObjectType::ObjectType() : _entityKind(0), _domain(0), _country(0), _category(0), _subcategory(0) {} -ObjectType::~ObjectType() {} +ObjectType::~ObjectType() = default; uint8_t ObjectType::getEntityKind() const { return _entityKind; } @@ -27,7 +27,7 @@ uint8_t ObjectType::getSubcategory() const { return _subcategory; } void ObjectType::setSubcategory(uint8_t pX) { _subcategory = pX; } -void ObjectType::marshal(DataStream& dataStream) const { +void ObjectType::Marshal(DataStream& dataStream) const { dataStream << _entityKind; dataStream << _domain; dataStream << _country; @@ -35,7 +35,7 @@ void ObjectType::marshal(DataStream& dataStream) const { dataStream << _subcategory; } -void ObjectType::unmarshal(DataStream& dataStream) { +void ObjectType::Unmarshal(DataStream& dataStream) { dataStream >> _entityKind; dataStream >> _domain; dataStream >> _country; @@ -44,26 +44,36 @@ void ObjectType::unmarshal(DataStream& dataStream) { } bool ObjectType::operator==(const ObjectType& rhs) const { - bool ivarsEqual = true; - - if (!(_entityKind == rhs._entityKind)) ivarsEqual = false; - if (!(_domain == rhs._domain)) ivarsEqual = false; - if (!(_country == rhs._country)) ivarsEqual = false; - if (!(_category == rhs._category)) ivarsEqual = false; - if (!(_subcategory == rhs._subcategory)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(_entityKind == rhs._entityKind)) { + ivars_equal = false; + } + if (!(_domain == rhs._domain)) { + ivars_equal = false; + } + if (!(_country == rhs._country)) { + ivars_equal = false; + } + if (!(_category == rhs._category)) { + ivars_equal = false; + } + if (!(_subcategory == rhs._subcategory)) { + ivars_equal = false; + } + + return ivars_equal; } int ObjectType::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _entityKind - marshalSize = marshalSize + 1; // _domain - marshalSize = marshalSize + 2; // _country - marshalSize = marshalSize + 1; // _category - marshalSize = marshalSize + 1; // _subcategory - return marshalSize; + int marshal_size = 0; + + marshal_size = marshal_size + 1; // _entityKind + marshal_size = marshal_size + 1; // _domain + marshal_size = marshal_size + 2; // _country + marshal_size = marshal_size + 1; // _category + marshal_size = marshal_size + 1; // _subcategory + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/ObjectType.h b/src/dis6/synthetic_environment/ObjectType.h index 85f45814..980e253f 100644 --- a/src/dis6/synthetic_environment/ObjectType.h +++ b/src/dis6/synthetic_environment/ObjectType.h @@ -1,11 +1,10 @@ #pragma once - #include "dis6/utils/DataStream.h" namespace DIS { -// Identifies type of object. This is a int16_ter version of EntityType that omits -// the specific and extra fields. +// Identifies type of object. This is a int16_ter version of EntityType that +// omits the specific and extra fields. // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All // rights reserved. @@ -33,8 +32,8 @@ class ObjectType { ObjectType(); virtual ~ObjectType(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); uint8_t getEntityKind() const; void setEntityKind(uint8_t pX); diff --git a/src/dis6/synthetic_environment/PointObjectStatePdu.cpp b/src/dis6/synthetic_environment/PointObjectStatePdu.cpp index 3605b7b6..61b7ab44 100644 --- a/src/dis6/synthetic_environment/PointObjectStatePdu.cpp +++ b/src/dis6/synthetic_environment/PointObjectStatePdu.cpp @@ -1,63 +1,53 @@ -#include "dis6/PointObjectStatePdu.h" +#include "dis6/synthetic_environment/PointObjectStatePdu.h" using namespace DIS; PointObjectStatePdu::PointObjectStatePdu() - : SyntheticEnvironmentFamilyPdu(), - _objectID(), - _referencedObjectID(), - _updateNumber(0), + : _updateNumber(0), _forceID(0), _modifications(0), - _objectType(), - _objectLocation(), - _objectOrientation(), + _objectAppearance(0.0), - _requesterID(), - _receivingID(), + _pad2(0) { - setPduType(43); + SetPduType(43); } -PointObjectStatePdu::~PointObjectStatePdu() {} +PointObjectStatePdu::~PointObjectStatePdu() = default; -EntityID& PointObjectStatePdu::getObjectID() { return _objectID; } +dis::EntityID& PointObjectStatePdu::getObjectID() { return _objectID; } -const EntityID& PointObjectStatePdu::getObjectID() const { return _objectID; } +const dis::EntityID& PointObjectStatePdu::getObjectID() const { + return _objectID; +} -void PointObjectStatePdu::setObjectID(const EntityID& pX) { _objectID = pX; } +void PointObjectStatePdu::setObjectID(const dis::EntityID& pX) { + _objectID = pX; +} -EntityID& PointObjectStatePdu::getReferencedObjectID() { +dis::EntityID& PointObjectStatePdu::getReferencedObjectID() { return _referencedObjectID; } -const EntityID& PointObjectStatePdu::getReferencedObjectID() const { +const dis::EntityID& PointObjectStatePdu::getReferencedObjectID() const { return _referencedObjectID; } -void PointObjectStatePdu::setReferencedObjectID(const EntityID& pX) { +void PointObjectStatePdu::setReferencedObjectID(const dis::EntityID& pX) { _referencedObjectID = pX; } -uint16_t PointObjectStatePdu::getUpdateNumber() const { - return _updateNumber; -} +uint16_t PointObjectStatePdu::getUpdateNumber() const { return _updateNumber; } -void PointObjectStatePdu::setUpdateNumber(uint16_t pX) { - _updateNumber = pX; -} +void PointObjectStatePdu::setUpdateNumber(uint16_t pX) { _updateNumber = pX; } uint8_t PointObjectStatePdu::getForceID() const { return _forceID; } void PointObjectStatePdu::setForceID(uint8_t pX) { _forceID = pX; } -uint8_t PointObjectStatePdu::getModifications() const { - return _modifications; -} +uint8_t PointObjectStatePdu::getModifications() const { return _modifications; } -void PointObjectStatePdu::setModifications(uint8_t pX) { - _modifications = pX; -} +void PointObjectStatePdu::setModifications(uint8_t pX) { _modifications = pX; } ObjectType& PointObjectStatePdu::getObjectType() { return _objectType; } @@ -132,7 +122,7 @@ void PointObjectStatePdu::setPad2(uint32_t pX) { _pad2 = pX; } void PointObjectStatePdu::marshal(DataStream& dataStream) const { SyntheticEnvironmentFamilyPdu::marshal( dataStream); // Marshal information in superclass first - _objectID.marshal(dataStream); + _objectID.Marshal(dataStream); _referencedObjectID.marshal(dataStream); dataStream << _updateNumber; dataStream << _forceID; @@ -164,46 +154,73 @@ void PointObjectStatePdu::unmarshal(DataStream& dataStream) { } bool PointObjectStatePdu::operator==(const PointObjectStatePdu& rhs) const { - bool ivarsEqual = true; - - ivarsEqual = SyntheticEnvironmentFamilyPdu::operator==(rhs); - - if (!(_objectID == rhs._objectID)) ivarsEqual = false; - if (!(_referencedObjectID == rhs._referencedObjectID)) ivarsEqual = false; - if (!(_updateNumber == rhs._updateNumber)) ivarsEqual = false; - if (!(_forceID == rhs._forceID)) ivarsEqual = false; - if (!(_modifications == rhs._modifications)) ivarsEqual = false; - if (!(_objectType == rhs._objectType)) ivarsEqual = false; - if (!(_objectLocation == rhs._objectLocation)) ivarsEqual = false; - if (!(_objectOrientation == rhs._objectOrientation)) ivarsEqual = false; - if (!(_objectAppearance == rhs._objectAppearance)) ivarsEqual = false; - if (!(_requesterID == rhs._requesterID)) ivarsEqual = false; - if (!(_receivingID == rhs._receivingID)) ivarsEqual = false; - if (!(_pad2 == rhs._pad2)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + ivars_equal = SyntheticEnvironmentFamilyPdu::operator==(rhs); + + if (!(_objectID == rhs._objectID)) { + ivars_equal = false; + } + if (!(_referencedObjectID == rhs._referencedObjectID)) { + ivars_equal = false; + } + if (!(_updateNumber == rhs._updateNumber)) { + ivars_equal = false; + } + if (!(_forceID == rhs._forceID)) { + ivars_equal = false; + } + if (!(_modifications == rhs._modifications)) { + ivars_equal = false; + } + if (!(_objectType == rhs._objectType)) { + ivars_equal = false; + } + if (!(_objectLocation == rhs._objectLocation)) { + ivars_equal = false; + } + if (!(_objectOrientation == rhs._objectOrientation)) { + ivars_equal = false; + } + if (!(_objectAppearance == rhs._objectAppearance)) { + ivars_equal = false; + } + if (!(_requesterID == rhs._requesterID)) { + ivars_equal = false; + } + if (!(_receivingID == rhs._receivingID)) { + ivars_equal = false; + } + if (!(_pad2 == rhs._pad2)) { + ivars_equal = false; + } + + return ivars_equal; } int PointObjectStatePdu::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); - marshalSize = marshalSize + _objectID.getMarshalledSize(); // _objectID - marshalSize = marshalSize + - _referencedObjectID.getMarshalledSize(); // _referencedObjectID - marshalSize = marshalSize + 2; // _updateNumber - marshalSize = marshalSize + 1; // _forceID - marshalSize = marshalSize + 1; // _modifications - marshalSize = marshalSize + _objectType.getMarshalledSize(); // _objectType - marshalSize = - marshalSize + _objectLocation.getMarshalledSize(); // _objectLocation - marshalSize = marshalSize + - _objectOrientation.getMarshalledSize(); // _objectOrientation - marshalSize = marshalSize + 8; // _objectAppearance - marshalSize = marshalSize + _requesterID.getMarshalledSize(); // _requesterID - marshalSize = marshalSize + _receivingID.getMarshalledSize(); // _receivingID - marshalSize = marshalSize + 4; // _pad2 - return marshalSize; + int marshal_size = 0; + + marshal_size = SyntheticEnvironmentFamilyPdu::getMarshalledSize(); + marshal_size = marshal_size + _objectID.getMarshalledSize(); // _objectID + marshal_size = + marshal_size + + _referencedObjectID.getMarshalledSize(); // _referencedObjectID + marshal_size = marshal_size + 2; // _updateNumber + marshal_size = marshal_size + 1; // _forceID + marshal_size = marshal_size + 1; // _modifications + marshal_size = marshal_size + _objectType.getMarshalledSize(); // _objectType + marshal_size = + marshal_size + _objectLocation.getMarshalledSize(); // _objectLocation + marshal_size = marshal_size + + _objectOrientation.getMarshalledSize(); // _objectOrientation + marshal_size = marshal_size + 8; // _objectAppearance + marshal_size = + marshal_size + _requesterID.getMarshalledSize(); // _requesterID + marshal_size = + marshal_size + _receivingID.getMarshalledSize(); // _receivingID + marshal_size = marshal_size + 4; // _pad2 + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/PointObjectStatePdu.h b/src/dis6/synthetic_environment/PointObjectStatePdu.h index f58a133d..4b78704c 100644 --- a/src/dis6/synthetic_environment/PointObjectStatePdu.h +++ b/src/dis6/synthetic_environment/PointObjectStatePdu.h @@ -1,12 +1,11 @@ #pragma once -#include "dis6/EntityID.h" -#include "dis6/ObjectType.h" -#include "dis6/Orientation.h" -#include "dis6/SimulationAddress.h" -#include "dis6/SyntheticEnvironmentFamilyPdu.h" -#include "dis6/Vector3Double.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/Orientation.h" +#include "dis6/common/SimulationAddress.h" +#include "dis6/common/Vector3Double.h" +#include "dis6/synthetic_environment/ObjectType.h" +#include "dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -19,14 +18,13 @@ namespace DIS { // // @author DMcG, jkg -class PointObjectStatePdu - : public SyntheticEnvironmentFamilyPdu { +class PointObjectStatePdu : public SyntheticEnvironmentFamilyPdu { protected: /** Object in synthetic environment */ - EntityID _objectID; + dis::EntityID _objectID; /** Object with which this point object is associated */ - EntityID _referencedObjectID; + dis::EntityID _referencedObjectID; /** unique update number of each state transition of an object */ uint16_t _updateNumber; @@ -62,16 +60,16 @@ class PointObjectStatePdu PointObjectStatePdu(); virtual ~PointObjectStatePdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); - EntityID& getObjectID(); - const EntityID& getObjectID() const; - void setObjectID(const EntityID& pX); + dis::EntityID& getObjectID(); + const dis::EntityID& getObjectID() const; + void setObjectID(const dis::EntityID& pX); - EntityID& getReferencedObjectID(); - const EntityID& getReferencedObjectID() const; - void setReferencedObjectID(const EntityID& pX); + dis::EntityID& getReferencedObjectID(); + const dis::EntityID& getReferencedObjectID() const; + void setReferencedObjectID(const dis::EntityID& pX); uint16_t getUpdateNumber() const; void setUpdateNumber(uint16_t pX); diff --git a/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp index b937921b..64df9165 100644 --- a/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp +++ b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.cpp @@ -1,38 +1,37 @@ -#include "dis6/SyntheticEnvironmentFamilyPdu.h" +#include "dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h" using namespace DIS; SyntheticEnvironmentFamilyPdu::SyntheticEnvironmentFamilyPdu() - : Pdu() { - setProtocolFamily(9); + SetProtocolFamily(9); } -SyntheticEnvironmentFamilyPdu::~SyntheticEnvironmentFamilyPdu() {} +SyntheticEnvironmentFamilyPdu::~SyntheticEnvironmentFamilyPdu() = default; -void SyntheticEnvironmentFamilyPdu::marshal(DataStream& dataStream) const { - Pdu::marshal(dataStream); // Marshal information in superclass first +static void SyntheticEnvironmentFamilyPdu::Marshal(DataStream& dataStream) { + Pdu::marshal(data_stream); // Marshal information in superclass first } -void SyntheticEnvironmentFamilyPdu::unmarshal(DataStream& dataStream) { - Pdu::unmarshal(dataStream); // unmarshal information in superclass first +static void SyntheticEnvironmentFamilyPdu::Unmarshal(DataStream& dataStream) { + Pdu::unmarshal(data_stream); // unmarshal information in superclass first } bool SyntheticEnvironmentFamilyPdu::operator==( const SyntheticEnvironmentFamilyPdu& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - ivarsEqual = Pdu::operator==(rhs); + ivars_equal = Pdu::operator==(rhs); - return ivarsEqual; + return ivars_equal; } -int SyntheticEnvironmentFamilyPdu::getMarshalledSize() const { - int marshalSize = 0; +int SyntheticEnvironmentFamilyPdu::GetMarshalledSize() const { + int marshal_size = 0; - marshalSize = Pdu::getMarshalledSize(); - return marshalSize; + marshal_size = getMarshalledSize(); + return marshal_size; } // Copyright (c) 1995-2009 held by the author(s). All rights reserved. diff --git a/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h index e88ab954..ea1ab01f 100644 --- a/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h +++ b/src/dis6/synthetic_environment/SyntheticEnvironmentFamilyPdu.h @@ -1,7 +1,6 @@ #pragma once -#include "dis6/Pdu.h" - +#include "dis6/common/Pdu.h" #include "dis6/utils/DataStream.h" namespace DIS { @@ -12,14 +11,14 @@ namespace DIS { // // @author DMcG, jkg -class SyntheticEnvironmentFamilyPdu : public Pdu { +class SyntheticEnvironmentFamilyPdu : public dis::Pdu { protected: public: SyntheticEnvironmentFamilyPdu(); virtual ~SyntheticEnvironmentFamilyPdu(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + virtual void marshal(dis::DataStream& dataStream) const; + virtual void unmarshal(dis::DataStream& dataStream); virtual int getMarshalledSize() const; diff --git a/src/dis6/utils/Conversion.cpp b/src/dis6/utils/Conversion.cpp index 212c1ff1..7ca83068 100644 --- a/src/dis6/utils/Conversion.cpp +++ b/src/dis6/utils/Conversion.cpp @@ -4,9 +4,6 @@ namespace dis { -// const uint8_t -// Convert::ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5; - int Convert::MakeArticulationParameterType(int typeclass, int typemetric) { // enforce a ceiling on typemetric typemetric = typemetric & kArticulationParameterTypeMetricMask; From 98953a19d724fcc6b73005d757beff69c3ca4796 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Mon, 22 Jan 2024 15:26:04 -0600 Subject: [PATCH 20/22] Distributed emissions cleanup --- src/dis6/common/EventID.cpp | 5 +- src/dis6/common/EventID.h | 5 +- src/dis6/common/Vector3Double.cpp | 45 +++--- src/dis6/common/Vector3Double.h | 29 ++-- src/dis6/common/Vector3Float.cpp | 47 +++--- src/dis6/common/Vector3Float.h | 37 +++-- .../AcousticBeamData.cpp | 100 +++++++------ .../distributed_emissions/AcousticBeamData.h | 29 ++-- .../AcousticBeamFundamentalParameter.cpp | 140 ++++++++++-------- .../AcousticBeamFundamentalParameter.h | 49 +++--- .../distributed_emissions/AcousticEmitter.cpp | 77 +++++----- .../distributed_emissions/AcousticEmitter.h | 25 ++-- .../AcousticEmitterSystem.cpp | 83 ++++++----- .../AcousticEmitterSystem.h | 14 +- .../AcousticEmitterSystemData.cpp | 7 +- src/dis6/distributed_emissions/ApaData.cpp | 9 +- src/dis6/distributed_emissions/ApaData.h | 8 +- src/dis6/distributed_emissions/BeamData.cpp | 7 +- .../distributed_emissions/DesignatorPdu.cpp | 80 +++++----- .../distributed_emissions/DesignatorPdu.h | 92 ++++++------ .../DistributedEmissionsFamilyPdu.h | 8 +- .../ElectromagneticEmissionBeamData.cpp | 10 +- .../ElectromagneticEmissionBeamData.h | 9 +- .../ElectromagneticEmissionSystemData.cpp | 10 +- .../ElectromagneticEmissionSystemData.h | 7 +- .../ElectromagneticEmissionsPdu.cpp | 6 +- .../ElectromagneticEmissionsPdu.h | 18 +-- .../distributed_emissions/EmitterSystem.cpp | 16 +- .../distributed_emissions/EmitterSystem.h | 8 +- .../FundamentalParameterData.cpp | 9 +- .../FundamentalParameterData.h | 7 +- .../FundamentalParameterDataIff.cpp | 9 +- .../FundamentalParameterDataIff.h | 13 +- .../IffAtcNavAidsLayer1Pdu.cpp | 9 +- .../IffAtcNavAidsLayer1Pdu.h | 26 ++-- .../IffAtcNavAidsLayer2Pdu.cpp | 10 +- .../IffAtcNavAidsLayer2Pdu.h | 22 ++- .../IffFundamentalData.cpp | 15 +- .../IffFundamentalData.h | 5 +- .../distributed_emissions/LayerHeader.cpp | 9 +- src/dis6/distributed_emissions/LayerHeader.h | 11 +- .../PropulsionSystemData.cpp | 9 +- .../PropulsionSystemData.h | 7 +- src/dis6/distributed_emissions/SeesPdu.cpp | 18 +-- src/dis6/distributed_emissions/SeesPdu.h | 17 +-- src/dis6/distributed_emissions/ShaftRPMs.cpp | 7 +- src/dis6/distributed_emissions/ShaftRPMs.h | 13 +- src/dis6/distributed_emissions/SystemID.cpp | 7 +- src/dis6/distributed_emissions/SystemID.h | 5 +- .../distributed_emissions/TrackJamTarget.cpp | 10 +- .../distributed_emissions/TrackJamTarget.h | 15 +- .../UnderwaterAcousticsPdu.cpp | 5 +- .../UnderwaterAcousticsPdu.h | 28 ++-- .../VectoringNozzleSystemData.cpp | 7 +- .../VectoringNozzleSystemData.h | 13 +- 55 files changed, 638 insertions(+), 648 deletions(-) diff --git a/src/dis6/common/EventID.cpp b/src/dis6/common/EventID.cpp index 96e9d17d..3f92c782 100644 --- a/src/dis6/common/EventID.cpp +++ b/src/dis6/common/EventID.cpp @@ -1,7 +1,6 @@ #include "dis6/common/EventID.h" -using namespace DIS; - +namespace dis { EventID::EventID() : _site(0), _application(0), _eventNumber(0) {} EventID::~EventID() = default; @@ -55,6 +54,8 @@ int EventID::getMarshalledSize() const { return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/EventID.h b/src/dis6/common/EventID.h index 5765c0bd..4565c27b 100644 --- a/src/dis6/common/EventID.h +++ b/src/dis6/common/EventID.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.18. Identifies a unique event in a simulation via the combination // of three values @@ -43,7 +42,7 @@ class EventID { bool operator==(const EventID& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/Vector3Double.cpp b/src/dis6/common/Vector3Double.cpp index 412b44f9..5c8aac71 100644 --- a/src/dis6/common/Vector3Double.cpp +++ b/src/dis6/common/Vector3Double.cpp @@ -1,60 +1,61 @@ #include "dis6/common/Vector3Double.h" -using namespace DIS; - -Vector3Double::Vector3Double() : _x(0.0), _y(0.0), _z(0.0) {} +namespace dis { +Vector3Double::Vector3Double() : x_(0.0), y_(0.0), z_(0.0) {} Vector3Double::~Vector3Double() = default; -double Vector3Double::getX() const { return _x; } +double Vector3Double::GetX() const { return x_; } -void Vector3Double::setX(double pX) { _x = pX; } +void Vector3Double::SetX(double pX) { x_ = pX; } -double Vector3Double::getY() const { return _y; } +double Vector3Double::GetY() const { return y_; } -void Vector3Double::setY(double pX) { _y = pX; } +void Vector3Double::SetY(double pX) { y_ = pX; } -double Vector3Double::getZ() const { return _z; } +double Vector3Double::GetZ() const { return z_; } -void Vector3Double::setZ(double pX) { _z = pX; } +void Vector3Double::SetZ(double pX) { z_ = pX; } void Vector3Double::Marshal(DataStream& dataStream) const { - dataStream << _x; - dataStream << _y; - dataStream << _z; + dataStream << x_; + dataStream << y_; + dataStream << z_; } void Vector3Double::Unmarshal(DataStream& dataStream) { - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; + dataStream >> x_; + dataStream >> y_; + dataStream >> z_; } bool Vector3Double::operator==(const Vector3Double& rhs) const { bool ivars_equal = true; - if (!(_x == rhs._x)) { + if (!(x_ == rhs.x_)) { ivars_equal = false; } - if (!(_y == rhs._y)) { + if (!(y_ == rhs.y_)) { ivars_equal = false; } - if (!(_z == rhs._z)) { + if (!(z_ == rhs.z_)) { ivars_equal = false; } return ivars_equal; } -int Vector3Double::getMarshalledSize() const { +int Vector3Double::GetMarshalledSize() { int marshal_size = 0; - marshal_size = marshal_size + 8; // _x - marshal_size = marshal_size + 8; // _y - marshal_size = marshal_size + 8; // _z + marshal_size = marshal_size + 8; // x_ + marshal_size = marshal_size + 8; // y_ + marshal_size = marshal_size + 8; // z_ return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/Vector3Double.h b/src/dis6/common/Vector3Double.h index f4366780..c0b0d3dc 100644 --- a/src/dis6/common/Vector3Double.h +++ b/src/dis6/common/Vector3Double.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.34. Three double precision floating point values, x, y, and z // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -14,35 +13,35 @@ namespace DIS { class Vector3Double { protected: /** X value */ - double _x; + double x_; // NOLINT /** Y value */ - double _y; + double y_; // NOLINT /** Z value */ - double _z; + double z_; // NOLINT public: Vector3Double(); virtual ~Vector3Double(); - virtual void marshal(dis::DataStream& dataStream) const; - virtual void unmarshal(dis::DataStream& dataStream); + virtual void Marshal(DataStream& dataStream) const; + virtual void Unmarshal(DataStream& dataStream); - double getX() const; - void setX(double pX); + [[nodiscard]] double GetX() const; + void SetX(double pX); - double getY() const; - void setY(double pX); + [[nodiscard]] double GetY() const; + void SetY(double pX); - double getZ() const; - void setZ(double pX); + [[nodiscard]] double GetZ() const; + void SetZ(double pX); - virtual int getMarshalledSize() const; + [[nodiscard]] static int GetMarshalledSize(); bool operator==(const Vector3Double& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/common/Vector3Float.cpp b/src/dis6/common/Vector3Float.cpp index 5bbf39de..d852ca7a 100644 --- a/src/dis6/common/Vector3Float.cpp +++ b/src/dis6/common/Vector3Float.cpp @@ -1,60 +1,59 @@ #include "dis6/common/Vector3Float.h" -using namespace DIS; +namespace dis { +Vector3Float::Vector3Float() : x_(0.0), y_(0.0), z_(0.0) {} -Vector3Float::Vector3Float() : _x(0.0), _y(0.0), _z(0.0) {} +float Vector3Float::GetX() const { return x_; } -Vector3Float::~Vector3Float() = default; +void Vector3Float::SetX(float pX) { x_ = pX; } -float Vector3Float::getX() const { return _x; } +float Vector3Float::GetY() const { return y_; } -void Vector3Float::setX(float pX) { _x = pX; } +void Vector3Float::SetY(float pX) { y_ = pX; } -float Vector3Float::getY() const { return _y; } +float Vector3Float::GetZ() const { return z_; } -void Vector3Float::setY(float pX) { _y = pX; } - -float Vector3Float::getZ() const { return _z; } - -void Vector3Float::setZ(float pX) { _z = pX; } +void Vector3Float::SetZ(float pX) { z_ = pX; } void Vector3Float::Marshal(DataStream& dataStream) const { - dataStream << _x; - dataStream << _y; - dataStream << _z; + dataStream << x_; + dataStream << y_; + dataStream << z_; } void Vector3Float::Unmarshal(DataStream& dataStream) { - dataStream >> _x; - dataStream >> _y; - dataStream >> _z; + dataStream >> x_; + dataStream >> y_; + dataStream >> z_; } bool Vector3Float::operator==(const Vector3Float& rhs) const { bool ivars_equal = true; - if (!(_x == rhs._x)) { + if (!(x_ == rhs.x_)) { ivars_equal = false; } - if (!(_y == rhs._y)) { + if (!(y_ == rhs.y_)) { ivars_equal = false; } - if (!(_z == rhs._z)) { + if (!(z_ == rhs.z_)) { ivars_equal = false; } return ivars_equal; } -int Vector3Float::getMarshalledSize() const { +int Vector3Float::GetMarshalledSize() { int marshal_size = 0; - marshal_size = marshal_size + 4; // _x - marshal_size = marshal_size + 4; // _y - marshal_size = marshal_size + 4; // _z + marshal_size = marshal_size + 4; // x_ + marshal_size = marshal_size + 4; // y_ + marshal_size = marshal_size + 4; // z_ return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/Vector3Float.h b/src/dis6/common/Vector3Float.h index 270a5954..ec6e54e2 100644 --- a/src/dis6/common/Vector3Float.h +++ b/src/dis6/common/Vector3Float.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.33. Three floating point values, x, y, and z // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -13,36 +12,36 @@ namespace DIS { class Vector3Float { protected: - /** X value */ - float _x; + /// X value + float x_; // NOLINT - /** y Value */ - float _y; + /// y value + float y_; // NOLINT - /** Z value */ - float _z; + /// Z value + float z_; // NOLINT public: Vector3Float(); - virtual ~Vector3Float(); + ~Vector3Float() = default; - virtual void marshal(dis::DataStream& dataStream) const; - virtual void unmarshal(dis::DataStream& dataStream); + void Marshal(dis::DataStream& dataStream) const; + void Unmarshal(dis::DataStream& dataStream); - float getX() const; - void setX(float pX); + [[nodiscard]] float GetX() const; + void SetX(float pX); - float getY() const; - void setY(float pX); + [[nodiscard]] float GetY() const; + void SetY(float pX); - float getZ() const; - void setZ(float pX); + [[nodiscard]] float GetZ() const; + void SetZ(float pX); - virtual int getMarshalledSize() const; + [[nodiscard]] static int GetMarshalledSize(); bool operator==(const Vector3Float& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/AcousticBeamData.cpp b/src/dis6/distributed_emissions/AcousticBeamData.cpp index d0bc2d69..18264bf7 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamData.cpp @@ -1,78 +1,84 @@ -#include "dis6/distribued_emissions/AcousticBeamData.h" +#include "dis6/distributed_emissions/AcousticBeamData.h" namespace dis { AcousticBeamData::AcousticBeamData() - : _beamDataLength(0), - _beamIDNumber(0), - _pad2(0), - _fundamentalDataParameters() {} + : beam_data_length_(0), beam_id_number_(0), pad2_(0) {} -AcousticBeamData::~AcousticBeamData() {} - -uint16_t AcousticBeamData::getBeamDataLength() const { return _beamDataLength; } +uint16_t AcousticBeamData::GetBeamDataLength() const { + return beam_data_length_; +} -void AcousticBeamData::setBeamDataLength(uint16_t pX) { _beamDataLength = pX; } +void AcousticBeamData::SetBeamDataLength(uint16_t pX) { + beam_data_length_ = pX; +} -uint8_t AcousticBeamData::getBeamIDNumber() const { return _beamIDNumber; } +uint8_t AcousticBeamData::GetBeamIdNumber() const { return beam_id_number_; } -void AcousticBeamData::setBeamIDNumber(uint8_t pX) { _beamIDNumber = pX; } +void AcousticBeamData::SetBeamIdNumber(uint8_t pX) { beam_id_number_ = pX; } -uint16_t AcousticBeamData::getPad2() const { return _pad2; } +uint16_t AcousticBeamData::GetPad2() const { return pad2_; } -void AcousticBeamData::setPad2(uint16_t pX) { _pad2 = pX; } +void AcousticBeamData::SetPad2(uint16_t pX) { pad2_ = pX; } AcousticBeamFundamentalParameter& -AcousticBeamData::getFundamentalDataParameters() { - return _fundamentalDataParameters; +AcousticBeamData::GetFundamentalDataParameters() { + return fundamental_data_parameters_; } const AcousticBeamFundamentalParameter& -AcousticBeamData::getFundamentalDataParameters() const { - return _fundamentalDataParameters; +AcousticBeamData::GetFundamentalDataParameters() const { + return fundamental_data_parameters_; } -void AcousticBeamData::setFundamentalDataParameters( +void AcousticBeamData::SetFundamentalDataParameters( const AcousticBeamFundamentalParameter& pX) { - _fundamentalDataParameters = pX; + fundamental_data_parameters_ = pX; } -void AcousticBeamData::marshal(DataStream& dataStream) const { - dataStream << _beamDataLength; - dataStream << _beamIDNumber; - dataStream << _pad2; - _fundamentalDataParameters.marshal(dataStream); +void AcousticBeamData::Marshal(DataStream& dataStream) const { + dataStream << beam_data_length_; + dataStream << beam_id_number_; + dataStream << pad2_; + fundamental_data_parameters_.Marshal(dataStream); } -void AcousticBeamData::unmarshal(DataStream& dataStream) { - dataStream >> _beamDataLength; - dataStream >> _beamIDNumber; - dataStream >> _pad2; - _fundamentalDataParameters.unmarshal(dataStream); +void AcousticBeamData::Unmarshal(DataStream& dataStream) { + dataStream >> beam_data_length_; + dataStream >> beam_id_number_; + dataStream >> pad2_; + fundamental_data_parameters_.Unmarshal(dataStream); } bool AcousticBeamData::operator==(const AcousticBeamData& rhs) const { - bool ivarsEqual = true; - - if (!(_beamDataLength == rhs._beamDataLength)) ivarsEqual = false; - if (!(_beamIDNumber == rhs._beamIDNumber)) ivarsEqual = false; - if (!(_pad2 == rhs._pad2)) ivarsEqual = false; - if (!(_fundamentalDataParameters == rhs._fundamentalDataParameters)) - ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (!(beam_data_length_ == rhs.beam_data_length_)) { + ivars_equal = false; + } + if (!(beam_id_number_ == rhs.beam_id_number_)) { + ivars_equal = false; + } + if (!(pad2_ == rhs.pad2_)) { + ivars_equal = false; + } + if (!(fundamental_data_parameters_ == rhs.fundamental_data_parameters_)) { + ivars_equal = false; + } + + return ivars_equal; } -int AcousticBeamData::getMarshalledSize() const { - int marshalSize = 0; +int AcousticBeamData::GetMarshalledSize() const { + int marshal_size = 0; - marshalSize = marshalSize + 2; // _beamDataLength - marshalSize = marshalSize + 1; // _beamIDNumber - marshalSize = marshalSize + 2; // _pad2 - marshalSize = - marshalSize + _fundamentalDataParameters - .getMarshalledSize(); // _fundamentalDataParameters - return marshalSize; + marshal_size = marshal_size + 2; // beam_data_length_ + marshal_size = marshal_size + 1; // beam_id_number_ + marshal_size = marshal_size + 2; // pad2_ + marshal_size = + marshal_size + fundamental_data_parameters_ + .GetMarshalledSize(); // fundamental_data_parameters_ + return marshal_size; } } // namespace dis diff --git a/src/dis6/distributed_emissions/AcousticBeamData.h b/src/dis6/distributed_emissions/AcousticBeamData.h index 76c7476c..f01881d1 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.h +++ b/src/dis6/distributed_emissions/AcousticBeamData.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICBEAMDATA_H_ +#define DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICBEAMDATA_H_ #include @@ -15,24 +16,24 @@ namespace dis { class AcousticBeamData { protected: - /** beam data length */ - uint16_t beam_data_length_; + /// beam data length + uint16_t beam_data_length_; // NOLINT - /** beamIDNumber */ - uint8_t beam_id_number_; + /// beamIDNumber + uint8_t beam_id_number_; // NOLINT - /** padding */ - uint16_t pad2_; + /// padding + uint16_t pad2_; // NOLINT - /** fundamental data parameters */ - AcousticBeamFundamentalParameter fundamental_data_parameters_; + /// fundamental data parameters + AcousticBeamFundamentalParameter fundamental_data_parameters_; // NOLINT public: AcousticBeamData(); - virtual ~AcousticBeamData(); + ~AcousticBeamData() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] uint16_t GetBeamDataLength() const; void SetBeamDataLength(uint16_t pX); @@ -48,7 +49,7 @@ class AcousticBeamData { GetFundamentalDataParameters() const; void SetFundamentalDataParameters(const AcousticBeamFundamentalParameter& pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] int GetMarshalledSize() const; bool operator==(const AcousticBeamData& rhs) const; }; @@ -84,3 +85,5 @@ class AcousticBeamData { // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. + +#endif // DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICBEAMDATA_H_ diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp index b2ba5b0b..dfe42db4 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp @@ -1,113 +1,123 @@ #include "dis6/distributed_emissions/AcousticBeamFundamentalParameter.h" -using namespace DIS; +namespace dis { -dis::AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter() +AcousticBeamFundamentalParameter::AcousticBeamFundamentalParameter() : active_emission_parameter_index_(0), scan_pattern_(0), beam_center_azimuth_(0.0), azimuthal_beamwidth_(0.0), - _beamCenterDE(0.0), + beam_center_de_(0.0), de_beamwidth_(0.0) {} -dis::AcousticBeamFundamentalParameter::~AcousticBeamFundamentalParameter() = - default; - -uint16_t -dis::AcousticBeamFundamentalParameter::GetActiveEmissionParameterIndex() { - return _activeEmissionParameterIndex; +uint16_t AcousticBeamFundamentalParameter::GetActiveEmissionParameterIndex() + const { + return active_emission_parameter_index_; } -void dis::AcousticBeamFundamentalParameter::SetActiveEmissionParameterIndex( +void AcousticBeamFundamentalParameter::SetActiveEmissionParameterIndex( uint16_t pX) { active_emission_parameter_index_ = pX; } -uint16_t dis::AcousticBeamFundamentalParameter::GetScanPattern() { - return _scanPattern; +uint16_t AcousticBeamFundamentalParameter::GetScanPattern() const { + return scan_pattern_; } -void dis::AcousticBeamFundamentalParameter::SetScanPattern(uint16_t pX) { +void AcousticBeamFundamentalParameter::SetScanPattern(uint16_t pX) { scan_pattern_ = pX; } -float dis::AcousticBeamFundamentalParameter::GetBeamCenterAzimuth() { - return _beamCenterAzimuth; +float AcousticBeamFundamentalParameter::GetBeamCenterAzimuth() const { + return beam_center_azimuth_; } -void dis::AcousticBeamFundamentalParameter::SetBeamCenterAzimuth(float pX) { +void AcousticBeamFundamentalParameter::SetBeamCenterAzimuth(float pX) { beam_center_azimuth_ = pX; } -float dis::AcousticBeamFundamentalParameter::GetAzimuthalBeamwidth() { - return _azimuthalBeamwidth; +float AcousticBeamFundamentalParameter::GetAzimuthalBeamwidth() const { + return azimuthal_beamwidth_; } -void dis::AcousticBeamFundamentalParameter::SetAzimuthalBeamwidth(float pX) { +void AcousticBeamFundamentalParameter::SetAzimuthalBeamwidth(float pX) { azimuthal_beamwidth_ = pX; } -float dis::AcousticBeamFundamentalParameter::GetBeamCenterDe() { - return _beamCenterDE; +float AcousticBeamFundamentalParameter::GetBeamCenterDe() const { + return beam_center_de_; } -void dis::AcousticBeamFundamentalParameter::SetBeamCenterDe(float pX) { - _beamCenterDE = pX; +void AcousticBeamFundamentalParameter::SetBeamCenterDe(float pX) { + beam_center_de_ = pX; } -float dis::AcousticBeamFundamentalParameter::GetDeBeamwidth() { - return _deBeamwidth; +float AcousticBeamFundamentalParameter::GetDeBeamwidth() const { + return de_beamwidth_; } -void dis::AcousticBeamFundamentalParameter::SetDeBeamwidth(float pX) { +void AcousticBeamFundamentalParameter::SetDeBeamwidth(float pX) { de_beamwidth_ = pX; } -void dis::AcousticBeamFundamentalParameter::Marshal( - DataStream& dataStream) const { - dataStream << (_activeEmissionParameterIndex != nullptr); - dataStream << _scanPattern; - dataStream << _beamCenterAzimuth; - dataStream << _azimuthalBeamwidth; - dataStream << _beamCenterDE; - dataStream << _deBeamwidth; +void AcousticBeamFundamentalParameter::Marshal(DataStream& dataStream) const { + dataStream << active_emission_parameter_index_; + dataStream << scan_pattern_; + dataStream << beam_center_azimuth_; + dataStream << azimuthal_beamwidth_; + dataStream << beam_center_de_; + dataStream << de_beamwidth_; } -void AcousticBeamFundamentalParameter::unmarshal(DataStream& dataStream) { - dataStream >> _activeEmissionParameterIndex; - dataStream >> _scanPattern; - dataStream >> _beamCenterAzimuth; - dataStream >> _azimuthalBeamwidth; - dataStream >> _beamCenterDE; - dataStream >> _deBeamwidth; +void AcousticBeamFundamentalParameter::Unmarshal(DataStream& dataStream) { + dataStream >> active_emission_parameter_index_; + dataStream >> scan_pattern_; + dataStream >> beam_center_azimuth_; + dataStream >> azimuthal_beamwidth_; + dataStream >> beam_center_de_; + dataStream >> de_beamwidth_; } bool AcousticBeamFundamentalParameter::operator==( const AcousticBeamFundamentalParameter& rhs) const { - bool ivarsEqual = true; - - if (!(_activeEmissionParameterIndex == rhs._activeEmissionParameterIndex)) - ivarsEqual = false; - if (!(_scanPattern == rhs._scanPattern)) ivarsEqual = false; - if (!(_beamCenterAzimuth == rhs._beamCenterAzimuth)) ivarsEqual = false; - if (!(_azimuthalBeamwidth == rhs._azimuthalBeamwidth)) ivarsEqual = false; - if (!(_beamCenterDE == rhs._beamCenterDE)) ivarsEqual = false; - if (!(_deBeamwidth == rhs._deBeamwidth)) ivarsEqual = false; - - return ivarsEqual; -} - -int AcousticBeamFundamentalParameter::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 2; // _activeEmissionParameterIndex - marshalSize = marshalSize + 2; // _scanPattern - marshalSize = marshalSize + 4; // _beamCenterAzimuth - marshalSize = marshalSize + 4; // _azimuthalBeamwidth - marshalSize = marshalSize + 4; // _beamCenterDE - marshalSize = marshalSize + 4; // _deBeamwidth - return marshalSize; -} + bool ivars_equal = true; + + if (active_emission_parameter_index_ != + rhs.active_emission_parameter_index_) { + ivars_equal = false; + } + if (scan_pattern_ != rhs.scan_pattern_) { + ivars_equal = false; + } + if (beam_center_azimuth_ != rhs.beam_center_azimuth_) { + ivars_equal = false; + } + if (azimuthal_beamwidth_ != rhs.azimuthal_beamwidth_) { + ivars_equal = false; + } + if (beam_center_de_ != rhs.beam_center_de_) { + ivars_equal = false; + } + if (de_beamwidth_ != rhs.de_beamwidth_) { + ivars_equal = false; + } + + return ivars_equal; +} + +int AcousticBeamFundamentalParameter::GetMarshalledSize() { + int marshal_size = 0; + + marshal_size = marshal_size + 2; // active_emission_parameter_index_ + marshal_size = marshal_size + 2; // scan_pattern_ + marshal_size = marshal_size + 4; // beam_center_azimuth_ + marshal_size = marshal_size + 4; // azimuthal_beamwidth_ + marshal_size = marshal_size + 4; // beam_center_de_ + marshal_size = marshal_size + 4; // de_beamwidth_ + return marshal_size; +} + +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h index 0a60bcb0..f30792eb 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICBEAMFUNDAMENTALPARAMETER_H_ +#define DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICBEAMFUNDAMENTALPARAMETER_H_ #include @@ -14,50 +15,50 @@ namespace dis { class AcousticBeamFundamentalParameter { protected: - /** parameter index */ - uint16_t active_emission_parameter_index_; + /// parameter index + uint16_t active_emission_parameter_index_; // NOLINT - /** scan pattern */ - uint16_t scan_pattern_; + /// scan pattern + uint16_t scan_pattern_; // NOLINT - /** beam center azimuth */ - float beam_center_azimuth_; + /// beam center azimuth + float beam_center_azimuth_; // NOLINT - /** azimuthal beamwidth */ - float azimuthal_beamwidth_; + /// azimuthal beamwidth + float azimuthal_beamwidth_; // NOLINT - /** beam center */ - float beam_center_de_; + /// beam center + float beam_center_de_; // NOLINT - /** DE beamwidth (vertical beamwidth) */ - float de_beamwidth_; + /// DE beamwidth (vertical beamwidth) + float de_beamwidth_; // NOLINT public: AcousticBeamFundamentalParameter(); - virtual ~AcousticBeamFundamentalParameter(); + ~AcousticBeamFundamentalParameter() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); - [[nodiscard]] static uint16_t GetActiveEmissionParameterIndex(); + [[nodiscard]] uint16_t GetActiveEmissionParameterIndex() const; void SetActiveEmissionParameterIndex(uint16_t pX); - [[nodiscard]] static uint16_t GetScanPattern(); + [[nodiscard]] uint16_t GetScanPattern() const; void SetScanPattern(uint16_t pX); - [[nodiscard]] static float GetBeamCenterAzimuth(); + [[nodiscard]] float GetBeamCenterAzimuth() const; void SetBeamCenterAzimuth(float pX); - [[nodiscard]] static float GetAzimuthalBeamwidth(); + [[nodiscard]] float GetAzimuthalBeamwidth() const; void SetAzimuthalBeamwidth(float pX); - [[nodiscard]] static float GetBeamCenterDe(); + [[nodiscard]] float GetBeamCenterDe() const; void SetBeamCenterDe(float pX); - [[nodiscard]] static float GetDeBeamwidth(); + [[nodiscard]] float GetDeBeamwidth() const; void SetDeBeamwidth(float pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] static int GetMarshalledSize(); bool operator==(const AcousticBeamFundamentalParameter& rhs) const; }; @@ -93,3 +94,5 @@ class AcousticBeamFundamentalParameter { // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. + +#endif // DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICBEAMFUNDAMENTALPARAMETER_H_ diff --git a/src/dis6/distributed_emissions/AcousticEmitter.cpp b/src/dis6/distributed_emissions/AcousticEmitter.cpp index 6be2188a..b0b2acb8 100644 --- a/src/dis6/distributed_emissions/AcousticEmitter.cpp +++ b/src/dis6/distributed_emissions/AcousticEmitter.cpp @@ -1,61 +1,64 @@ -#include "dis6/AcousticEmitter.h" - -using namespace DIS; +#include "dis6/distributed_emissions/AcousticEmitter.h" +namespace dis { AcousticEmitter::AcousticEmitter() - : _acousticName(0), _function(0), _acousticIdNumber(0) {} - -AcousticEmitter::~AcousticEmitter() {} + : acoustic_name_(0), function_(0), acoustic_id_number_(0) {} -uint16_t AcousticEmitter::getAcousticName() const { - return _acousticName; -} +uint16_t AcousticEmitter::GetAcousticName() const { return acoustic_name_; } -void AcousticEmitter::setAcousticName(uint16_t pX) { _acousticName = pX; } +void AcousticEmitter::SetAcousticName(uint16_t pX) { acoustic_name_ = pX; } -uint8_t AcousticEmitter::getFunction() const { return _function; } +uint8_t AcousticEmitter::GetFunction() const { return function_; } -void AcousticEmitter::setFunction(uint8_t pX) { _function = pX; } +void AcousticEmitter::SetFunction(uint8_t pX) { function_ = pX; } -uint8_t AcousticEmitter::getAcousticIdNumber() const { - return _acousticIdNumber; +uint8_t AcousticEmitter::GetAcousticIdNumber() const { + return acoustic_id_number_; } -void AcousticEmitter::setAcousticIdNumber(uint8_t pX) { - _acousticIdNumber = pX; +void AcousticEmitter::SetAcousticIdNumber(uint8_t pX) { + acoustic_id_number_ = pX; } -void AcousticEmitter::marshal(DataStream& dataStream) const { - dataStream << _acousticName; - dataStream << _function; - dataStream << _acousticIdNumber; +void AcousticEmitter::Marshal(DataStream& dataStream) const { + dataStream << acoustic_name_; + dataStream << function_; + dataStream << acoustic_id_number_; } -void AcousticEmitter::unmarshal(DataStream& dataStream) { - dataStream >> _acousticName; - dataStream >> _function; - dataStream >> _acousticIdNumber; +void AcousticEmitter::Unmarshal(DataStream& dataStream) { + dataStream >> acoustic_name_; + dataStream >> function_; + dataStream >> acoustic_id_number_; } bool AcousticEmitter::operator==(const AcousticEmitter& rhs) const { - bool ivarsEqual = true; - - if (!(_acousticName == rhs._acousticName)) ivarsEqual = false; - if (!(_function == rhs._function)) ivarsEqual = false; - if (!(_acousticIdNumber == rhs._acousticIdNumber)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (acoustic_name_ != rhs.acoustic_name_) { + ivars_equal = false; + } + if (function_ != rhs.function_) { + ivars_equal = false; + } + if (acoustic_id_number_ != rhs.acoustic_id_number_) { + ivars_equal = false; + } + + return ivars_equal; } -int AcousticEmitter::getMarshalledSize() const { - int marshalSize = 0; +int AcousticEmitter::GetMarshalledSize() { + int marshal_size = 0; - marshalSize = marshalSize + 2; // _acousticName - marshalSize = marshalSize + 1; // _function - marshalSize = marshalSize + 1; // _acousticIdNumber - return marshalSize; + marshal_size = marshal_size + 2; // acoustic_name_ + marshal_size = marshal_size + 1; // _function + marshal_size = marshal_size + 1; // acoustic_id_number_ + return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/AcousticEmitter.h b/src/dis6/distributed_emissions/AcousticEmitter.h index 1378a389..f4d7f989 100644 --- a/src/dis6/distributed_emissions/AcousticEmitter.h +++ b/src/dis6/distributed_emissions/AcousticEmitter.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICEMITTER_H_ +#define DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICEMITTER_H_ #include @@ -14,21 +15,21 @@ namespace dis { class AcousticEmitter { protected: - /** the system for a particular UA emitter, and an enumeration */ - uint16_t acoustic_name_; + /// the system for a particular UA emitter, and an enumeration + uint16_t acoustic_name_; // NOLINT - /** The function of the acoustic system */ - uint8_t function_; + /// The function of the acoustic system + uint8_t function_; // NOLINT - /** The UA emitter identification number relative to a specific system */ - uint8_t acoustic_id_number_; + /// The UA emitter identification number relative to a specific system + uint8_t acoustic_id_number_; // NOLINT public: AcousticEmitter(); - virtual ~AcousticEmitter(); + ~AcousticEmitter() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] uint16_t GetAcousticName() const; void SetAcousticName(uint16_t pX); @@ -39,7 +40,7 @@ class AcousticEmitter { [[nodiscard]] uint8_t GetAcousticIdNumber() const; void SetAcousticIdNumber(uint8_t pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] static int GetMarshalledSize(); bool operator==(const AcousticEmitter& rhs) const; }; @@ -75,3 +76,5 @@ class AcousticEmitter { // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. + +#endif // DIS6_DISTRIBUTED_EMISSIONS_ACOUSTICEMITTER_H_ diff --git a/src/dis6/distributed_emissions/AcousticEmitterSystem.cpp b/src/dis6/distributed_emissions/AcousticEmitterSystem.cpp index 3e3511dc..5111bbff 100644 --- a/src/dis6/distributed_emissions/AcousticEmitterSystem.cpp +++ b/src/dis6/distributed_emissions/AcousticEmitterSystem.cpp @@ -1,67 +1,68 @@ -#include "dis6/AcousticEmitterSystem.h" - -using namespace DIS; +#include "dis6/distributed_emissions/AcousticEmitterSystem.h" +namespace dis { AcousticEmitterSystem::AcousticEmitterSystem() - : _acousticName(0), _acousticFunction(0), _acousticID(0) {} - -AcousticEmitterSystem::~AcousticEmitterSystem() {} + : acoustic_name_(0), acoustic_function_(0), acoustic_id_(0) {} -uint16_t AcousticEmitterSystem::getAcousticName() const { - return _acousticName; +uint16_t AcousticEmitterSystem::GetAcousticName() const { + return acoustic_name_; } -void AcousticEmitterSystem::setAcousticName(uint16_t pX) { - _acousticName = pX; +void AcousticEmitterSystem::SetAcousticName(uint16_t pX) { + acoustic_name_ = pX; } -uint8_t AcousticEmitterSystem::getAcousticFunction() const { - return _acousticFunction; +uint8_t AcousticEmitterSystem::GetAcousticFunction() const { + return acoustic_function_; } -void AcousticEmitterSystem::setAcousticFunction(uint8_t pX) { - _acousticFunction = pX; +void AcousticEmitterSystem::SetAcousticFunction(uint8_t pX) { + acoustic_function_ = pX; } -uint8_t AcousticEmitterSystem::getAcousticID() const { - return _acousticID; -} +uint8_t AcousticEmitterSystem::GetAcousticId() const { return acoustic_id_; } -void AcousticEmitterSystem::setAcousticID(uint8_t pX) { - _acousticID = pX; -} +void AcousticEmitterSystem::SetAcousticId(uint8_t pX) { acoustic_id_ = pX; } -void AcousticEmitterSystem::marshal(DataStream& dataStream) const { - dataStream << _acousticName; - dataStream << _acousticFunction; - dataStream << _acousticID; +void AcousticEmitterSystem::Marshal(DataStream& dataStream) const { + dataStream << acoustic_name_; + dataStream << acoustic_function_; + dataStream << acoustic_id_; } -void AcousticEmitterSystem::unmarshal(DataStream& dataStream) { - dataStream >> _acousticName; - dataStream >> _acousticFunction; - dataStream >> _acousticID; +void AcousticEmitterSystem::Unmarshal(DataStream& dataStream) { + dataStream >> acoustic_name_; + dataStream >> acoustic_function_; + dataStream >> acoustic_id_; } bool AcousticEmitterSystem::operator==(const AcousticEmitterSystem& rhs) const { - bool ivarsEqual = true; - - if (!(_acousticName == rhs._acousticName)) ivarsEqual = false; - if (!(_acousticFunction == rhs._acousticFunction)) ivarsEqual = false; - if (!(_acousticID == rhs._acousticID)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (acoustic_name_ != rhs.acoustic_name_) { + ivars_equal = false; + } + if (acoustic_function_ != rhs.acoustic_function_) { + ivars_equal = false; + } + if (acoustic_id_ != rhs.acoustic_id_) { + ivars_equal = false; + } + + return ivars_equal; } -int AcousticEmitterSystem::getMarshalledSize() const { - int marshalSize = 0; +int AcousticEmitterSystem::GetMarshalledSize() { + int marshal_size = 0; - marshalSize = marshalSize + 2; // _acousticName - marshalSize = marshalSize + 1; // _acousticFunction - marshalSize = marshalSize + 1; // _acousticID - return marshalSize; + marshal_size = marshal_size + 2; // acoustic_name_ + marshal_size = marshal_size + 1; // acoustic_function_ + marshal_size = marshal_size + 1; // acoustic_id_ + return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/AcousticEmitterSystem.h b/src/dis6/distributed_emissions/AcousticEmitterSystem.h index 284fdcdf..5d5888e3 100644 --- a/src/dis6/distributed_emissions/AcousticEmitterSystem.h +++ b/src/dis6/distributed_emissions/AcousticEmitterSystem.h @@ -17,10 +17,10 @@ namespace dis { class AcousticEmitterSystem { protected: /** This field shall specify the system for a particular UA emitter. */ - uint16_t acoustic_name_; + uint16_t acoustic_name_; // NOLINT /** This field shall describe the function of the acoustic system. */ - uint8_t acoustic_function_; + uint8_t acoustic_function_; // NOLINT /** This field shall specify the UA emitter identification number relative to * a specific system. This field shall be represented by an 8-bit unsigned @@ -28,14 +28,14 @@ class AcousticEmitterSystem { * entity, even if in some instances two or more of the systems may be * identical UA emitter types. Numbering of systems shall begin with the * value 1. */ - uint8_t acoustic_id_; + uint8_t acoustic_id_; // NOLINT public: AcousticEmitterSystem(); - virtual ~AcousticEmitterSystem(); + ~AcousticEmitterSystem() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] uint16_t GetAcousticName() const; void SetAcousticName(uint16_t pX); @@ -46,7 +46,7 @@ class AcousticEmitterSystem { [[nodiscard]] uint8_t GetAcousticId() const; void SetAcousticId(uint8_t pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] static int GetMarshalledSize(); bool operator==(const AcousticEmitterSystem& rhs) const; }; diff --git a/src/dis6/distributed_emissions/AcousticEmitterSystemData.cpp b/src/dis6/distributed_emissions/AcousticEmitterSystemData.cpp index 24faebe4..defa38ee 100644 --- a/src/dis6/distributed_emissions/AcousticEmitterSystemData.cpp +++ b/src/dis6/distributed_emissions/AcousticEmitterSystemData.cpp @@ -1,7 +1,6 @@ -#include "dis6/AcousticEmitterSystemData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/AcousticEmitterSystemData.h" +namespace dis { AcousticEmitterSystemData::AcousticEmitterSystemData() : _emitterSystemDataLength(0), _numberOfBeams(0), @@ -135,6 +134,8 @@ int AcousticEmitterSystemData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/ApaData.cpp b/src/dis6/distributed_emissions/ApaData.cpp index b717d060..3f790e96 100644 --- a/src/dis6/distributed_emissions/ApaData.cpp +++ b/src/dis6/distributed_emissions/ApaData.cpp @@ -1,11 +1,8 @@ -#include "dis6/ApaData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/ApaData.h" +namespace dis { ApaData::ApaData() : _parameterIndex(0), _parameterValue(0) {} -ApaData::~ApaData() {} - uint16_t ApaData::getParameterIndex() const { return _parameterIndex; } void ApaData::setParameterIndex(uint16_t pX) { _parameterIndex = pX; } @@ -41,6 +38,8 @@ int ApaData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/ApaData.h b/src/dis6/distributed_emissions/ApaData.h index 2786bcd1..9acff26f 100644 --- a/src/dis6/distributed_emissions/ApaData.h +++ b/src/dis6/distributed_emissions/ApaData.h @@ -22,10 +22,10 @@ class ApaData { public: ApaData(); - virtual ~ApaData(); + ~ApaData() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] uint16_t GetParameterIndex() const; void SetParameterIndex(uint16_t pX); @@ -33,7 +33,7 @@ class ApaData { [[nodiscard]] int16_t GetParameterValue() const; void SetParameterValue(int16_t pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] int GetMarshalledSize() const; bool operator==(const ApaData& rhs) const; }; diff --git a/src/dis6/distributed_emissions/BeamData.cpp b/src/dis6/distributed_emissions/BeamData.cpp index 31a5be48..8cd5f6b3 100644 --- a/src/dis6/distributed_emissions/BeamData.cpp +++ b/src/dis6/distributed_emissions/BeamData.cpp @@ -1,7 +1,6 @@ -#include "dis6/BeamData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/BeamData.h" +namespace dis { BeamData::BeamData() : _beamAzimuthCenter(0.0), _beamAzimuthSweep(0.0), @@ -70,6 +69,8 @@ int BeamData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/DesignatorPdu.cpp b/src/dis6/distributed_emissions/DesignatorPdu.cpp index 8a410cd1..5d97c024 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.cpp +++ b/src/dis6/distributed_emissions/DesignatorPdu.cpp @@ -1,8 +1,7 @@ #include "dis6/distributed_emissions/DesignatorPdu.h" -using namespace DIS; - -dis::DesignatorPdu::DesignatorPdu() +namespace dis { +DesignatorPdu::DesignatorPdu() : _codeName(0), _designatorCode(0), @@ -15,112 +14,103 @@ dis::DesignatorPdu::DesignatorPdu() SetPduType(24); } -dis::DesignatorPdu::~DesignatorPdu() = default; +DesignatorPdu::~DesignatorPdu() = default; -dis::EntityID& dis::DesignatorPdu::getDesignatingEntityID() { +EntityID& DesignatorPdu::getDesignatingEntityID() { return _designatingEntityID; } -const dis::EntityID& dis::DesignatorPdu::getDesignatingEntityID() const { +const EntityID& DesignatorPdu::getDesignatingEntityID() const { return _designatingEntityID; } -void dis::DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { +void DesignatorPdu::setDesignatingEntityID(const EntityID& pX) { _designatingEntityID = pX; } -uint16_t dis::DesignatorPdu::getCodeName() const { return _codeName; } +uint16_t DesignatorPdu::getCodeName() const { return _codeName; } -void dis::DesignatorPdu::setCodeName(uint16_t pX) { _codeName = pX; } +void DesignatorPdu::setCodeName(uint16_t pX) { _codeName = pX; } -dis::EntityID& dis::DesignatorPdu::getDesignatedEntityID() { - return _designatedEntityID; -} +EntityID& DesignatorPdu::getDesignatedEntityID() { return _designatedEntityID; } -const dis::EntityID& dis::DesignatorPdu::getDesignatedEntityID() const { +const EntityID& DesignatorPdu::getDesignatedEntityID() const { return _designatedEntityID; } -void dis::DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { +void DesignatorPdu::setDesignatedEntityID(const EntityID& pX) { _designatedEntityID = pX; } -uint16_t dis::DesignatorPdu::getDesignatorCode() const { - return _designatorCode; -} +uint16_t DesignatorPdu::getDesignatorCode() const { return _designatorCode; } -void dis::DesignatorPdu::setDesignatorCode(uint16_t pX) { - _designatorCode = pX; -} +void DesignatorPdu::setDesignatorCode(uint16_t pX) { _designatorCode = pX; } -float dis::DesignatorPdu::getDesignatorPower() const { - return _designatorPower; -} +float DesignatorPdu::getDesignatorPower() const { return _designatorPower; } -void dis::DesignatorPdu::setDesignatorPower(float pX) { _designatorPower = pX; } +void DesignatorPdu::setDesignatorPower(float pX) { _designatorPower = pX; } -float dis::DesignatorPdu::getDesignatorWavelength() const { +float DesignatorPdu::getDesignatorWavelength() const { return _designatorWavelength; } -void dis::DesignatorPdu::setDesignatorWavelength(float pX) { +void DesignatorPdu::setDesignatorWavelength(float pX) { _designatorWavelength = pX; } -Vector3Float& dis::DesignatorPdu::getDesignatorSpotWrtDesignated() { +Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() { return _designatorSpotWrtDesignated; } -const Vector3Float& dis::DesignatorPdu::getDesignatorSpotWrtDesignated() const { +const Vector3Float& DesignatorPdu::getDesignatorSpotWrtDesignated() const { return _designatorSpotWrtDesignated; } -void dis::DesignatorPdu::setDesignatorSpotWrtDesignated( - const Vector3Float& pX) { +void DesignatorPdu::setDesignatorSpotWrtDesignated(const Vector3Float& pX) { _designatorSpotWrtDesignated = pX; } -Vector3Double& dis::DesignatorPdu::getDesignatorSpotLocation() { +Vector3Double& DesignatorPdu::getDesignatorSpotLocation() { return _designatorSpotLocation; } -const Vector3Double& dis::DesignatorPdu::getDesignatorSpotLocation() const { +const Vector3Double& DesignatorPdu::getDesignatorSpotLocation() const { return _designatorSpotLocation; } -void dis::DesignatorPdu::setDesignatorSpotLocation(const Vector3Double& pX) { +void DesignatorPdu::setDesignatorSpotLocation(const Vector3Double& pX) { _designatorSpotLocation = pX; } -char dis::DesignatorPdu::getDeadReckoningAlgorithm() const { +char DesignatorPdu::getDeadReckoningAlgorithm() const { return _deadReckoningAlgorithm; } -void dis::DesignatorPdu::setDeadReckoningAlgorithm(char pX) { +void DesignatorPdu::setDeadReckoningAlgorithm(char pX) { _deadReckoningAlgorithm = pX; } -uint16_t dis::DesignatorPdu::getPadding1() const { return _padding1; } +uint16_t DesignatorPdu::getPadding1() const { return _padding1; } -void dis::DesignatorPdu::setPadding1(uint16_t pX) { _padding1 = pX; } +void DesignatorPdu::setPadding1(uint16_t pX) { _padding1 = pX; } -char dis::DesignatorPdu::getPadding2() const { return _padding2; } +char DesignatorPdu::getPadding2() const { return _padding2; } -void dis::DesignatorPdu::setPadding2(char pX) { _padding2 = pX; } +void DesignatorPdu::setPadding2(char pX) { _padding2 = pX; } -Vector3Float& dis::DesignatorPdu::getEntityLinearAcceleration() { +Vector3Float& DesignatorPdu::getEntityLinearAcceleration() { return _entityLinearAcceleration; } -const Vector3Float& dis::DesignatorPdu::getEntityLinearAcceleration() const { +const Vector3Float& DesignatorPdu::getEntityLinearAcceleration() const { return _entityLinearAcceleration; } -void dis::DesignatorPdu::setEntityLinearAcceleration(const Vector3Float& pX) { +void DesignatorPdu::setEntityLinearAcceleration(const Vector3Float& pX) { _entityLinearAcceleration = pX; } -void dis::DesignatorPdu::Marshal(DataStream& dataStream) const { +void DesignatorPdu::Marshal(DataStream& dataStream) const { DistributedEmissionsFamilyPdu::marshal( data_stream); // Marshal information in superclass first _designatingEntityID.Marshal(dataStream); @@ -137,7 +127,7 @@ void dis::DesignatorPdu::Marshal(DataStream& dataStream) const { _entityLinearAcceleration.marshal(dataStream); } -void dis::DesignatorPdu::Unmarshal(DataStream& dataStream) { +void DesignatorPdu::Unmarshal(DataStream& dataStream) { DistributedEmissionsFamilyPdu::unmarshal( data_stream); // unmarshal information in superclass first _designatingEntityID.unmarshal(dataStream); @@ -207,6 +197,8 @@ int DesignatorPdu::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/DesignatorPdu.h b/src/dis6/distributed_emissions/DesignatorPdu.h index ab8b87c0..4851aa6d 100644 --- a/src/dis6/distributed_emissions/DesignatorPdu.h +++ b/src/dis6/distributed_emissions/DesignatorPdu.h @@ -16,96 +16,96 @@ namespace dis { // // @author DMcG, jkg -class DesignatorPdu : public DistributedEmissionsFamilyPdu { +class DesignatorPdu final : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity designating */ - EntityID _designatingEntityID; + EntityID designating_entity_id_; // NOLINT /** This field shall specify a unique emitter database number assigned to * differentiate between otherwise similar or identical emitter beams within * an emitter system. */ - uint16_t _codeName; + uint16_t code_name_; // NOLINT /** ID of the entity being designated */ - EntityID _designatedEntityID; + EntityID designated_entity_id_; // NOLINT /** This field shall identify the designator code being used by the * designating entity */ - uint16_t _designatorCode; + uint16_t designator_code_; // NOLINT /** This field shall identify the designator output power in watts */ - float _designatorPower; + float designator_power_; // NOLINT /** This field shall identify the designator wavelength in units of microns */ - float _designatorWavelength; + float designator_wavelength_; // NOLINT /** designtor spot wrt the designated entity */ - DIS::Vector3Float _designatorSpotWrtDesignated; + Vector3Float designator_spot_wrt_designated_; // NOLINT /** designtor spot wrt the designated entity */ - DIS::Vector3Double _designatorSpotLocation; + Vector3Double designator_spot_location_; // NOLINT /** Dead reckoning algorithm */ - char _deadReckoningAlgorithm; + char dead_reckoning_algorithm_; // NOLINT /** padding */ - uint16_t _padding1; + uint16_t padding1_; // NOLINT /** padding */ - char _padding2; + char padding2_; // NOLINT /** linear accelleration of entity */ - DIS::Vector3Float _entityLinearAcceleration; + Vector3Float entity_linear_acceleration_; // NOLINT public: DesignatorPdu(); - virtual ~DesignatorPdu(); + ~DesignatorPdu() final; - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const override; + void Unmarshal(DataStream& dataStream) override; - EntityID& getDesignatingEntityID(); - const EntityID& getDesignatingEntityID() const; - void setDesignatingEntityID(const EntityID& pX); + EntityID& GetDesignatingEntityId(); + [[nodiscard]] const EntityID& GetDesignatingEntityId() const; + void SetDesignatingEntityId(const EntityID& pX); - uint16_t getCodeName() const; - void setCodeName(uint16_t pX); + [[nodiscard]] uint16_t GetCodeName() const; + void SetCodeName(uint16_t pX); - EntityID& getDesignatedEntityID(); - const EntityID& getDesignatedEntityID() const; - void setDesignatedEntityID(const EntityID& pX); + EntityID& GetDesignatedEntityId(); + [[nodiscard]] const EntityID& GetDesignatedEntityId() const; + void SetDesignatedEntityId(const EntityID& pX); - uint16_t getDesignatorCode() const; - void setDesignatorCode(uint16_t pX); + [[nodiscard]] uint16_t GetDesignatorCode() const; + void SetDesignatorCode(uint16_t pX); - float getDesignatorPower() const; - void setDesignatorPower(float pX); + [[nodiscard]] float GetDesignatorPower() const; + void SetDesignatorPower(float pX); - float getDesignatorWavelength() const; - void setDesignatorWavelength(float pX); + [[nodiscard]] float GetDesignatorWavelength() const; + void SetDesignatorWavelength(float pX); - DIS::Vector3Float& getDesignatorSpotWrtDesignated(); - const DIS::Vector3Float& getDesignatorSpotWrtDesignated() const; - void setDesignatorSpotWrtDesignated(const DIS::Vector3Float& pX); + Vector3Float& GetDesignatorSpotWrtDesignated(); + [[nodiscard]] const Vector3Float& GetDesignatorSpotWrtDesignated() const; + void SetDesignatorSpotWrtDesignated(const Vector3Float& pX); - DIS::Vector3Double& getDesignatorSpotLocation(); - const DIS::Vector3Double& getDesignatorSpotLocation() const; - void setDesignatorSpotLocation(const DIS::Vector3Double& pX); + Vector3Double& GetDesignatorSpotLocation(); + [[nodiscard]] const Vector3Double& GetDesignatorSpotLocation() const; + void SetDesignatorSpotLocation(const Vector3Double& pX); - char getDeadReckoningAlgorithm() const; - void setDeadReckoningAlgorithm(char pX); + [[nodiscard]] char GetDeadReckoningAlgorithm() const; + void SetDeadReckoningAlgorithm(char pX); - uint16_t getPadding1() const; - void setPadding1(uint16_t pX); + [[nodiscard]] uint16_t GetPadding1() const; + void SetPadding1(uint16_t pX); - char getPadding2() const; - void setPadding2(char pX); + [[nodiscard]] char GetPadding2() const; + void SetPadding2(char pX); - DIS::Vector3Float& getEntityLinearAcceleration(); - const DIS::Vector3Float& getEntityLinearAcceleration() const; - void setEntityLinearAcceleration(const DIS::Vector3Float& pX); + Vector3Float& GetEntityLinearAcceleration(); + [[nodiscard]] const Vector3Float& GetEntityLinearAcceleration() const; + void SetEntityLinearAcceleration(const Vector3Float& pX); - virtual int getMarshalledSize() const; + [[nodiscard]] int GetMarshalledSize() const override; bool operator==(const DesignatorPdu& rhs) const; }; diff --git a/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h index de7b137c..07cfbcc0 100644 --- a/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h +++ b/src/dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h @@ -16,12 +16,12 @@ class DistributedEmissionsFamilyPdu : public Pdu { protected: public: DistributedEmissionsFamilyPdu(); - virtual ~DistributedEmissionsFamilyPdu(); + ~DistributedEmissionsFamilyPdu() override; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const override; + void Unmarshal(DataStream& dataStream) override; - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] int GetMarshalledSize() const override; bool operator==(const DistributedEmissionsFamilyPdu& rhs) const; }; diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp index 991e1813..7864a6a7 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp @@ -1,7 +1,6 @@ -#include "dis6/ElectromagneticEmissionBeamData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/ElectromagneticEmissionBeamData.h" +namespace dis { ElectromagneticEmissionBeamData::ElectromagneticEmissionBeamData() : _beamDataLength(0), _beamIDNumber(0), @@ -64,8 +63,7 @@ void ElectromagneticEmissionBeamData::setBeamFunction(uint8_t pX) { _beamFunction = pX; } -uint8_t ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() - const { +uint8_t ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() const { return _trackJamTargets.size(); } @@ -185,6 +183,8 @@ int ElectromagneticEmissionBeamData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h index 567f1a09..a2efdf99 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h @@ -2,12 +2,11 @@ #include -#include "dis6/FundamentalParameterData.h" -#include "dis6/TrackJamTarget.h" - +#include "dis6/distributed_emissions/FundamentalParameterData.h" +#include "dis6/distributed_emissions/TrackJamTarget.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Description of one electronic emission beam // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -95,7 +94,7 @@ class ElectromagneticEmissionBeamData { bool operator==(const ElectromagneticEmissionBeamData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp index d11e612f..7a1eefee 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp @@ -1,7 +1,6 @@ -#include "dis6/ElectromagneticEmissionSystemData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/ElectromagneticEmissionSystemData.h" +namespace dis { ElectromagneticEmissionSystemData::ElectromagneticEmissionSystemData() : _systemDataLength(0), _numberOfBeams(0), @@ -29,8 +28,7 @@ uint16_t ElectromagneticEmissionSystemData::getEmissionsPadding2() const { return _emissionsPadding2; } -void ElectromagneticEmissionSystemData::setEmissionsPadding2( - uint16_t pX) { +void ElectromagneticEmissionSystemData::setEmissionsPadding2(uint16_t pX) { _emissionsPadding2 = pX; } @@ -138,6 +136,8 @@ int ElectromagneticEmissionSystemData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h index 7763ae8d..e214a92b 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h @@ -2,10 +2,9 @@ #include -#include "dis6/ElectromagneticEmissionBeamData.h" -#include "dis6/EmitterSystem.h" -#include "dis6/Vector3Float.h" - +#include "dis6/common/Vector3Float.h" +#include "dis6/distributed_emissions/ElectromagneticEmissionBeamData.h" +#include "dis6/distributed_emissions/EmitterSystem.h" #include "dis6/utils/DataStream.h" namespace DIS { diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp index 304cd974..17ae78dd 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp @@ -1,6 +1,6 @@ -#include "dis6/ElectromagneticEmissionsPdu.h" +#include "dis6/distributed_emissions/ElectromagneticEmissionsPdu.h" -using namespace DIS; +namespace dis { ElectromagneticEmissionsPdu::ElectromagneticEmissionsPdu() : DistributedEmissionsFamilyPdu(), @@ -144,6 +144,8 @@ int ElectromagneticEmissionsPdu::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h index dbd65471..654b7752 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.h @@ -2,14 +2,13 @@ #include -#include "dis6/DistributedEmissionsFamilyPdu.h" -#include "dis6/ElectromagneticEmissionSystemData.h" -#include "dis6/EntityID.h" -#include "dis6/EventID.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/EventID.h" +#include "dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h" +#include "dis6/distributed_emissions/ElectromagneticEmissionSystemData.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.7.1. Information about active electronic warfare (EW) emissions // and active EW countermeasures shall be communicated using an Electromagnetic // Emission PDU. COMPLETE (I think) @@ -19,8 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class ElectromagneticEmissionsPdu - : public DistributedEmissionsFamilyPdu { +class ElectromagneticEmissionsPdu : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity emitting */ EntityID _emittingEntityID; @@ -46,7 +44,7 @@ class ElectromagneticEmissionsPdu public: ElectromagneticEmissionsPdu(); - virtual ~ElectromagneticEmissionsPdu(); + ~ElectromagneticEmissionsPdu() override; virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); @@ -75,7 +73,7 @@ class ElectromagneticEmissionsPdu bool operator==(const ElectromagneticEmissionsPdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/EmitterSystem.cpp b/src/dis6/distributed_emissions/EmitterSystem.cpp index 777c5165..85680d30 100644 --- a/src/dis6/distributed_emissions/EmitterSystem.cpp +++ b/src/dis6/distributed_emissions/EmitterSystem.cpp @@ -1,12 +1,10 @@ -#include "dis6/EmitterSystem.h" +#include "dis6/distributed_emissions/EmitterSystem.h" -using namespace DIS; +namespace dis { EmitterSystem::EmitterSystem() : _emitterName(0), _function(0), _emitterIdNumber(0) {} -EmitterSystem::~EmitterSystem() {} - uint16_t EmitterSystem::getEmitterName() const { return _emitterName; } void EmitterSystem::setEmitterName(uint16_t pX) { _emitterName = pX; } @@ -15,13 +13,9 @@ uint8_t EmitterSystem::getFunction() const { return _function; } void EmitterSystem::setFunction(uint8_t pX) { _function = pX; } -uint8_t EmitterSystem::getEmitterIdNumber() const { - return _emitterIdNumber; -} +uint8_t EmitterSystem::getEmitterIdNumber() const { return _emitterIdNumber; } -void EmitterSystem::setEmitterIdNumber(uint8_t pX) { - _emitterIdNumber = pX; -} +void EmitterSystem::setEmitterIdNumber(uint8_t pX) { _emitterIdNumber = pX; } void EmitterSystem::marshal(DataStream& dataStream) const { dataStream << _emitterName; @@ -54,6 +48,8 @@ int EmitterSystem::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/EmitterSystem.h b/src/dis6/distributed_emissions/EmitterSystem.h index 86958269..89dd6000 100644 --- a/src/dis6/distributed_emissions/EmitterSystem.h +++ b/src/dis6/distributed_emissions/EmitterSystem.h @@ -26,10 +26,10 @@ class EmitterSystem { public: EmitterSystem(); - virtual ~EmitterSystem(); + ~EmitterSystem() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] uint16_t GetEmitterName() const; void SetEmitterName(uint16_t pX); @@ -40,7 +40,7 @@ class EmitterSystem { [[nodiscard]] uint8_t GetEmitterIdNumber() const; void SetEmitterIdNumber(uint8_t pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] int GetMarshalledSize() const; bool operator==(const EmitterSystem& rhs) const; }; diff --git a/src/dis6/distributed_emissions/FundamentalParameterData.cpp b/src/dis6/distributed_emissions/FundamentalParameterData.cpp index 77e8b8ba..21a28039 100644 --- a/src/dis6/distributed_emissions/FundamentalParameterData.cpp +++ b/src/dis6/distributed_emissions/FundamentalParameterData.cpp @@ -1,7 +1,6 @@ -#include "dis6/FundamentalParameterData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/FundamentalParameterData.h" +namespace dis { FundamentalParameterData::FundamentalParameterData() : _frequency(0.0), _frequencyRange(0.0), @@ -14,8 +13,6 @@ FundamentalParameterData::FundamentalParameterData() _beamElevationSweep(0.0), _beamSweepSync(0.0) {} -FundamentalParameterData::~FundamentalParameterData() {} - float FundamentalParameterData::getFrequency() const { return _frequency; } void FundamentalParameterData::setFrequency(float pX) { _frequency = pX; } @@ -150,6 +147,8 @@ int FundamentalParameterData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/FundamentalParameterData.h b/src/dis6/distributed_emissions/FundamentalParameterData.h index 377f539b..8ecfe808 100644 --- a/src/dis6/distributed_emissions/FundamentalParameterData.h +++ b/src/dis6/distributed_emissions/FundamentalParameterData.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.2.22. Contains electromagnetic emmision regineratin parameters that // are variable throughout a scenario dependent on the actions of the // participants in the simulation. Also provides basic parametric data that may @@ -52,7 +51,7 @@ class FundamentalParameterData { public: FundamentalParameterData(); - virtual ~FundamentalParameterData(); + ~FundamentalParameterData() = default; virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); @@ -91,7 +90,7 @@ class FundamentalParameterData { bool operator==(const FundamentalParameterData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/FundamentalParameterDataIff.cpp b/src/dis6/distributed_emissions/FundamentalParameterDataIff.cpp index 3139a9e0..85f01bf1 100644 --- a/src/dis6/distributed_emissions/FundamentalParameterDataIff.cpp +++ b/src/dis6/distributed_emissions/FundamentalParameterDataIff.cpp @@ -1,7 +1,6 @@ -#include "dis6/FundamentalParameterDataIff.h" - -using namespace DIS; +#include "dis6/distributed_emissions/FundamentalParameterDataIff.h" +namespace dis { FundamentalParameterDataIff::FundamentalParameterDataIff() : _erp(0.0), _frequency(0.0), @@ -12,8 +11,6 @@ FundamentalParameterDataIff::FundamentalParameterDataIff() _pad2(0), _pad3(0) {} -FundamentalParameterDataIff::~FundamentalParameterDataIff() {} - float FundamentalParameterDataIff::getErp() const { return _erp; } void FundamentalParameterDataIff::setErp(float pX) { _erp = pX; } @@ -106,6 +103,8 @@ int FundamentalParameterDataIff::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/FundamentalParameterDataIff.h b/src/dis6/distributed_emissions/FundamentalParameterDataIff.h index 7a063979..e7cbe62a 100644 --- a/src/dis6/distributed_emissions/FundamentalParameterDataIff.h +++ b/src/dis6/distributed_emissions/FundamentalParameterDataIff.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // 5.2.45. Fundamental IFF atc data // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -39,10 +38,10 @@ class FundamentalParameterDataIff { public: FundamentalParameterDataIff(); - virtual ~FundamentalParameterDataIff(); + ~FundamentalParameterDataIff() = default; - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void marshal(DataStream& dataStream) const; + void unmarshal(DataStream& dataStream); float getErp() const; void setErp(float pX); @@ -68,11 +67,11 @@ class FundamentalParameterDataIff { uint8_t getPad3() const; void setPad3(uint8_t pX); - virtual int getMarshalledSize() const; + int getMarshalledSize() const; bool operator==(const FundamentalParameterDataIff& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.cpp b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.cpp index d79df8a4..5c7a7f8e 100644 --- a/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.cpp +++ b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.cpp @@ -1,7 +1,6 @@ -#include "dis6/IffAtcNavAidsLayer1Pdu.h" - -using namespace DIS; +#include "dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h" +namespace dis { IffAtcNavAidsLayer1Pdu::IffAtcNavAidsLayer1Pdu() : DistributedEmissionsFamilyPdu(), _emittingEntityId(), @@ -13,8 +12,6 @@ IffAtcNavAidsLayer1Pdu::IffAtcNavAidsLayer1Pdu() setPduType(28); } -IffAtcNavAidsLayer1Pdu::~IffAtcNavAidsLayer1Pdu() {} - EntityID& IffAtcNavAidsLayer1Pdu::getEmittingEntityId() { return _emittingEntityId; } @@ -124,6 +121,8 @@ int IffAtcNavAidsLayer1Pdu::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h index c1224f18..6ae26052 100644 --- a/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h +++ b/src/dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h @@ -1,15 +1,14 @@ #pragma once -#include "dis6/DistributedEmissionsFamilyPdu.h" -#include "dis6/EntityID.h" -#include "dis6/EventID.h" -#include "dis6/IffFundamentalData.h" -#include "dis6/SystemID.h" -#include "dis6/Vector3Float.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/EventID.h" +#include "dis6/common/Vector3Float.h" +#include "dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h" +#include "dis6/distributed_emissions/IffFundamentalData.h" +#include "dis6/distributed_emissions/SystemID.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // 5.3.7.4.1: Navigational and IFF PDU. COMPLETE // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -17,8 +16,7 @@ namespace DIS { // // @author DMcG, jkg -class IffAtcNavAidsLayer1Pdu - : public DistributedEmissionsFamilyPdu { +class IffAtcNavAidsLayer1Pdu : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity that is the source of the emissions */ EntityID _emittingEntityId; @@ -41,10 +39,10 @@ class IffAtcNavAidsLayer1Pdu public: IffAtcNavAidsLayer1Pdu(); - virtual ~IffAtcNavAidsLayer1Pdu(); + ~IffAtcNavAidsLayer1Pdu() override = default; - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const override; + void Unmarshal(DataStream& dataStream) override; EntityID& getEmittingEntityId(); const EntityID& getEmittingEntityId() const; @@ -73,7 +71,7 @@ class IffAtcNavAidsLayer1Pdu bool operator==(const IffAtcNavAidsLayer1Pdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.cpp b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.cpp index 70c68be7..05d25dd8 100644 --- a/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.cpp +++ b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.cpp @@ -1,7 +1,6 @@ -#include "dis6/IffAtcNavAidsLayer2Pdu.h" - -using namespace DIS; +#include "dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h" +namespace dis { IffAtcNavAidsLayer2Pdu::IffAtcNavAidsLayer2Pdu() : IffAtcNavAidsLayer1Pdu(), _layerHeader(), @@ -114,8 +113,7 @@ int IffAtcNavAidsLayer2Pdu::getMarshalledSize() const { marshalSize + _secondaryOperationalData .getMarshalledSize(); // _secondaryOperationalData - for (uint64_t idx = 0; idx < _fundamentalIffParameters.size(); - idx++) { + for (uint64_t idx = 0; idx < _fundamentalIffParameters.size(); idx++) { FundamentalParameterDataIff listElement = _fundamentalIffParameters[idx]; marshalSize = marshalSize + listElement.getMarshalledSize(); } @@ -123,6 +121,8 @@ int IffAtcNavAidsLayer2Pdu::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h index b11cbfda..77265204 100644 --- a/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h +++ b/src/dis6/distributed_emissions/IffAtcNavAidsLayer2Pdu.h @@ -2,14 +2,13 @@ #include -#include "dis6/BeamData.h" -#include "dis6/FundamentalParameterDataIff.h" -#include "dis6/IffAtcNavAidsLayer1Pdu.h" -#include "dis6/LayerHeader.h" - +#include "dis6/distributed_emissions/BeamData.h" +#include "dis6/distributed_emissions/FundamentalParameterDataIff.h" +#include "dis6/distributed_emissions/IffAtcNavAidsLayer1Pdu.h" +#include "dis6/distributed_emissions/LayerHeader.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the // following fields. This requires manual cleanup. the beamData attribute // semantics are used in multiple ways. UNFINSISHED @@ -19,7 +18,7 @@ namespace DIS { // // @author DMcG, jkg -class IffAtcNavAidsLayer2Pdu : public IffAtcNavAidsLayer1Pdu { +class IffAtcNavAidsLayer2Pdu final : public IffAtcNavAidsLayer1Pdu { protected: /** layer header */ LayerHeader _layerHeader; @@ -35,10 +34,9 @@ class IffAtcNavAidsLayer2Pdu : public IffAtcNavAidsLayer1Pdu { public: IffAtcNavAidsLayer2Pdu(); - virtual ~IffAtcNavAidsLayer2Pdu(); - - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + ~IffAtcNavAidsLayer2Pdu() final = default; + void Marshal(DataStream& dataStream) const override; + void Unmarshal(DataStream& dataStream) override; LayerHeader& getLayerHeader(); const LayerHeader& getLayerHeader() const; @@ -62,7 +60,7 @@ class IffAtcNavAidsLayer2Pdu : public IffAtcNavAidsLayer1Pdu { bool operator==(const IffAtcNavAidsLayer2Pdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/IffFundamentalData.cpp b/src/dis6/distributed_emissions/IffFundamentalData.cpp index 5450ea37..bf7bf129 100644 --- a/src/dis6/distributed_emissions/IffFundamentalData.cpp +++ b/src/dis6/distributed_emissions/IffFundamentalData.cpp @@ -1,7 +1,6 @@ -#include "dis6/IffFundamentalData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/IffFundamentalData.h" +namespace dis { IffFundamentalData::IffFundamentalData() : _systemStatus(0), _alternateParameter4(0), @@ -16,13 +15,9 @@ IffFundamentalData::IffFundamentalData() IffFundamentalData::~IffFundamentalData() {} -uint8_t IffFundamentalData::getSystemStatus() const { - return _systemStatus; -} +uint8_t IffFundamentalData::getSystemStatus() const { return _systemStatus; } -void IffFundamentalData::setSystemStatus(uint8_t pX) { - _systemStatus = pX; -} +void IffFundamentalData::setSystemStatus(uint8_t pX) { _systemStatus = pX; } uint8_t IffFundamentalData::getAlternateParameter4() const { return _alternateParameter4; @@ -127,6 +122,8 @@ int IffFundamentalData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/IffFundamentalData.h b/src/dis6/distributed_emissions/IffFundamentalData.h index 68ec3506..a4f91dd9 100644 --- a/src/dis6/distributed_emissions/IffFundamentalData.h +++ b/src/dis6/distributed_emissions/IffFundamentalData.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // 5.2.42. Basic operational data ofr IFF ATC NAVAIDS // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -84,7 +83,7 @@ class IffFundamentalData { bool operator==(const IffFundamentalData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/LayerHeader.cpp b/src/dis6/distributed_emissions/LayerHeader.cpp index edf0510f..7fd89ec1 100644 --- a/src/dis6/distributed_emissions/LayerHeader.cpp +++ b/src/dis6/distributed_emissions/LayerHeader.cpp @@ -1,12 +1,9 @@ -#include "dis6/LayerHeader.h" - -using namespace DIS; +#include "dis6/distributed_emissions/LayerHeader.h" +namespace dis { LayerHeader::LayerHeader() : _layerNumber(0), _layerSpecificInformaiton(0), _length(0) {} -LayerHeader::~LayerHeader() {} - uint8_t LayerHeader::getLayerNumber() const { return _layerNumber; } void LayerHeader::setLayerNumber(uint8_t pX) { _layerNumber = pX; } @@ -55,6 +52,8 @@ int LayerHeader::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/LayerHeader.h b/src/dis6/distributed_emissions/LayerHeader.h index a885c4bd..511bcc2f 100644 --- a/src/dis6/distributed_emissions/LayerHeader.h +++ b/src/dis6/distributed_emissions/LayerHeader.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // 5.2.47. Layer header. // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -24,10 +23,10 @@ class LayerHeader { public: LayerHeader(); - virtual ~LayerHeader(); + ~LayerHeader() = default; - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void marshal(DataStream& dataStream) const; + void unmarshal(DataStream& dataStream); uint8_t getLayerNumber() const; void setLayerNumber(uint8_t pX); @@ -42,7 +41,7 @@ class LayerHeader { bool operator==(const LayerHeader& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/PropulsionSystemData.cpp b/src/dis6/distributed_emissions/PropulsionSystemData.cpp index 638ee2cd..5a16b05f 100644 --- a/src/dis6/distributed_emissions/PropulsionSystemData.cpp +++ b/src/dis6/distributed_emissions/PropulsionSystemData.cpp @@ -1,12 +1,9 @@ -#include "dis6/PropulsionSystemData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/PropulsionSystemData.h" +namespace dis { PropulsionSystemData::PropulsionSystemData() : _powerSetting(0.0), _engineRpm(0.0) {} -PropulsionSystemData::~PropulsionSystemData() {} - float PropulsionSystemData::getPowerSetting() const { return _powerSetting; } void PropulsionSystemData::setPowerSetting(float pX) { _powerSetting = pX; } @@ -42,6 +39,8 @@ int PropulsionSystemData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/PropulsionSystemData.h b/src/dis6/distributed_emissions/PropulsionSystemData.h index 96f52896..e12a5a5c 100644 --- a/src/dis6/distributed_emissions/PropulsionSystemData.h +++ b/src/dis6/distributed_emissions/PropulsionSystemData.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Data about a propulsion system // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -21,7 +20,7 @@ class PropulsionSystemData { public: PropulsionSystemData(); - virtual ~PropulsionSystemData(); + ~PropulsionSystemData() = default; virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); @@ -36,7 +35,7 @@ class PropulsionSystemData { bool operator==(const PropulsionSystemData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/SeesPdu.cpp b/src/dis6/distributed_emissions/SeesPdu.cpp index 333cb700..3989e958 100644 --- a/src/dis6/distributed_emissions/SeesPdu.cpp +++ b/src/dis6/distributed_emissions/SeesPdu.cpp @@ -1,16 +1,14 @@ -#include "dis6/SeesPdu.h" - -using namespace DIS; +#include "dis6/distributed_emissions/SeesPdu.h" +namespace dis { SeesPdu::SeesPdu() - : DistributedEmissionsFamilyPdu(), - _orginatingEntityID(), + : _orginatingEntityID(), _infraredSignatureRepresentationIndex(0), _acousticSignatureRepresentationIndex(0), _radarCrossSectionSignatureRepresentationIndex(0), _numberOfPropulsionSystems(0), _numberOfVectoringNozzleSystems(0) { - setPduType(30); + SetPduType(30); } SeesPdu::~SeesPdu() { @@ -44,13 +42,11 @@ void SeesPdu::setAcousticSignatureRepresentationIndex(uint16_t pX) { _acousticSignatureRepresentationIndex = pX; } -uint16_t SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() - const { +uint16_t SeesPdu::getRadarCrossSectionSignatureRepresentationIndex() const { return _radarCrossSectionSignatureRepresentationIndex; } -void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex( - uint16_t pX) { +void SeesPdu::setRadarCrossSectionSignatureRepresentationIndex(uint16_t pX) { _radarCrossSectionSignatureRepresentationIndex = pX; } @@ -191,6 +187,8 @@ int SeesPdu::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/SeesPdu.h b/src/dis6/distributed_emissions/SeesPdu.h index 5aee9227..62852e32 100644 --- a/src/dis6/distributed_emissions/SeesPdu.h +++ b/src/dis6/distributed_emissions/SeesPdu.h @@ -2,14 +2,13 @@ #include -#include "dis6/DistributedEmissionsFamilyPdu.h" -#include "dis6/EntityID.h" -#include "dis6/PropulsionSystemData.h" -#include "dis6/VectoringNozzleSystemData.h" - +#include "dis6/common/EntityID.h" +#include "dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h" +#include "dis6/distributed_emissions/PropulsionSystemData.h" +#include "dis6/distributed_emissions/VectoringNozzleSystemData.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.7.5. SEES PDU, supplemental emissions entity state information. // COMPLETE @@ -18,7 +17,7 @@ namespace DIS { // // @author DMcG, jkg -class SeesPdu : public DistributedEmissionsFamilyPdu { +class SeesPdu final : public DistributedEmissionsFamilyPdu { protected: /** Originating entity ID */ EntityID _orginatingEntityID; @@ -46,7 +45,7 @@ class SeesPdu : public DistributedEmissionsFamilyPdu { public: SeesPdu(); - virtual ~SeesPdu(); + ~SeesPdu() final; virtual void marshal(DataStream& dataStream) const; virtual void unmarshal(DataStream& dataStream); @@ -80,7 +79,7 @@ class SeesPdu : public DistributedEmissionsFamilyPdu { bool operator==(const SeesPdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/ShaftRPMs.cpp b/src/dis6/distributed_emissions/ShaftRPMs.cpp index b89a7f12..00e69e59 100644 --- a/src/dis6/distributed_emissions/ShaftRPMs.cpp +++ b/src/dis6/distributed_emissions/ShaftRPMs.cpp @@ -1,12 +1,9 @@ #include "dis6/ShaftRPMs.h" -using namespace DIS; - +namespace dis { ShaftRPMs::ShaftRPMs() : _currentShaftRPMs(0), _orderedShaftRPMs(0), _shaftRPMRateOfChange(0.0) {} -ShaftRPMs::~ShaftRPMs() {} - int16_t ShaftRPMs::getCurrentShaftRPMs() const { return _currentShaftRPMs; } void ShaftRPMs::setCurrentShaftRPMs(int16_t pX) { _currentShaftRPMs = pX; } @@ -54,6 +51,8 @@ int ShaftRPMs::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/ShaftRPMs.h b/src/dis6/distributed_emissions/ShaftRPMs.h index c1ffe5f7..de50d60b 100644 --- a/src/dis6/distributed_emissions/ShaftRPMs.h +++ b/src/dis6/distributed_emissions/ShaftRPMs.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Shaft RPMs, used in underwater acoustic clacluations. // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -24,10 +23,10 @@ class ShaftRPMs { public: ShaftRPMs(); - virtual ~ShaftRPMs(); + ~ShaftRPMs() = default; - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void marshal(DataStream& dataStream) const; + void unmarshal(DataStream& dataStream); int16_t getCurrentShaftRPMs() const; void setCurrentShaftRPMs(int16_t pX); @@ -38,11 +37,11 @@ class ShaftRPMs { float getShaftRPMRateOfChange() const; void setShaftRPMRateOfChange(float pX); - virtual int getMarshalledSize() const; + int getMarshalledSize() const; bool operator==(const ShaftRPMs& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/SystemID.cpp b/src/dis6/distributed_emissions/SystemID.cpp index 5f64da40..bf3e95ef 100644 --- a/src/dis6/distributed_emissions/SystemID.cpp +++ b/src/dis6/distributed_emissions/SystemID.cpp @@ -1,7 +1,6 @@ -#include "dis6/SystemID.h" - -using namespace DIS; +#include "dis6/distributed_emissions/SystemID.h" +namespace dis { SystemID::SystemID() : _systemType(0), _systemName(0), _systemMode(0), _changeOptions(0) {} @@ -58,6 +57,8 @@ int SystemID::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/SystemID.h b/src/dis6/distributed_emissions/SystemID.h index dc60e485..5cc69050 100644 --- a/src/dis6/distributed_emissions/SystemID.h +++ b/src/dis6/distributed_emissions/SystemID.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // 5.2.58. Used in IFF ATC PDU // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -48,7 +47,7 @@ class SystemID { bool operator==(const SystemID& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/TrackJamTarget.cpp b/src/dis6/distributed_emissions/TrackJamTarget.cpp index 8129c822..3615491d 100644 --- a/src/dis6/distributed_emissions/TrackJamTarget.cpp +++ b/src/dis6/distributed_emissions/TrackJamTarget.cpp @@ -1,11 +1,9 @@ -#include "dis6/TrackJamTarget.h" +#include "dis6/distributed_emissions/TrackJamTarget.h" -using namespace DIS; +namespace dis { TrackJamTarget::TrackJamTarget() : _trackJam(), _emitterID(0), _beamID(0) {} -TrackJamTarget::~TrackJamTarget() {} - EntityID& TrackJamTarget::getTrackJam() { return _trackJam; } const EntityID& TrackJamTarget::getTrackJam() const { return _trackJam; } @@ -45,12 +43,14 @@ bool TrackJamTarget::operator==(const TrackJamTarget& rhs) const { int TrackJamTarget::getMarshalledSize() const { int marshalSize = 0; - marshalSize = marshalSize + _trackJam.getMarshalledSize(); // _trackJam + marshalSize = marshalSize + _trackJam.GetMarshalledSize(); // _trackJam marshalSize = marshalSize + 1; // _emitterID marshalSize = marshalSize + 1; // _beamID return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/TrackJamTarget.h b/src/dis6/distributed_emissions/TrackJamTarget.h index ba029b6d..69b0f486 100644 --- a/src/dis6/distributed_emissions/TrackJamTarget.h +++ b/src/dis6/distributed_emissions/TrackJamTarget.h @@ -1,10 +1,9 @@ #pragma once -#include "dis6/EntityID.h" - +#include "dis6/common/EntityID.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // One track/jam target // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -25,10 +24,10 @@ class TrackJamTarget { public: TrackJamTarget(); - virtual ~TrackJamTarget(); + ~TrackJamTarget() = default; - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void marshal(DataStream& dataStream) const; + void unmarshal(DataStream& dataStream); EntityID& getTrackJam(); const EntityID& getTrackJam() const; @@ -40,11 +39,11 @@ class TrackJamTarget { uint8_t getBeamID() const; void setBeamID(uint8_t pX); - virtual int getMarshalledSize() const; + int getMarshalledSize() const; bool operator==(const TrackJamTarget& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp index db83bb7d..10aed989 100644 --- a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp +++ b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.cpp @@ -1,7 +1,6 @@ #include "dis6/distributed_emissions/UnderwaterAcousticsPdu.h" -using namespace DIS; - +namespace dis { UnderwaterAcousticsPdu::UnderwaterAcousticsPdu() : DistributedEmissionsFamilyPdu(), _emittingEntityID(), @@ -254,6 +253,8 @@ int UnderwaterAcousticsPdu::getMarshalledSize() const { return marshal_size; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h index 895101ca..5203b6b7 100644 --- a/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h +++ b/src/dis6/distributed_emissions/UnderwaterAcousticsPdu.h @@ -2,16 +2,15 @@ #include -#include "dis6/AcousticEmitterSystemData.h" -#include "dis6/ApaData.h" -#include "dis6/DistributedEmissionsFamilyPdu.h" -#include "dis6/EntityID.h" -#include "dis6/EventID.h" -#include "dis6/ShaftRPMs.h" - +#include "dis6/common/EntityID.h" +#include "dis6/common/EventID.h" +#include "dis6/distributed_emissions/AcousticEmitterSystemData.h" +#include "dis6/distributed_emissions/ApaData.h" +#include "dis6/distributed_emissions/DistributedEmissionsFamilyPdu.h" +#include "dis6/distributed_emissions/ShaftRPMs.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Section 5.3.7.3. Information about underwater acoustic emmissions. This // requires manual cleanup. The beam data records should ALL be a the finish, // rather than attached to each emitter system. UNFINISHED @@ -21,8 +20,7 @@ namespace DIS { // // @author DMcG, jkg -class UnderwaterAcousticsPdu - : public DistributedEmissionsFamilyPdu { +class UnderwaterAcousticsPdu final : public DistributedEmissionsFamilyPdu { protected: /** ID of the entity that is the source of the emission */ EntityID _emittingEntityID; @@ -71,10 +69,10 @@ class UnderwaterAcousticsPdu public: UnderwaterAcousticsPdu(); - virtual ~UnderwaterAcousticsPdu(); + ~UnderwaterAcousticsPdu() final; - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const override; + void Unmarshal(DataStream& dataStream) override; EntityID& getEmittingEntityID(); const EntityID& getEmittingEntityID() const; @@ -114,11 +112,11 @@ class UnderwaterAcousticsPdu const std::vector& getEmitterSystems() const; void setEmitterSystems(const std::vector& pX); - virtual int getMarshalledSize() const; + [[nodiscard]] int GetMarshalledSize() const override; bool operator==(const UnderwaterAcousticsPdu& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/VectoringNozzleSystemData.cpp b/src/dis6/distributed_emissions/VectoringNozzleSystemData.cpp index 0a09e928..71dddd0c 100644 --- a/src/dis6/distributed_emissions/VectoringNozzleSystemData.cpp +++ b/src/dis6/distributed_emissions/VectoringNozzleSystemData.cpp @@ -1,7 +1,6 @@ -#include "dis6/VectoringNozzleSystemData.h" - -using namespace DIS; +#include "dis6/distributed_emissions/VectoringNozzleSystemData.h" +namespace dis { VectoringNozzleSystemData::VectoringNozzleSystemData() : _horizontalDeflectionAngle(0.0), _verticalDeflectionAngle(0.0) {} @@ -53,6 +52,8 @@ int VectoringNozzleSystemData::getMarshalledSize() const { return marshalSize; } +} // namespace dis + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/distributed_emissions/VectoringNozzleSystemData.h b/src/dis6/distributed_emissions/VectoringNozzleSystemData.h index d49945b4..7057ac6e 100644 --- a/src/dis6/distributed_emissions/VectoringNozzleSystemData.h +++ b/src/dis6/distributed_emissions/VectoringNozzleSystemData.h @@ -1,9 +1,8 @@ #pragma once - #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Data about a vectoring nozzle system // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -21,10 +20,10 @@ class VectoringNozzleSystemData { public: VectoringNozzleSystemData(); - virtual ~VectoringNozzleSystemData(); + ~VectoringNozzleSystemData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void marshal(DataStream& dataStream) const; + void unmarshal(DataStream& dataStream); float getHorizontalDeflectionAngle() const; void setHorizontalDeflectionAngle(float pX); @@ -32,11 +31,11 @@ class VectoringNozzleSystemData { float getVerticalDeflectionAngle() const; void setVerticalDeflectionAngle(float pX); - virtual int getMarshalledSize() const; + int getMarshalledSize() const; bool operator==(const VectoringNozzleSystemData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without From 7e63812d3af6859cde0cc47ba93dbe2e9a27f5eb Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Mon, 22 Jan 2024 21:01:48 -0600 Subject: [PATCH 21/22] [WIP] syncing changes --- .clang-tidy | 3 +- src/dis6/distributed_emissions/ApaData.cpp | 44 +++++----- src/dis6/distributed_emissions/ApaData.h | 6 +- src/dis6/utils/Endian.h | 10 +-- src/dis6/utils/PDUBank.cpp | 27 +++--- src/dis6/utils/PDUType.h | 98 +++++++++++----------- 6 files changed, 97 insertions(+), 91 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index a0eb0716..bf4629cb 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -33,7 +33,8 @@ CheckOptions: - { key: readability-identifier-naming.ProtectedMemberCase, value: lower_case } - { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase } - { key: readability-identifier-naming.ConstexprVariablePrefix, value: k } - - { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE } + - { key: readability-identifier-naming.EnumConstantCase, value: CamelCase } + - { key: readability-identifier-naming.EnumConstantPrefix, value: k } - { key: readability-identifier-naming.MemberConstantCase, value: CamelCase } - { key: readability-identifier-naming.MemberConstantPrefix, value: k } - { key: readability-identifier-naming.StaticConstantCase, value: CamelCase } diff --git a/src/dis6/distributed_emissions/ApaData.cpp b/src/dis6/distributed_emissions/ApaData.cpp index 3f790e96..7169678e 100644 --- a/src/dis6/distributed_emissions/ApaData.cpp +++ b/src/dis6/distributed_emissions/ApaData.cpp @@ -1,41 +1,45 @@ #include "dis6/distributed_emissions/ApaData.h" namespace dis { -ApaData::ApaData() : _parameterIndex(0), _parameterValue(0) {} +ApaData::ApaData() : parameter_index_(0), parameter_value_(0) {} -uint16_t ApaData::getParameterIndex() const { return _parameterIndex; } +uint16_t ApaData::GetParameterIndex() const { return parameter_index_; } -void ApaData::setParameterIndex(uint16_t pX) { _parameterIndex = pX; } +void ApaData::SetParameterIndex(uint16_t pX) { parameter_index_ = pX; } -int16_t ApaData::getParameterValue() const { return _parameterValue; } +int16_t ApaData::GetParameterValue() const { return parameter_value_; } -void ApaData::setParameterValue(int16_t pX) { _parameterValue = pX; } +void ApaData::SetParameterValue(int16_t pX) { parameter_value_ = pX; } -void ApaData::marshal(DataStream& dataStream) const { - dataStream << _parameterIndex; - dataStream << _parameterValue; +void ApaData::Marshal(DataStream& dataStream) const { + dataStream << parameter_index_; + dataStream << parameter_value_; } -void ApaData::unmarshal(DataStream& dataStream) { - dataStream >> _parameterIndex; - dataStream >> _parameterValue; +void ApaData::Unmarshal(DataStream& dataStream) { + dataStream >> parameter_index_; + dataStream >> parameter_value_; } bool ApaData::operator==(const ApaData& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - if (!(_parameterIndex == rhs._parameterIndex)) ivarsEqual = false; - if (!(_parameterValue == rhs._parameterValue)) ivarsEqual = false; + if (!(parameter_index_ == rhs.parameter_index_)) { + ivars_equal = false; + } + if (!(parameter_value_ == rhs.parameter_value_)) { + ivars_equal = false; + } - return ivarsEqual; + return ivars_equal; } -int ApaData::getMarshalledSize() const { - int marshalSize = 0; +int ApaData::GetMarshalledSize() { + int marshal_size = 0; - marshalSize = marshalSize + 2; // _parameterIndex - marshalSize = marshalSize + 2; // _parameterValue - return marshalSize; + marshal_size = marshal_size + 2; // _parameterIndex + marshal_size = marshal_size + 2; // _parameterValue + return marshal_size; } } // namespace dis diff --git a/src/dis6/distributed_emissions/ApaData.h b/src/dis6/distributed_emissions/ApaData.h index 9acff26f..d94444e7 100644 --- a/src/dis6/distributed_emissions/ApaData.h +++ b/src/dis6/distributed_emissions/ApaData.h @@ -15,10 +15,10 @@ namespace dis { class ApaData { protected: /** Index of APA parameter */ - uint16_t parameter_index_; + uint16_t parameter_index_; // NOLINT /** Index of APA parameter */ - int16_t parameter_value_; + int16_t parameter_value_; // NOLINT public: ApaData(); @@ -33,7 +33,7 @@ class ApaData { [[nodiscard]] int16_t GetParameterValue() const; void SetParameterValue(int16_t pX); - [[nodiscard]] int GetMarshalledSize() const; + [[nodiscard]] static int GetMarshalledSize(); bool operator==(const ApaData& rhs) const; }; diff --git a/src/dis6/utils/Endian.h b/src/dis6/utils/Endian.h index 9d0481c7..83bf82f6 100644 --- a/src/dis6/utils/Endian.h +++ b/src/dis6/utils/Endian.h @@ -1,13 +1,13 @@ -#ifndef _dcl_dis_endian_h_ -#define _dcl_dis_endian_h_ +#ifndef DIS6_UTILS_ENDIAN_H_ +#define DIS6_UTILS_ENDIAN_H_ namespace dis { /// the order of bytes that are on the left enum Endian { - LITTLE = 1, - BIG = 0, + kLittle = 1, + kBig = 0, }; } // namespace dis -#endif // _dcl_dis_endian_h_ +#endif // DIS6_UTILS_ENDIAN_H_ diff --git a/src/dis6/utils/PDUBank.cpp b/src/dis6/utils/PDUBank.cpp index 4a2811e3..7b90b0c6 100644 --- a/src/dis6/utils/PDUBank.cpp +++ b/src/dis6/utils/PDUBank.cpp @@ -1,12 +1,5 @@ #include "dis6/utils/PDUBank.h" -#include "dis6/AcknowledgePdu.h" -#include "dis6/ActionRequestPdu.h" -#include "dis6/ActionResponsePdu.h" -#include "dis6/AggregateStatePdu.h" -#include "dis6/CollisionPdu.h" -#include "dis6/CommentPdu.h" -#include "dis6/CreateEntityPdu.h" #include "dis6/DataQueryPdu.h" #include "dis6/DesignatorPdu.h" #include "dis6/DetonationPdu.h" @@ -26,15 +19,21 @@ #include "dis6/ResupplyReceivedPdu.h" #include "dis6/ServiceRequestPdu.h" #include "dis6/SetDataPdu.h" -#include "dis6/SignalPdu.h" -#include "dis6/StartResumePdu.h" -#include "dis6/StopFreezePdu.h" #include "dis6/TransferControlRequestPdu.h" #include "dis6/TransmitterPdu.h" +#include "dis6/entity_information/CollisionPdu.h" +#include "dis6/entity_management/AggregateStatePdu.h" +#include "dis6/entity_management/CreateEntityPdu.h" +#include "dis6/radio_communications/SignalPdu.h" +#include "dis6/simulation_management/AcknowledgePdu.h" +#include "dis6/simulation_management/ActionRequestPdu.h" +#include "dis6/simulation_management/ActionResponsePdu.h" +#include "dis6/simulation_management/CommentPdu.h" +#include "dis6/simulation_management/StartResumePdu.h" +#include "dis6/simulation_management/StopFreezePdu.h" -using namespace DIS; - -Pdu* PduBank::GetStaticPDU(DIS::PDUType pdu_type) { +namespace dis { +Pdu* PduBank::GetStaticPDU(PDUType pdu_type) { static EntityStatePdu entityStatePdu; static FirePdu firePdu; static DetonationPdu detonationPdu; @@ -166,3 +165,5 @@ Pdu* PduBank::GetStaticPDU(DIS::PDUType pdu_type) { } return NULL; } + +} // namespace dis diff --git a/src/dis6/utils/PDUType.h b/src/dis6/utils/PDUType.h index 8c7e90b1..718b152e 100644 --- a/src/dis6/utils/PDUType.h +++ b/src/dis6/utils/PDUType.h @@ -3,55 +3,55 @@ namespace dis { enum PDUType { - PDU_OTHER = 0, - PDU_ENTITY_STATE = 1, - PDU_FIRE = 2, - PDU_DETONATION = 3, - PDU_COLLISION = 4, - PDU_SERVICE_REQUEST = 5, - PDU_RESUPPLY_OFFER = 6, - PDU_RESUPPLY_RECEIVED = 7, - PDU_RESUPPLY_CANCEL = 8, - PDU_REPAIR_COMPLETE = 9, - PDU_REPAIR_RESPONSE = 10, - PDU_CREATE_ENTITY = 11, - PDU_REMOVE_ENTITY = 12, - PDU_START_RESUME = 13, - PDU_STOP_FREEZE = 14, - PDU_ACKNOWLEDGE = 15, - PDU_ACTION_REQUEST = 16, - PDU_ACTION_RESPONSE = 17, - PDU_DATA_QUERY = 18, - PDU_SET_DATA = 19, - PDU_DATA = 20, - PDU_EVENT_REPORT = 21, - PDU_COMMENT = 22, - PDU_ELECTRONIC_EMMISIONS = 23, - PDU_DESIGNATOR = 24, - PDU_TRANSMITTER = 25, - PDU_SIGNAL = 26, - PDU_RECEIVER = 27, - PDU_IFF = 28, - PDU_UNDERWATER_ACOUSTIC = 29, - PDU_SUPPLEMENTAL_EMISSION_ENTITY = 30, - PDU_INTERCOM_SIGNAL = 31, - PDU_INTERCOM_CONTROL = 32, - PDU_AGGREGATE_STATE = 33, - PDU_ISGROUPOF = 34, - PDU_TRANSFER_OWNERSHIP = 35, - PDU_ISPARTOF = 36, - PDU_MINEFIELD_STATE = 37, - PDU_MINEFIELD_QUERY = 38, - PDU_MINEFIELD_DATA = 39, - PDU_MINEFIELD_RESPONSE_NACK = 40, - PDU_ENVIRONMENTAL_PROCESS = 41, - PDU_GRIDDED_DATA = 42, - PDU_POINT_OBJECT_STATE = 43, - PDU_LINEAR_OBJECT_STATE = 44, - PDU_AREAL_OBJECT_STATE = 45, - PDU_TSPI = 46, - PDU_APPEARANCE = 47, - PDU_ARTICULATED_PARTS = 48 + kPduOther = 0, + kPduEntityState = 1, + kPduFire = 2, + kPduDetonation = 3, + kPduCollision = 4, + kPduServiceRequest = 5, + kPduResupplyOffer = 6, + kPduResupplyReceived = 7, + kPduResupplyCancel = 8, + kPduRepairComplete = 9, + kPduRepairResponse = 10, + kPduCreateEntity = 11, + kPduRemoveEntity = 12, + kPduStartResume = 13, + kPduStopFreeze = 14, + kPduAcknowledge = 15, + kPduActionRequest = 16, + kPduActionResponse = 17, + kPduDataQuery = 18, + kPduSetData = 19, + kPduData = 20, + kPduEventReport = 21, + kPduComment = 22, + kPduElectronicEmmisions = 23, + kPduDesignator = 24, + kPduTransmitter = 25, + kPduSignal = 26, + kPduReceiver = 27, + kPduIff = 28, + kPduUnderwaterAcoustic = 29, + kPduSupplementalEmissionEntity = 30, + kPduIntercomSignal = 31, + kPduIntercomControl = 32, + kPduAggregateState = 33, + kPduIsGroupOf = 34, + kPduTransferOwnership = 35, + kPduIsPartOf = 36, + kPduMinefieldState = 37, + kPduMinefieldQuery = 38, + kPduMinefieldData = 39, + kPduMinefieldResponseNack = 40, + kPduEnvironmentalProcess = 41, + kPduGriddedData = 42, + kPduPointObjectState = 43, + kPduLinearObjectState = 44, + kPduArealObjectState = 45, + kPduTspi = 46, + kPduAppearance = 47, + kPduArticulatedParts = 48 }; } From 96f4615989e478e7d007f538509137c2e2514b24 Mon Sep 17 00:00:00 2001 From: Cameron Howell Date: Tue, 23 Jan 2024 11:53:20 -0600 Subject: [PATCH 22/22] [WIP] continuing semantic improvements --- src/dis6/common/ArticulationParameter.cpp | 14 +- src/dis6/common/ArticulationParameter.h | 8 +- src/dis6/common/Vector3Double.cpp | 10 +- src/dis6/common/Vector3Double.h | 13 +- src/dis6/common/Vector3Float.cpp | 8 +- src/dis6/common/Vector3Float.h | 2 +- .../AcousticBeamData.cpp | 13 +- .../distributed_emissions/AcousticBeamData.h | 2 +- .../AcousticBeamFundamentalParameter.cpp | 14 +- .../AcousticBeamFundamentalParameter.h | 2 +- .../distributed_emissions/AcousticEmitter.cpp | 9 +- .../distributed_emissions/AcousticEmitter.h | 2 +- src/dis6/distributed_emissions/BeamData.cpp | 102 ++++---- src/dis6/distributed_emissions/BeamData.h | 18 +- .../ElectromagneticEmissionBeamData.cpp | 232 +++++++++--------- .../ElectromagneticEmissionBeamData.h | 71 +++--- .../ElectromagneticEmissionSystemData.cpp | 149 ++++++----- .../ElectromagneticEmissionSystemData.h | 54 ++-- .../ElectromagneticEmissionsPdu.cpp | 7 +- 19 files changed, 360 insertions(+), 370 deletions(-) diff --git a/src/dis6/common/ArticulationParameter.cpp b/src/dis6/common/ArticulationParameter.cpp index 0d3754d0..3cb2a1de 100644 --- a/src/dis6/common/ArticulationParameter.cpp +++ b/src/dis6/common/ArticulationParameter.cpp @@ -9,8 +9,6 @@ ArticulationParameter::ArticulationParameter() parameter_type_(0), parameter_value_(0.0) {} -ArticulationParameter::~ArticulationParameter() = default; - uint8_t ArticulationParameter::GetParameterTypeDesignator() const { return parameter_type_designator_; } @@ -85,14 +83,10 @@ bool ArticulationParameter::operator==(const ArticulationParameter& rhs) const { return ivars_equal; } -int ArticulationParameter::GetMarshalledSize() const { - int marshal_size = 0; - - marshal_size = marshal_size + 1; // _parameterTypeDesignator - marshal_size = marshal_size + 1; // _changeIndicator - marshal_size = marshal_size + 2; // _partAttachedTo - marshal_size = marshal_size + 4; // _parameterType - marshal_size = marshal_size + 8; // _parameterValue +size_t ArticulationParameter::GetMarshalledSize() const { + size_t marshal_size = sizeof(parameter_type_designator_) + + sizeof(change_indicator_) + sizeof(part_attached_to_) + + sizeof(parameter_type_) + sizeof(parameter_value_); return marshal_size; } diff --git a/src/dis6/common/ArticulationParameter.h b/src/dis6/common/ArticulationParameter.h index efd1fc48..766b8ca3 100644 --- a/src/dis6/common/ArticulationParameter.h +++ b/src/dis6/common/ArticulationParameter.h @@ -30,10 +30,10 @@ class ArticulationParameter { public: ArticulationParameter(); - virtual ~ArticulationParameter(); + ~ArticulationParameter() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] uint8_t GetParameterTypeDesignator() const; void SetParameterTypeDesignator(uint8_t pX); @@ -50,7 +50,7 @@ class ArticulationParameter { [[nodiscard]] double GetParameterValue() const; void SetParameterValue(double pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const ArticulationParameter& rhs) const; }; diff --git a/src/dis6/common/Vector3Double.cpp b/src/dis6/common/Vector3Double.cpp index 5c8aac71..dc311162 100644 --- a/src/dis6/common/Vector3Double.cpp +++ b/src/dis6/common/Vector3Double.cpp @@ -3,8 +3,6 @@ namespace dis { Vector3Double::Vector3Double() : x_(0.0), y_(0.0), z_(0.0) {} -Vector3Double::~Vector3Double() = default; - double Vector3Double::GetX() const { return x_; } void Vector3Double::SetX(double pX) { x_ = pX; } @@ -45,12 +43,8 @@ bool Vector3Double::operator==(const Vector3Double& rhs) const { return ivars_equal; } -int Vector3Double::GetMarshalledSize() { - int marshal_size = 0; - - marshal_size = marshal_size + 8; // x_ - marshal_size = marshal_size + 8; // y_ - marshal_size = marshal_size + 8; // z_ +size_t Vector3Double::GetMarshalledSize() const { + size_t marshal_size = sizeof(x_) + sizeof(y_) + sizeof(z_); return marshal_size; } diff --git a/src/dis6/common/Vector3Double.h b/src/dis6/common/Vector3Double.h index c0b0d3dc..87fb1bab 100644 --- a/src/dis6/common/Vector3Double.h +++ b/src/dis6/common/Vector3Double.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DIS6_COMMON_VECTOR3DOUBLE_H_ +#define DIS6_COMMON_VECTOR3DOUBLE_H_ #include "dis6/utils/DataStream.h" @@ -23,10 +24,10 @@ class Vector3Double { public: Vector3Double(); - virtual ~Vector3Double(); + ~Vector3Double() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] double GetX() const; void SetX(double pX); @@ -37,12 +38,14 @@ class Vector3Double { [[nodiscard]] double GetZ() const; void SetZ(double pX); - [[nodiscard]] static int GetMarshalledSize(); + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const Vector3Double& rhs) const; }; } // namespace dis +#endif // DIS6_COMMON_VECTOR3DOUBLE_H_ + // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/src/dis6/common/Vector3Float.cpp b/src/dis6/common/Vector3Float.cpp index d852ca7a..f732466e 100644 --- a/src/dis6/common/Vector3Float.cpp +++ b/src/dis6/common/Vector3Float.cpp @@ -43,12 +43,8 @@ bool Vector3Float::operator==(const Vector3Float& rhs) const { return ivars_equal; } -int Vector3Float::GetMarshalledSize() { - int marshal_size = 0; - - marshal_size = marshal_size + 4; // x_ - marshal_size = marshal_size + 4; // y_ - marshal_size = marshal_size + 4; // z_ +size_t Vector3Float::GetMarshalledSize() const { + size_t marshal_size = sizeof(x_) + sizeof(y_) + sizeof(z_); return marshal_size; } diff --git a/src/dis6/common/Vector3Float.h b/src/dis6/common/Vector3Float.h index ec6e54e2..70d5c71b 100644 --- a/src/dis6/common/Vector3Float.h +++ b/src/dis6/common/Vector3Float.h @@ -37,7 +37,7 @@ class Vector3Float { [[nodiscard]] float GetZ() const; void SetZ(float pX); - [[nodiscard]] static int GetMarshalledSize(); + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const Vector3Float& rhs) const; }; diff --git a/src/dis6/distributed_emissions/AcousticBeamData.cpp b/src/dis6/distributed_emissions/AcousticBeamData.cpp index 18264bf7..5132ab61 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamData.cpp @@ -69,15 +69,10 @@ bool AcousticBeamData::operator==(const AcousticBeamData& rhs) const { return ivars_equal; } -int AcousticBeamData::GetMarshalledSize() const { - int marshal_size = 0; - - marshal_size = marshal_size + 2; // beam_data_length_ - marshal_size = marshal_size + 1; // beam_id_number_ - marshal_size = marshal_size + 2; // pad2_ - marshal_size = - marshal_size + fundamental_data_parameters_ - .GetMarshalledSize(); // fundamental_data_parameters_ +size_t AcousticBeamData::GetMarshalledSize() const { + size_t marshal_size = sizeof(beam_data_length_) + sizeof(beam_id_number_) + + sizeof(pad2_) + + fundamental_data_parameters_.GetMarshalledSize(); return marshal_size; } diff --git a/src/dis6/distributed_emissions/AcousticBeamData.h b/src/dis6/distributed_emissions/AcousticBeamData.h index f01881d1..a9669cd9 100644 --- a/src/dis6/distributed_emissions/AcousticBeamData.h +++ b/src/dis6/distributed_emissions/AcousticBeamData.h @@ -49,7 +49,7 @@ class AcousticBeamData { GetFundamentalDataParameters() const; void SetFundamentalDataParameters(const AcousticBeamFundamentalParameter& pX); - [[nodiscard]] int GetMarshalledSize() const; + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const AcousticBeamData& rhs) const; }; diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp index dfe42db4..18416f28 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.cpp @@ -105,15 +105,11 @@ bool AcousticBeamFundamentalParameter::operator==( return ivars_equal; } -int AcousticBeamFundamentalParameter::GetMarshalledSize() { - int marshal_size = 0; - - marshal_size = marshal_size + 2; // active_emission_parameter_index_ - marshal_size = marshal_size + 2; // scan_pattern_ - marshal_size = marshal_size + 4; // beam_center_azimuth_ - marshal_size = marshal_size + 4; // azimuthal_beamwidth_ - marshal_size = marshal_size + 4; // beam_center_de_ - marshal_size = marshal_size + 4; // de_beamwidth_ +size_t AcousticBeamFundamentalParameter::GetMarshalledSize() const { + size_t marshal_size = sizeof(active_emission_parameter_index_) + + sizeof(scan_pattern_) + sizeof(beam_center_azimuth_) + + sizeof(azimuthal_beamwidth_) + sizeof(beam_center_de_) + + sizeof(de_beamwidth_); return marshal_size; } diff --git a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h index f30792eb..ac1ba0b0 100644 --- a/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h +++ b/src/dis6/distributed_emissions/AcousticBeamFundamentalParameter.h @@ -58,7 +58,7 @@ class AcousticBeamFundamentalParameter { [[nodiscard]] float GetDeBeamwidth() const; void SetDeBeamwidth(float pX); - [[nodiscard]] static int GetMarshalledSize(); + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const AcousticBeamFundamentalParameter& rhs) const; }; diff --git a/src/dis6/distributed_emissions/AcousticEmitter.cpp b/src/dis6/distributed_emissions/AcousticEmitter.cpp index b0b2acb8..4f305ffe 100644 --- a/src/dis6/distributed_emissions/AcousticEmitter.cpp +++ b/src/dis6/distributed_emissions/AcousticEmitter.cpp @@ -48,12 +48,9 @@ bool AcousticEmitter::operator==(const AcousticEmitter& rhs) const { return ivars_equal; } -int AcousticEmitter::GetMarshalledSize() { - int marshal_size = 0; - - marshal_size = marshal_size + 2; // acoustic_name_ - marshal_size = marshal_size + 1; // _function - marshal_size = marshal_size + 1; // acoustic_id_number_ +size_t AcousticEmitter::GetMarshalledSize() const { + size_t marshal_size = + sizeof(acoustic_name_) + sizeof(function_) + sizeof(acoustic_id_number_); return marshal_size; } diff --git a/src/dis6/distributed_emissions/AcousticEmitter.h b/src/dis6/distributed_emissions/AcousticEmitter.h index f4d7f989..c7034edb 100644 --- a/src/dis6/distributed_emissions/AcousticEmitter.h +++ b/src/dis6/distributed_emissions/AcousticEmitter.h @@ -40,7 +40,7 @@ class AcousticEmitter { [[nodiscard]] uint8_t GetAcousticIdNumber() const; void SetAcousticIdNumber(uint8_t pX); - [[nodiscard]] static int GetMarshalledSize(); + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const AcousticEmitter& rhs) const; }; diff --git a/src/dis6/distributed_emissions/BeamData.cpp b/src/dis6/distributed_emissions/BeamData.cpp index 8cd5f6b3..e0f2dfe6 100644 --- a/src/dis6/distributed_emissions/BeamData.cpp +++ b/src/dis6/distributed_emissions/BeamData.cpp @@ -2,71 +2,81 @@ namespace dis { BeamData::BeamData() - : _beamAzimuthCenter(0.0), - _beamAzimuthSweep(0.0), - _beamElevationCenter(0.0), - _beamElevationSweep(0.0), - _beamSweepSync(0.0) {} + : beam_azimuth_center_(0.0), + beam_azimuth_sweep_(0.0), + beam_elevation_center_(0.0), + beam_elevation_sweep_(0.0), + beam_sweep_sync_(0.0) {} -BeamData::~BeamData() {} +float BeamData::GetBeamAzimuthCenter() const { return beam_azimuth_center_; } -float BeamData::getBeamAzimuthCenter() const { return _beamAzimuthCenter; } +void BeamData::SetBeamAzimuthCenter(float pX) { beam_azimuth_center_ = pX; } -void BeamData::setBeamAzimuthCenter(float pX) { _beamAzimuthCenter = pX; } +float BeamData::GetBeamAzimuthSweep() const { return beam_azimuth_sweep_; } -float BeamData::getBeamAzimuthSweep() const { return _beamAzimuthSweep; } +void BeamData::SetBeamAzimuthSweep(float pX) { beam_azimuth_sweep_ = pX; } -void BeamData::setBeamAzimuthSweep(float pX) { _beamAzimuthSweep = pX; } - -float BeamData::getBeamElevationCenter() const { return _beamElevationCenter; } +float BeamData::GetBeamElevationCenter() const { + return beam_elevation_center_; +} -void BeamData::setBeamElevationCenter(float pX) { _beamElevationCenter = pX; } +void BeamData::SetBeamElevationCenter(float pX) { beam_elevation_center_ = pX; } -float BeamData::getBeamElevationSweep() const { return _beamElevationSweep; } +float BeamData::GetBeamElevationSweep() const { return beam_elevation_sweep_; } -void BeamData::setBeamElevationSweep(float pX) { _beamElevationSweep = pX; } +void BeamData::SetBeamElevationSweep(float pX) { beam_elevation_sweep_ = pX; } -float BeamData::getBeamSweepSync() const { return _beamSweepSync; } +float BeamData::GetBeamSweepSync() const { return beam_sweep_sync_; } -void BeamData::setBeamSweepSync(float pX) { _beamSweepSync = pX; } +void BeamData::SetBeamSweepSync(float pX) { beam_sweep_sync_ = pX; } -void BeamData::marshal(DataStream& dataStream) const { - dataStream << _beamAzimuthCenter; - dataStream << _beamAzimuthSweep; - dataStream << _beamElevationCenter; - dataStream << _beamElevationSweep; - dataStream << _beamSweepSync; +void BeamData::Marshal(DataStream& dataStream) const { + dataStream << beam_azimuth_center_; + dataStream << beam_azimuth_sweep_; + dataStream << beam_elevation_center_; + dataStream << beam_elevation_sweep_; + dataStream << beam_sweep_sync_; } -void BeamData::unmarshal(DataStream& dataStream) { - dataStream >> _beamAzimuthCenter; - dataStream >> _beamAzimuthSweep; - dataStream >> _beamElevationCenter; - dataStream >> _beamElevationSweep; - dataStream >> _beamSweepSync; +void BeamData::Unmarshal(DataStream& dataStream) { + dataStream >> beam_azimuth_center_; + dataStream >> beam_azimuth_sweep_; + dataStream >> beam_elevation_center_; + dataStream >> beam_elevation_sweep_; + dataStream >> beam_sweep_sync_; } bool BeamData::operator==(const BeamData& rhs) const { - bool ivarsEqual = true; - - if (!(_beamAzimuthCenter == rhs._beamAzimuthCenter)) ivarsEqual = false; - if (!(_beamAzimuthSweep == rhs._beamAzimuthSweep)) ivarsEqual = false; - if (!(_beamElevationCenter == rhs._beamElevationCenter)) ivarsEqual = false; - if (!(_beamElevationSweep == rhs._beamElevationSweep)) ivarsEqual = false; - if (!(_beamSweepSync == rhs._beamSweepSync)) ivarsEqual = false; - - return ivarsEqual; + bool ivars_equal = true; + + if (beam_azimuth_center_ != rhs.beam_azimuth_center_) { + ivars_equal = false; + } + if (beam_azimuth_sweep_ != rhs.beam_azimuth_sweep_) { + ivars_equal = false; + } + if (beam_elevation_center_ != rhs.beam_elevation_center_) { + ivars_equal = false; + } + if (beam_elevation_sweep_ != rhs.beam_elevation_sweep_) { + ivars_equal = false; + } + if (beam_sweep_sync_ != rhs.beam_sweep_sync_) { + ivars_equal = false; + } + + return ivars_equal; } -int BeamData::getMarshalledSize() const { - int marshalSize = 0; +int BeamData::GetMarshalledSize() { + int marshal_size = 0; - marshalSize = marshalSize + 4; // _beamAzimuthCenter - marshalSize = marshalSize + 4; // _beamAzimuthSweep - marshalSize = marshalSize + 4; // _beamElevationCenter - marshalSize = marshalSize + 4; // _beamElevationSweep - marshalSize = marshalSize + 4; // _beamSweepSync - return marshalSize; + marshal_size = marshal_size + 4; // beam_azimuth_center_ + marshal_size = marshal_size + 4; // beam_azimuth_sweep_ + marshal_size = marshal_size + 4; // beam_elevation_center_ + marshal_size = marshal_size + 4; // beam_elevation_sweep_ + marshal_size = marshal_size + 4; // beam_sweep_sync_ + return marshal_size; } } // namespace dis diff --git a/src/dis6/distributed_emissions/BeamData.h b/src/dis6/distributed_emissions/BeamData.h index cf52c80f..0a7cf704 100644 --- a/src/dis6/distributed_emissions/BeamData.h +++ b/src/dis6/distributed_emissions/BeamData.h @@ -15,28 +15,28 @@ class BeamData { protected: /** Specifies the beam azimuth an elevation centers and corresponding * half-angles to describe the scan volume */ - float beam_azimuth_center_; + float beam_azimuth_center_; // NOLINT /** Specifies the beam azimuth sweep to determine scan volume */ - float beam_azimuth_sweep_; + float beam_azimuth_sweep_; // NOLINT /** Specifies the beam elevation center to determine scan volume */ - float beam_elevation_center_; + float beam_elevation_center_; // NOLINT /** Specifies the beam elevation sweep to determine scan volume */ - float beam_elevation_sweep_; + float beam_elevation_sweep_; // NOLINT /** allows receiver to synchronize its regenerated scan pattern to that of * the emmitter. Specifies the percentage of time a scan is through its * pattern from its origion. */ - float beam_sweep_sync_; + float beam_sweep_sync_; // NOLINT public: BeamData(); - virtual ~BeamData(); + ~BeamData() = default; - virtual void Marshal(DataStream& dataStream) const; - virtual void Unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); [[nodiscard]] float GetBeamAzimuthCenter() const; void SetBeamAzimuthCenter(float pX); @@ -53,7 +53,7 @@ class BeamData { [[nodiscard]] float GetBeamSweepSync() const; void SetBeamSweepSync(float pX); - [[nodiscard]] virtual int GetMarshalledSize() const; + [[nodiscard]] static int GetMarshalledSize(); bool operator==(const BeamData& rhs) const; }; diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp index 7864a6a7..65d87b35 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.cpp @@ -2,185 +2,191 @@ namespace dis { ElectromagneticEmissionBeamData::ElectromagneticEmissionBeamData() - : _beamDataLength(0), - _beamIDNumber(0), - _beamParameterIndex(0), - _fundamentalParameterData(), - _beamFunction(0), - _numberOfTrackJamTargets(0), - _highDensityTrackJam(0), - _pad4(0), - _jammingModeSequence(0) {} + : beam_data_length_(0), + beam_id_number_(0), + beam_parameter_index_(0), + beam_function_(0), + number_of_track_jam_targets_(0), + high_density_track_jam_(0), + pad4_(0), + jamming_mode_sequence_(0) {} ElectromagneticEmissionBeamData::~ElectromagneticEmissionBeamData() { - _trackJamTargets.clear(); + track_jam_targets_.clear(); } -uint8_t ElectromagneticEmissionBeamData::getBeamDataLength() const { - return _beamDataLength; +uint8_t ElectromagneticEmissionBeamData::GetBeamDataLength() const { + return beam_data_length_; } -void ElectromagneticEmissionBeamData::setBeamDataLength(uint8_t pX) { - _beamDataLength = pX; +void ElectromagneticEmissionBeamData::SetBeamDataLength(uint8_t pX) { + beam_data_length_ = pX; } -uint8_t ElectromagneticEmissionBeamData::getBeamIDNumber() const { - return _beamIDNumber; +uint8_t ElectromagneticEmissionBeamData::GetBeamIdNumber() const { + return beam_id_number_; } -void ElectromagneticEmissionBeamData::setBeamIDNumber(uint8_t pX) { - _beamIDNumber = pX; +void ElectromagneticEmissionBeamData::SetBeamIdNumber(uint8_t pX) { + beam_id_number_ = pX; } -uint16_t ElectromagneticEmissionBeamData::getBeamParameterIndex() const { - return _beamParameterIndex; +uint16_t ElectromagneticEmissionBeamData::GetBeamParameterIndex() const { + return beam_parameter_index_; } -void ElectromagneticEmissionBeamData::setBeamParameterIndex(uint16_t pX) { - _beamParameterIndex = pX; +void ElectromagneticEmissionBeamData::SetBeamParameterIndex(uint16_t pX) { + beam_parameter_index_ = pX; } FundamentalParameterData& -ElectromagneticEmissionBeamData::getFundamentalParameterData() { - return _fundamentalParameterData; +ElectromagneticEmissionBeamData::GetFundamentalParameterData() { + return fundamental_parameter_data_; } const FundamentalParameterData& -ElectromagneticEmissionBeamData::getFundamentalParameterData() const { - return _fundamentalParameterData; +ElectromagneticEmissionBeamData::GetFundamentalParameterData() const { + return fundamental_parameter_data_; } -void ElectromagneticEmissionBeamData::setFundamentalParameterData( +void ElectromagneticEmissionBeamData::SetFundamentalParameterData( const FundamentalParameterData& pX) { - _fundamentalParameterData = pX; + fundamental_parameter_data_ = pX; } -uint8_t ElectromagneticEmissionBeamData::getBeamFunction() const { - return _beamFunction; +uint8_t ElectromagneticEmissionBeamData::GetBeamFunction() const { + return beam_function_; } -void ElectromagneticEmissionBeamData::setBeamFunction(uint8_t pX) { - _beamFunction = pX; +void ElectromagneticEmissionBeamData::SetBeamFunction(uint8_t pX) { + beam_function_ = pX; } -uint8_t ElectromagneticEmissionBeamData::getNumberOfTrackJamTargets() const { - return _trackJamTargets.size(); +uint8_t ElectromagneticEmissionBeamData::GetNumberOfTrackJamTargets() const { + return track_jam_targets_.size(); } -uint8_t ElectromagneticEmissionBeamData::getHighDensityTrackJam() const { - return _highDensityTrackJam; +uint8_t ElectromagneticEmissionBeamData::GetHighDensityTrackJam() const { + return high_density_track_jam_; } -void ElectromagneticEmissionBeamData::setHighDensityTrackJam(uint8_t pX) { - _highDensityTrackJam = pX; +void ElectromagneticEmissionBeamData::SetHighDensityTrackJam(uint8_t pX) { + high_density_track_jam_ = pX; } -uint8_t ElectromagneticEmissionBeamData::getPad4() const { return _pad4; } +uint8_t ElectromagneticEmissionBeamData::GetPad4() const { return pad4_; } -void ElectromagneticEmissionBeamData::setPad4(uint8_t pX) { _pad4 = pX; } +void ElectromagneticEmissionBeamData::SetPad4(uint8_t pX) { pad4_ = pX; } -uint32_t ElectromagneticEmissionBeamData::getJammingModeSequence() const { - return _jammingModeSequence; +uint32_t ElectromagneticEmissionBeamData::GetJammingModeSequence() const { + return jamming_mode_sequence_; } -void ElectromagneticEmissionBeamData::setJammingModeSequence(uint32_t pX) { - _jammingModeSequence = pX; +void ElectromagneticEmissionBeamData::SetJammingModeSequence(uint32_t pX) { + jamming_mode_sequence_ = pX; } std::vector& -ElectromagneticEmissionBeamData::getTrackJamTargets() { - return _trackJamTargets; +ElectromagneticEmissionBeamData::GetTrackJamTargets() { + return track_jam_targets_; } const std::vector& -ElectromagneticEmissionBeamData::getTrackJamTargets() const { - return _trackJamTargets; +ElectromagneticEmissionBeamData::GetTrackJamTargets() const { + return track_jam_targets_; } -void ElectromagneticEmissionBeamData::setTrackJamTargets( +void ElectromagneticEmissionBeamData::SetTrackJamTargets( const std::vector& pX) { - _trackJamTargets = pX; -} - -void ElectromagneticEmissionBeamData::marshal(DataStream& dataStream) const { - dataStream << _beamDataLength; - dataStream << _beamIDNumber; - dataStream << _beamParameterIndex; - _fundamentalParameterData.marshal(dataStream); - dataStream << _beamFunction; - dataStream << (uint8_t)_trackJamTargets.size(); - dataStream << _highDensityTrackJam; - dataStream << _pad4; - dataStream << _jammingModeSequence; - - for (size_t idx = 0; idx < _trackJamTargets.size(); idx++) { - TrackJamTarget x = _trackJamTargets[idx]; + track_jam_targets_ = pX; +} + +void ElectromagneticEmissionBeamData::Marshal(DataStream& dataStream) const { + dataStream << beam_data_length_; + dataStream << beam_id_number_; + dataStream << beam_parameter_index_; + fundamental_parameter_data_.Marshal(dataStream); + dataStream << beam_function_; + dataStream << static_cast(track_jam_targets_.size()); + dataStream << high_density_track_jam_; + dataStream << pad4_; + dataStream << jamming_mode_sequence_; + + for (const auto& x : track_jam_targets_) { x.marshal(dataStream); } } -void ElectromagneticEmissionBeamData::unmarshal(DataStream& dataStream) { - dataStream >> _beamDataLength; - dataStream >> _beamIDNumber; - dataStream >> _beamParameterIndex; - _fundamentalParameterData.unmarshal(dataStream); - dataStream >> _beamFunction; - dataStream >> _numberOfTrackJamTargets; - dataStream >> _highDensityTrackJam; - dataStream >> _pad4; - dataStream >> _jammingModeSequence; +void ElectromagneticEmissionBeamData::Unmarshal(DataStream& dataStream) { + dataStream >> beam_data_length_; + dataStream >> beam_id_number_; + dataStream >> beam_parameter_index_; + fundamental_parameter_data_.unmarshal(dataStream); + dataStream >> beam_function_; + dataStream >> number_of_track_jam_targets_; + dataStream >> high_density_track_jam_; + dataStream >> pad4_; + dataStream >> jamming_mode_sequence_; - _trackJamTargets.clear(); - for (size_t idx = 0; idx < _numberOfTrackJamTargets; idx++) { + track_jam_targets_.clear(); + for (size_t idx = 0; idx < number_of_track_jam_targets_; idx++) { TrackJamTarget x; - x.unmarshal(dataStream); - _trackJamTargets.push_back(x); + x.Unmarshal(dataStream); + track_jam_targets_.push_back(x); } } bool ElectromagneticEmissionBeamData::operator==( const ElectromagneticEmissionBeamData& rhs) const { - bool ivarsEqual = true; - - if (!(_beamDataLength == rhs._beamDataLength)) ivarsEqual = false; - if (!(_beamIDNumber == rhs._beamIDNumber)) ivarsEqual = false; - if (!(_beamParameterIndex == rhs._beamParameterIndex)) ivarsEqual = false; - if (!(_fundamentalParameterData == rhs._fundamentalParameterData)) - ivarsEqual = false; - if (!(_beamFunction == rhs._beamFunction)) ivarsEqual = false; - if (!(_highDensityTrackJam == rhs._highDensityTrackJam)) ivarsEqual = false; - if (!(_pad4 == rhs._pad4)) ivarsEqual = false; - if (!(_jammingModeSequence == rhs._jammingModeSequence)) ivarsEqual = false; - - for (size_t idx = 0; idx < _trackJamTargets.size(); idx++) { - if (!(_trackJamTargets[idx] == rhs._trackJamTargets[idx])) - ivarsEqual = false; + bool ivars_equal = true; + + if (!(beam_data_length_ == rhs.beam_data_length_)) { + ivars_equal = false; + } + if (!(beam_id_number_ == rhs.beam_id_number_)) { + ivars_equal = false; + } + if (!(beam_parameter_index_ == rhs.beam_parameter_index_)) { + ivars_equal = false; + } + if (!(fundamental_parameter_data_ == rhs.fundamental_parameter_data_)) { + ivars_equal = false; + } + if (!(beam_function_ == rhs.beam_function_)) { + ivars_equal = false; + } + if (!(high_density_track_jam_ == rhs.high_density_track_jam_)) { + ivars_equal = false; + } + if (!(pad4_ == rhs.pad4_)) { + ivars_equal = false; + } + if (!(jamming_mode_sequence_ == rhs.jamming_mode_sequence_)) { + ivars_equal = false; } - return ivarsEqual; -} + for (size_t idx = 0; idx < track_jam_targets_.size(); idx++) { + if (!(track_jam_targets_[idx] == rhs.track_jam_targets_[idx])) { + ivars_equal = false; + } + } -int ElectromagneticEmissionBeamData::getMarshalledSize() const { - int marshalSize = 0; + return ivars_equal; +} - marshalSize = marshalSize + 1; // _beamDataLength - marshalSize = marshalSize + 1; // _beamIDNumber - marshalSize = marshalSize + 2; // _beamParameterIndex - marshalSize = - marshalSize + _fundamentalParameterData - .getMarshalledSize(); // _fundamentalParameterData - marshalSize = marshalSize + 1; // _beamFunction - marshalSize = marshalSize + 1; // _numberOfTrackJamTargets - marshalSize = marshalSize + 1; // _highDensityTrackJam - marshalSize = marshalSize + 1; // _pad4 - marshalSize = marshalSize + 4; // _jammingModeSequence +size_t ElectromagneticEmissionBeamData::GetMarshalledSize() const { + size_t marshal_size = + sizeof(beam_data_length_) + sizeof(beam_id_number_) + + sizeof(beam_parameter_index_) + + fundamental_parameter_data_.GetMarshalledSize() + sizeof(beam_function_) + + sizeof(number_of_track_jam_targets_) + sizeof(high_density_track_jam_) + + sizeof(pad4_) + sizeof(jamming_mode_sequence_); - for (uint64_t idx = 0; idx < _trackJamTargets.size(); idx++) { - TrackJamTarget listElement = _trackJamTargets[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + for (const auto& list_element : track_jam_targets_) { + marshal_size += list_element.GetMarshalledSize(); } - return marshalSize; + return marshal_size; } } // namespace dis diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h index a2efdf99..6dac73a8 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionBeamData.h @@ -17,80 +17,81 @@ namespace dis { class ElectromagneticEmissionBeamData { protected: /** This field shall specify the length of this beams data in 32 bit words */ - uint8_t _beamDataLength; + uint8_t beam_data_length_; /** This field shall specify a unique emitter database number assigned to * differentiate between otherwise similar or identical emitter beams within * an emitter system. */ - uint8_t _beamIDNumber; + uint8_t beam_id_number_; /** This field shall specify a Beam Parameter Index number that shall be used * by receiving entities in conjunction with the Emitter Name field to provide * a pointer to the stored database parameters required to regenerate the * beam. */ - uint16_t _beamParameterIndex; + uint16_t beam_parameter_index_; /** Fundamental parameter data such as frequency range, beam sweep, etc. */ - FundamentalParameterData _fundamentalParameterData; + FundamentalParameterData fundamental_parameter_data_; /** beam function of a particular beam */ - uint8_t _beamFunction; + uint8_t beam_function_; /** Number of track/jam targets */ - uint8_t _numberOfTrackJamTargets; + uint8_t number_of_track_jam_targets_; /** wheher or not the receiving simulation apps can assume all the targets in * the scan pattern are being tracked/jammed */ - uint8_t _highDensityTrackJam; + uint8_t high_density_track_jam_; /** padding */ - uint8_t _pad4; + uint8_t pad4_; /** identify jamming techniques used */ - uint32_t _jammingModeSequence; + uint32_t jamming_mode_sequence_; /** variable length list of track/jam targets */ - std::vector _trackJamTargets; + std::vector track_jam_targets_; public: ElectromagneticEmissionBeamData(); - virtual ~ElectromagneticEmissionBeamData(); + ~ElectromagneticEmissionBeamData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); - uint8_t getBeamDataLength() const; - void setBeamDataLength(uint8_t pX); + [[nodiscard]] uint8_t GetBeamDataLength() const; + void SetBeamDataLength(uint8_t pX); - uint8_t getBeamIDNumber() const; - void setBeamIDNumber(uint8_t pX); + [[nodiscard]] uint8_t GetBeamIdNumber() const; + void SetBeamIdNumber(uint8_t pX); - uint16_t getBeamParameterIndex() const; - void setBeamParameterIndex(uint16_t pX); + [[nodiscard]] uint16_t GetBeamParameterIndex() const; + void SetBeamParameterIndex(uint16_t pX); - FundamentalParameterData& getFundamentalParameterData(); - const FundamentalParameterData& getFundamentalParameterData() const; - void setFundamentalParameterData(const FundamentalParameterData& pX); + FundamentalParameterData& GetFundamentalParameterData(); + [[nodiscard]] const FundamentalParameterData& GetFundamentalParameterData() + const; + void SetFundamentalParameterData(const FundamentalParameterData& pX); - uint8_t getBeamFunction() const; - void setBeamFunction(uint8_t pX); + [[nodiscard]] uint8_t GetBeamFunction() const; + void SetBeamFunction(uint8_t pX); - uint8_t getNumberOfTrackJamTargets() const; + [[nodiscard]] uint8_t GetNumberOfTrackJamTargets() const; - uint8_t getHighDensityTrackJam() const; - void setHighDensityTrackJam(uint8_t pX); + [[nodiscard]] uint8_t GetHighDensityTrackJam() const; + void SetHighDensityTrackJam(uint8_t pX); - uint8_t getPad4() const; - void setPad4(uint8_t pX); + [[nodiscard]] uint8_t GetPad4() const; + void SetPad4(uint8_t pX); - uint32_t getJammingModeSequence() const; - void setJammingModeSequence(uint32_t pX); + [[nodiscard]] uint32_t GetJammingModeSequence() const; + void SetJammingModeSequence(uint32_t pX); - std::vector& getTrackJamTargets(); - const std::vector& getTrackJamTargets() const; - void setTrackJamTargets(const std::vector& pX); + std::vector& GetTrackJamTargets(); + [[nodiscard]] const std::vector& GetTrackJamTargets() const; + void SetTrackJamTargets(const std::vector& pX); - virtual int getMarshalledSize() const; + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const ElectromagneticEmissionBeamData& rhs) const; }; diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp index 7a1eefee..7eb5f026 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.cpp @@ -2,138 +2,137 @@ namespace dis { ElectromagneticEmissionSystemData::ElectromagneticEmissionSystemData() - : _systemDataLength(0), - _numberOfBeams(0), - _emissionsPadding2(0), - _emitterSystem(), - _location() {} + : system_data_length_(0), number_of_beams_(0), emissions_padding2_(0) {} ElectromagneticEmissionSystemData::~ElectromagneticEmissionSystemData() { - _beamDataRecords.clear(); + beam_data_records_.clear(); } -uint8_t ElectromagneticEmissionSystemData::getSystemDataLength() const { - return _systemDataLength; +uint8_t ElectromagneticEmissionSystemData::GetSystemDataLength() const { + return system_data_length_; } -void ElectromagneticEmissionSystemData::setSystemDataLength(uint8_t pX) { - _systemDataLength = pX; +void ElectromagneticEmissionSystemData::SetSystemDataLength(uint8_t pX) { + system_data_length_ = pX; } -uint8_t ElectromagneticEmissionSystemData::getNumberOfBeams() const { - return _beamDataRecords.size(); +uint8_t ElectromagneticEmissionSystemData::GetNumberOfBeams() const { + return beam_data_records_.size(); } -uint16_t ElectromagneticEmissionSystemData::getEmissionsPadding2() const { - return _emissionsPadding2; +uint16_t ElectromagneticEmissionSystemData::GetEmissionsPadding2() const { + return emissions_padding2_; } -void ElectromagneticEmissionSystemData::setEmissionsPadding2(uint16_t pX) { - _emissionsPadding2 = pX; +void ElectromagneticEmissionSystemData::SetEmissionsPadding2(uint16_t pX) { + emissions_padding2_ = pX; } -EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() { - return _emitterSystem; +EmitterSystem& ElectromagneticEmissionSystemData::GetEmitterSystem() { + return emitter_system_; } -const EmitterSystem& ElectromagneticEmissionSystemData::getEmitterSystem() +const EmitterSystem& ElectromagneticEmissionSystemData::GetEmitterSystem() const { - return _emitterSystem; + return emitter_system_; } -void ElectromagneticEmissionSystemData::setEmitterSystem( +void ElectromagneticEmissionSystemData::SetEmitterSystem( const EmitterSystem& pX) { - _emitterSystem = pX; + emitter_system_ = pX; } -Vector3Float& ElectromagneticEmissionSystemData::getLocation() { - return _location; +Vector3Float& ElectromagneticEmissionSystemData::GetLocation() { + return location_; } -const Vector3Float& ElectromagneticEmissionSystemData::getLocation() const { - return _location; +const Vector3Float& ElectromagneticEmissionSystemData::GetLocation() const { + return location_; } -void ElectromagneticEmissionSystemData::setLocation(const Vector3Float& pX) { - _location = pX; +void ElectromagneticEmissionSystemData::SetLocation(const Vector3Float& pX) { + location_ = pX; } std::vector& -ElectromagneticEmissionSystemData::getBeamDataRecords() { - return _beamDataRecords; +ElectromagneticEmissionSystemData::GetBeamDataRecords() { + return beam_data_records_; } const std::vector& -ElectromagneticEmissionSystemData::getBeamDataRecords() const { - return _beamDataRecords; +ElectromagneticEmissionSystemData::GetBeamDataRecords() const { + return beam_data_records_; } -void ElectromagneticEmissionSystemData::setBeamDataRecords( +void ElectromagneticEmissionSystemData::SetBeamDataRecords( const std::vector& pX) { - _beamDataRecords = pX; + beam_data_records_ = pX; } -void ElectromagneticEmissionSystemData::marshal(DataStream& dataStream) const { - dataStream << _systemDataLength; - dataStream << (uint8_t)_beamDataRecords.size(); - dataStream << _emissionsPadding2; - _emitterSystem.marshal(dataStream); - _location.marshal(dataStream); +void ElectromagneticEmissionSystemData::Marshal(DataStream& dataStream) const { + dataStream << system_data_length_; + dataStream << static_cast(beam_data_records_.size()); + dataStream << emissions_padding2_; + emitter_system_.Marshal(dataStream); + location_.Marshal(dataStream); - for (size_t idx = 0; idx < _beamDataRecords.size(); idx++) { - ElectromagneticEmissionBeamData x = _beamDataRecords[idx]; - x.marshal(dataStream); + for (const auto& x : beam_data_records_) { + x.Marshal(dataStream); } } -void ElectromagneticEmissionSystemData::unmarshal(DataStream& dataStream) { - dataStream >> _systemDataLength; - dataStream >> _numberOfBeams; - dataStream >> _emissionsPadding2; - _emitterSystem.unmarshal(dataStream); - _location.unmarshal(dataStream); +void ElectromagneticEmissionSystemData::Unmarshal(DataStream& dataStream) { + dataStream >> system_data_length_; + dataStream >> number_of_beams_; + dataStream >> emissions_padding2_; + emitter_system_.Unmarshal(dataStream); + location_.Unmarshal(dataStream); - _beamDataRecords.clear(); - for (size_t idx = 0; idx < _numberOfBeams; idx++) { + beam_data_records_.clear(); + for (size_t idx = 0; idx < number_of_beams_; idx++) { ElectromagneticEmissionBeamData x; - x.unmarshal(dataStream); - _beamDataRecords.push_back(x); + x.Unmarshal(dataStream); + beam_data_records_.push_back(x); } } bool ElectromagneticEmissionSystemData::operator==( const ElectromagneticEmissionSystemData& rhs) const { - bool ivarsEqual = true; + bool ivars_equal = true; - if (!(_systemDataLength == rhs._systemDataLength)) ivarsEqual = false; - if (!(_emissionsPadding2 == rhs._emissionsPadding2)) ivarsEqual = false; - if (!(_emitterSystem == rhs._emitterSystem)) ivarsEqual = false; - if (!(_location == rhs._location)) ivarsEqual = false; + if (!(system_data_length_ == rhs.system_data_length_)) { + ivars_equal = false; + } + if (!(emissions_padding2_ == rhs.emissions_padding2_)) { + ivars_equal = false; + } + if (!(emitter_system_ == rhs.emitter_system_)) { + ivars_equal = false; + } + if (!(location_ == rhs.location_)) { + ivars_equal = false; + } - for (size_t idx = 0; idx < _beamDataRecords.size(); idx++) { - if (!(_beamDataRecords[idx] == rhs._beamDataRecords[idx])) - ivarsEqual = false; + for (size_t idx = 0; idx < beam_data_records_.size(); idx++) { + if (!(beam_data_records_[idx] == rhs.beam_data_records_[idx])) { + ivars_equal = false; + } } - return ivarsEqual; + return ivars_equal; } -int ElectromagneticEmissionSystemData::getMarshalledSize() const { - int marshalSize = 0; - - marshalSize = marshalSize + 1; // _systemDataLength - marshalSize = marshalSize + 1; // _numberOfBeams - marshalSize = marshalSize + 2; // _emissionsPadding2 - marshalSize = - marshalSize + _emitterSystem.getMarshalledSize(); // _emitterSystem - marshalSize = marshalSize + _location.getMarshalledSize(); // _location +size_t ElectromagneticEmissionSystemData::GetMarshalledSize() const { + size_t marshal_size = sizeof(system_data_length_) + sizeof(number_of_beams_) + + sizeof(emissions_padding2_) + + emitter_system_.GetMarshalledSize() + + location_.GetMarshalledSize(); - for (uint64_t idx = 0; idx < _beamDataRecords.size(); idx++) { - ElectromagneticEmissionBeamData listElement = _beamDataRecords[idx]; - marshalSize = marshalSize + listElement.getMarshalledSize(); + for (const auto& list_element : beam_data_records_) { + marshal_size += list_element.GetMarshalledSize(); } - return marshalSize; + return marshal_size; } } // namespace dis diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h index e214a92b..ea274cfc 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionSystemData.h @@ -7,7 +7,7 @@ #include "dis6/distributed_emissions/EmitterSystem.h" #include "dis6/utils/DataStream.h" -namespace DIS { +namespace dis { // Data about one electronic system // Copyright (c) 2007-2009, MOVES Institute, Naval Postgraduate School. All @@ -20,58 +20,58 @@ class ElectromagneticEmissionSystemData { /** This field shall specify the length of this emitter system�s data * (including beam data and its track/jam information) in 32-bit words. The * length shall include the System Data Length field. */ - uint8_t _systemDataLength; + uint8_t system_data_length_; /** This field shall specify the number of beams being described in the * current PDU for the system being described. */ - uint8_t _numberOfBeams; + uint8_t number_of_beams_; /** padding. */ - uint16_t _emissionsPadding2; + uint16_t emissions_padding2_; /** This field shall specify information about a particular emitter system */ - EmitterSystem _emitterSystem; + EmitterSystem emitter_system_; /** Location with respect to the entity */ - Vector3Float _location; + Vector3Float location_; /** variable length list of beam data records */ - std::vector _beamDataRecords; + std::vector beam_data_records_; public: ElectromagneticEmissionSystemData(); - virtual ~ElectromagneticEmissionSystemData(); + ~ElectromagneticEmissionSystemData(); - virtual void marshal(DataStream& dataStream) const; - virtual void unmarshal(DataStream& dataStream); + void Marshal(DataStream& dataStream) const; + void Unmarshal(DataStream& dataStream); - uint8_t getSystemDataLength() const; - void setSystemDataLength(uint8_t pX); + [[nodiscard]] uint8_t GetSystemDataLength() const; + void SetSystemDataLength(uint8_t pX); - uint8_t getNumberOfBeams() const; + [[nodiscard]] uint8_t GetNumberOfBeams() const; - uint16_t getEmissionsPadding2() const; - void setEmissionsPadding2(uint16_t pX); + [[nodiscard]] uint16_t GetEmissionsPadding2() const; + void SetEmissionsPadding2(uint16_t pX); - EmitterSystem& getEmitterSystem(); - const EmitterSystem& getEmitterSystem() const; - void setEmitterSystem(const EmitterSystem& pX); + EmitterSystem& GetEmitterSystem(); + [[nodiscard]] const EmitterSystem& GetEmitterSystem() const; + void SetEmitterSystem(const EmitterSystem& pX); - Vector3Float& getLocation(); - const Vector3Float& getLocation() const; - void setLocation(const Vector3Float& pX); + Vector3Float& GetLocation(); + [[nodiscard]] const Vector3Float& GetLocation() const; + void SetLocation(const Vector3Float& pX); - std::vector& getBeamDataRecords(); - const std::vector& getBeamDataRecords() - const; - void setBeamDataRecords( + std::vector& GetBeamDataRecords(); + [[nodiscard]] const std::vector& + GetBeamDataRecords() const; + void SetBeamDataRecords( const std::vector& pX); - virtual int getMarshalledSize() const; + [[nodiscard]] size_t GetMarshalledSize() const; bool operator==(const ElectromagneticEmissionSystemData& rhs) const; }; -} // namespace DIS +} // namespace dis // Copyright (c) 1995-2009 held by the author(s). All rights reserved. // Redistribution and use in source and binary forms, with or without diff --git a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp index 17ae78dd..66dfb900 100644 --- a/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp +++ b/src/dis6/distributed_emissions/ElectromagneticEmissionsPdu.cpp @@ -3,13 +3,12 @@ namespace dis { ElectromagneticEmissionsPdu::ElectromagneticEmissionsPdu() - : DistributedEmissionsFamilyPdu(), - _emittingEntityID(), - _eventID(), + :, + , _stateUpdateIndicator(0), _numberOfSystems(0), _paddingForEmissionsPdu(0) { - setPduType(23); + SetPduType(23); setPaddingForEmissionsPdu(0); }